diff --git a/src/Player/Frame.h b/src/Player/Frame.h index cae66630..059022da 100644 --- a/src/Player/Frame.h +++ b/src/Player/Frame.h @@ -39,8 +39,8 @@ namespace mediakit{ typedef enum { CodecInvalid = -1, CodecH264 = 0, - CodecAAC = 0x0100, - CodecMax + CodecAAC, + CodecMax = 0x7FFF } CodecId; typedef enum { @@ -48,7 +48,7 @@ typedef enum { TrackVideo = 0, TrackAudio, TrackTitle, - TrackMax + TrackMax = 0x7FFF } TrackType; class CodecInfo { @@ -148,7 +148,6 @@ public: typedef std::shared_ptr Ptr; FrameRing(){ - _frameRing = std::make_shared(); } virtual ~FrameRing(){} @@ -212,7 +211,6 @@ public: private: mutex _mtx; map _delegateMap; - FrameRing::Ptr _frameRing; }; diff --git a/src/RtmpMuxer/RtmpMuxer.cpp b/src/RtmpMuxer/RtmpMuxer.cpp index dfe02baa..76be6531 100644 --- a/src/RtmpMuxer/RtmpMuxer.cpp +++ b/src/RtmpMuxer/RtmpMuxer.cpp @@ -89,7 +89,7 @@ void RtmpMuxer::inputFrame(const Frame::Ptr &frame) { return; } it->second->inputFrame(frame); - if(!_trackReadyCallback.empty() && it->second->ready()){ + if(!_inited && !_trackReadyCallback.empty() && it->second->ready()){ //Track由未就绪状态装换成就绪状态,我们就生成metedata以及Rtmp编码器 auto it_callback = _trackReadyCallback.find(codec_id); if(it_callback != _trackReadyCallback.end()){ diff --git a/src/RtspMuxer/RtspMuxer.cpp b/src/RtspMuxer/RtspMuxer.cpp index 08f338e0..e849b856 100644 --- a/src/RtspMuxer/RtspMuxer.cpp +++ b/src/RtspMuxer/RtspMuxer.cpp @@ -78,7 +78,7 @@ void RtspMuxer::inputFrame(const Frame::Ptr &frame) { return; } it->second->inputFrame(frame); - if(!_trackReadyCallback.empty() && it->second->ready()){ + if(!_inited && !_trackReadyCallback.empty() && it->second->ready()){ //Track由未就绪状态装换成就绪状态,我们就生成sdp以及rtp编码器 auto it_callback = _trackReadyCallback.find(codec_id); if(it_callback != _trackReadyCallback.end()){