Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-04 01:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

format code and remove some useless code

Browse Source
This commit is contained in:
xiongguangjie
2022-06-06 20:40:04 +08:00
parent 83d75c9a72
commit c92fc8a4a8
19 changed files with 715 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
srt/SrtTransportImp.hpp
View File

@@ -1,16 +1,15 @@
#ifndef ZLMEDIAKIT_SRT_TRANSPORT_IMP_H
#define ZLMEDIAKIT_SRT_TRANSPORT_IMP_H
#include <mutex>
#include "Common/MultiMediaSourceMuxer.h"
#include "Rtp/Decoder.h"
#include "TS/TSMediaSource.h"
#include "SrtTransport.hpp"
#include "TS/TSMediaSource.h"
#include <mutex>
namespace SRT {
using namespace toolkit;
using namespace mediakit;
using namespace std;
using namespace toolkit;
using namespace mediakit;
using namespace std;
class SrtTransportImp
: public SrtTransport
, public toolkit::SockInfo
@@ -19,13 +18,11 @@ class SrtTransportImp
public:
SrtTransportImp(const EventPoller::Ptr &poller);
~SrtTransportImp();
void inputSockData(uint8_t *buf, int len, struct sockaddr_storage *addr){
SrtTransport::inputSockData(buf,len,addr);
void inputSockData(uint8_t *buf, int len, struct sockaddr_storage *addr) {
SrtTransport::inputSockData(buf, len, addr);
_total_bytes += len;
}
void onSendTSData(const Buffer::Ptr &buffer, bool flush){
SrtTransport::onSendTSData(buffer,flush);
}
void onSendTSData(const Buffer::Ptr &buffer, bool flush) { SrtTransport::onSendTSData(buffer, flush); }
/// SockInfo override
std::string get_local_ip() override;
uint16_t get_local_port() override;
@@ -35,19 +32,17 @@ public:
protected:
///////SrtTransport override///////
void onHandShakeFinished(std::string& streamid,struct sockaddr_storage *addr) override;
void onHandShakeFinished(std::string &streamid, struct sockaddr_storage *addr) override;
void onSRTData(DataPacket::Ptr pkt) override;
void onShutdown(const SockException &ex) override;
int getLantencyMul() override;
void sendPacket(Buffer::Ptr pkt,bool flush = true) override{
void sendPacket(Buffer::Ptr pkt, bool flush = true) override {
_total_bytes += pkt->size();
SrtTransport::sendPacket(pkt,flush);
SrtTransport::sendPacket(pkt, flush);
};
bool isPusher() override{
return _is_pusher;
}
bool isPusher() override { return _is_pusher; }
///////MediaSourceEvent override///////
// 关闭
@@ -62,7 +57,7 @@ protected:
std::shared_ptr<SockInfo> getOriginSock(mediakit::MediaSource &sender) const override;
bool inputFrame(const Frame::Ptr &frame) override;
bool addTrack(const Track::Ptr & track) override;
bool addTrack(const Track::Ptr &track) override;
void addTrackCompleted() override;
void resetTracks() override {};
@@ -76,16 +71,16 @@ private:
private:
bool _is_pusher = true;
MediaInfo _media_info;
uint64_t _total_bytes = 0;
uint64_t _total_bytes = 0;
Ticker _alive_ticker;
std::unique_ptr<sockaddr_storage> _addr;
// for player
// for player
TSMediaSource::RingType::RingReader::Ptr _ts_reader;
// for pusher
// for pusher
MultiMediaSourceMuxer::Ptr _muxer;
DecoderImp::Ptr _decoder;
std::recursive_mutex _func_mtx;
std::deque<std::function<void()> > _cached_func;
std::deque<std::function<void()>> _cached_func;
};
} // namespace SRT