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

去除FrameMerger逻辑

Browse Source
This commit is contained in:
xiongziliang
2019-12-13 15:49:57 +08:00
parent 14ba899c61
commit 6d697daeb0
2 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Rtp/RtpProcess.h
View File

@@ -40,7 +40,6 @@ namespace mediakit{
string printSSRC(uint32_t ui32Ssrc);
class FrameMerger;
class RtpProcess : public RtpReceiver , public RtpDecoder , public PSDecoder {
public:
typedef std::shared_ptr<RtpProcess> Ptr;
@@ -71,7 +70,6 @@ private:
int _codecid_video = 0;
int _codecid_audio = 0;
MultiMediaSourceMuxer::Ptr _muxer;
std::shared_ptr<FrameMerger> _merger;
Ticker _last_rtp_time;
map<int,Stamp> _stamps;
};