diff --git a/src/Common/Factory.cpp b/src/Common/Factory.cpp index 776dd750..c948a116 100644 --- a/src/Common/Factory.cpp +++ b/src/Common/Factory.cpp @@ -3,6 +3,10 @@ // #include "Factory.h" +#include "RtmpMuxer/H264RtmpCodec.h" +#include "RtmpMuxer/AACRtmpCodec.h" +#include "RtspMuxer/H264RtpCodec.h" +#include "RtspMuxer/AACRtpCodec.h" namespace mediakit{ @@ -75,7 +79,7 @@ Track::Ptr Factory::getTrackBySdp(const string &sdp) { } -CodecId getCodecIdByAmf(const AMFValue &val){ +CodecId Factory::getCodecIdByAmf(const AMFValue &val){ if (val.type() == AMF_STRING){ auto str = val.as_string(); if(str == "avc1"){ @@ -153,6 +157,17 @@ RtpCodec::Ptr Factory::getRtpDecoderById(CodecId codecId, uint32_t ui32SampleRat } } +RtmpCodec::Ptr Factory::getRtmpCodecById(CodecId codecId) { + switch (codecId){ + case CodecH264: + return std::make_shared(); + case CodecAAC: + return std::make_shared(); + default: + return nullptr; + } +} + }//namespace mediakit diff --git a/src/Common/Factory.h b/src/Common/Factory.h index 36aa88b1..3bdbc5be 100644 --- a/src/Common/Factory.h +++ b/src/Common/Factory.h @@ -8,6 +8,8 @@ #include #include "Player/Track.h" #include "RtspMuxer/RtspSdp.h" +#include "RtspMuxer/RtpCodec.h" +#include "RtmpMuxer/RtmpCodec.h" #include "Rtmp/amf.h" using namespace std; @@ -21,7 +23,6 @@ public: * 根据sdp生成Track对象 */ static Track::Ptr getTrackBySdp(const string &sdp); - static Track::Ptr getTrackByAmf(const AMFValue &amf); static Track::Ptr getTrackByCodecId(CodecId codecId); @@ -57,6 +58,13 @@ public: * @return */ static RtpCodec::Ptr getRtpDecoderById(CodecId codecId, uint32_t ui32SampleRate); + + + ////////////////////////////////////////////////////////////////// + + static Track::Ptr getTrackByAmf(const AMFValue &amf); + static CodecId getCodecIdByAmf(const AMFValue &val); + static RtmpCodec::Ptr getRtmpCodecById(CodecId codecId); }; }//namespace mediakit diff --git a/src/RtmpMuxer/AACRtmpCodec.h b/src/RtmpMuxer/AACRtmpCodec.h index a2b2e994..c96b64cb 100644 --- a/src/RtmpMuxer/AACRtmpCodec.h +++ b/src/RtmpMuxer/AACRtmpCodec.h @@ -49,7 +49,7 @@ class AACRtmpEncoder : public AACRtmpDecoder , public ResourcePoolHelper Ptr; - AACRtmpEncoder(); + AACRtmpEncoder(){} ~AACRtmpEncoder() {} /** diff --git a/src/RtmpMuxer/RtmpDemuxer.cpp b/src/RtmpMuxer/RtmpDemuxer.cpp index beb1cd8c..574aa1d0 100644 --- a/src/RtmpMuxer/RtmpDemuxer.cpp +++ b/src/RtmpMuxer/RtmpDemuxer.cpp @@ -1,65 +1,47 @@ /* - * MIT License - * - * Copyright (c) 2016 xiongziliang <771730766@qq.com> - * - * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit). - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ +* MIT License +* +* Copyright (c) 2016 xiongziliang <771730766@qq.com> +* +* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit). +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in all +* copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +* SOFTWARE. +*/ #include "RtmpDemuxer.h" +#include "Common/Factory.h" namespace mediakit { RtmpDemuxer::RtmpDemuxer(const AMFValue &val) { - auto videoCodec = val["videocodecid"]; - auto audioCodec = val["audiocodecid"]; - - if (videoCodec.type() == AMF_STRING) { - if (videoCodec.as_string() == "avc1") { - //h264 - _iVideoCodecID = H264_CODEC_ID; - } else { - InfoL << "不支持RTMP视频格式:" << videoCodec.as_string(); - } - }else if (videoCodec.type() != AMF_NULL){ - _iVideoCodecID = videoCodec.as_integer(); - if (_iVideoCodecID != H264_CODEC_ID) { - InfoL << "不支持RTMP视频格式:" << videoCodec.as_integer(); - } + try { + makeVideoTrack(val["videocodecid"]); + makeAudioTrack(val["audiocodecid"]); + val.object_for_each([&](const string &key, const AMFValue &val) { + if (key == "duration") { + _fDuration = val.as_number(); + return; + } + }); + }catch (std::exception &ex){ + WarnL << ex.what(); } - - if (audioCodec.type() == AMF_STRING) { - if (audioCodec.as_string() == "mp4a") { - //aac - _iAudioCodecID = AAC_CODEC_ID; - } else { - InfoL << "不支持RTMP音频格式:" << audioCodec.as_string(); - } - }else if (audioCodec.type() != AMF_NULL) { - _iAudioCodecID = audioCodec.as_integer(); - if (_iAudioCodecID != AAC_CODEC_ID) { - InfoL << "不支持RTMP音频格式:" << audioCodec.as_integer(); - } - } - onCheckMedia(val); } RtmpDemuxer::~RtmpDemuxer() { @@ -67,167 +49,93 @@ RtmpDemuxer::~RtmpDemuxer() { bool RtmpDemuxer::inputRtmp(const RtmpPacket::Ptr &pkt) { switch (pkt->typeId) { - case MSG_VIDEO:{ - if(_iVideoCodecID == 0){ - //未初始化视频 - _iVideoCodecID = pkt->getMediaType(); - if(_iVideoCodecID != H264_CODEC_ID){ - InfoL << "不支持RTMP视频格式:" << _iVideoCodecID; - } + case MSG_VIDEO: { + if(_videoRtmpDecoder){ + return _videoRtmpDecoder->inputRtmp(pkt, true); } - if(_iVideoCodecID == H264_CODEC_ID){ - return inputVideo(pkt); + if(!_tryGetVideoTrack){ + _tryGetVideoTrack = true; + auto codec = AMFValue(pkt->getMediaType()); + makeVideoTrack(codec); } return false; } case MSG_AUDIO: { - if(_iAudioCodecID == 0){ - //未初始化音频 - _iAudioCodecID = pkt->getMediaType(); - if(_iAudioCodecID != AAC_CODEC_ID){ - InfoL << "不支持RTMP音频格式:" << _iAudioCodecID; - } + if(_audioRtmpDecoder){ + _audioRtmpDecoder->inputRtmp(pkt, false); + return false; } - if (_iAudioCodecID == AAC_CODEC_ID) { - return inputAudio(pkt); + if(!_tryGetAudioTrack) { + _tryGetAudioTrack = true; + auto codec = AMFValue(pkt->getMediaType()); + makeAudioTrack(codec); } return false; } - default: return false; } } -inline bool RtmpDemuxer::inputVideo(const RtmpPacket::Ptr &pkt) { - if (pkt->isCfgFrame()) { - //WarnL << " got h264 cfg"; - if (_strSPS.size()) { - return false; - } - _strSPS.assign("\x00\x00\x00\x01", 4); - _strSPS.append(pkt->getH264SPS()); - - _strPPS.assign("\x00\x00\x00\x01", 4); - _strPPS.append(pkt->getH264PPS()); - - getAVCInfo(pkt->getH264SPS(), _iVideoWidth, _iVideoHeight, _fVideoFps); - return false; - } - - if (_strSPS.size()) { - uint32_t iTotalLen = pkt->strBuf.size(); - uint32_t iOffset = 5; - while(iOffset + 4 < iTotalLen){ - uint32_t iFrameLen; - memcpy(&iFrameLen, pkt->strBuf.data() + iOffset, 4); - iFrameLen = ntohl(iFrameLen); - iOffset += 4; - if(iFrameLen + iOffset > iTotalLen){ - break; - } - _onGetH264(pkt->strBuf.data() + iOffset, iFrameLen, pkt->timeStamp); - iOffset += iFrameLen; - } - } - return pkt->isVideoKeyFrame(); -} -inline void RtmpDemuxer::_onGetH264(const char* pcData, int iLen, uint32_t ui32TimeStamp) { - switch (pcData[0] & 0x1F) { - case 5: { - onGetH264(_strSPS.data() + 4, _strSPS.length() - 4, ui32TimeStamp); - onGetH264(_strPPS.data() + 4, _strPPS.length() - 4, ui32TimeStamp); - } - case 1: { - onGetH264(pcData, iLen, ui32TimeStamp); - } - break; - default: - //WarnL <<(int)(pcData[0] & 0x1F); - break; - } -} -inline void RtmpDemuxer::onGetH264(const char* pcData, int iLen, uint32_t ui32TimeStamp) { - _h264frame.type = pcData[0] & 0x1F; - _h264frame.timeStamp = ui32TimeStamp; - _h264frame.buffer.assign("\x0\x0\x0\x1", 4); //添加264头 - _h264frame.buffer.append(pcData, iLen); - { - lock_guard lck(_mtxCB); - if (onVideo) { - onVideo(_h264frame); - } - } - _h264frame.buffer.clear(); -} - -inline bool RtmpDemuxer::inputAudio(const RtmpPacket::Ptr &pkt) { - if (pkt->isCfgFrame()) { - if (_strAudioCfg.size()) { - return false; - } - _strAudioCfg = pkt->getAacCfg(); - _iSampleBit = pkt->getAudioSampleBit(); - makeAdtsHeader(_strAudioCfg,_adts); - getAACInfo(_adts, _iSampleRate, _iChannel); - return false; - } - if (_strAudioCfg.size()) { - onGetAAC(pkt->strBuf.data() + 2, pkt->strBuf.size() - 2, pkt->timeStamp); - } - return false; -} -inline void RtmpDemuxer::onGetAAC(const char* pcData, int iLen, uint32_t ui32TimeStamp) { - if(iLen + 7 > sizeof(_adts.buffer)){ - WarnL << "Illegal adts data, exceeding the length limit."; - return; +void RtmpDemuxer::makeVideoTrack(const AMFValue &videoCodec) { + //生成Track对象 + _videoTrack = dynamic_pointer_cast(Factory::getTrackByAmf(videoCodec)); + if (_videoTrack) { + //生成rtmpCodec对象以便解码rtmp + _videoRtmpDecoder = Factory::getRtmpCodecById(_videoTrack->getCodecId()); + if (_videoRtmpDecoder) { + //设置rtmp解码器代理，生成的frame写入该Track + _videoRtmpDecoder->setDelegate(_videoTrack); + } else { + //找不到相应的rtmp解码器，该track无效 + _videoTrack.reset(); + } } - //添加adts头 - memcpy(_adts.buffer + 7, pcData, iLen); - _adts.aac_frame_length = 7 + iLen; - _adts.timeStamp = ui32TimeStamp; - writeAdtsHeader(_adts, _adts.buffer); - { - lock_guard lck(_mtxCB); - if (onAudio) { - onAudio(_adts); - } - } - _adts.aac_frame_length = 7; - } -inline void RtmpDemuxer::onCheckMedia(const AMFValue& obj) { - obj.object_for_each([&](const string &key ,const AMFValue& val) { - if(key == "duration") { - _fDuration = val.as_number(); - return; - } - if(key == "width") { - _iVideoWidth = val.as_number(); - return; - } - if(key == "height") { - _iVideoHeight = val.as_number(); - return; - } - if(key == "framerate") { - _fVideoFps = val.as_number(); - return; - } - if(key == "audiosamplerate") { - _iSampleRate = val.as_number(); - return; - } - if(key == "audiosamplesize") { - _iSampleBit = val.as_number(); - return; - } - if(key == "stereo") { - _iChannel = val.as_boolean() ? 2 :1; - return; - } - }); + +void RtmpDemuxer::makeAudioTrack(const AMFValue &audioCodec) { + //生成Track对象 + _audioTrack = dynamic_pointer_cast(Factory::getTrackByAmf(audioCodec)); + if (_audioTrack) { + //生成rtmpCodec对象以便解码rtmp + _audioRtmpDecoder = Factory::getRtmpCodecById(_audioTrack->getCodecId()); + if (_audioRtmpDecoder) { + //设置rtmp解码器代理，生成的frame写入该Track + _audioRtmpDecoder->setDelegate(_audioTrack); + } else { + //找不到相应的rtmp解码器，该track无效 + _audioTrack.reset(); + } + } +} + +vector RtmpDemuxer::getTracks() const { + vector ret; + if(_videoTrack){ + ret.emplace_back(_videoTrack); + } + if(_audioTrack){ + ret.emplace_back(_audioTrack); + } + return ret; +} + +bool RtmpDemuxer::isInited() const { + bool ret = true; + if(ret && _audioTrack){ + //getTrackType() 等于TrackInvalid时说明该Track还未准备好 + ret = _audioTrack->getTrackType() != TrackInvalid; + } + if(ret && _videoTrack){ + //getTrackType() 等于TrackInvalid时说明该Track还未准备好 + ret = _videoTrack->getTrackType() != TrackInvalid; + } + return ret; +} + +float RtmpDemuxer::getDuration() const { + return _fDuration; } diff --git a/src/RtmpMuxer/RtmpDemuxer.h b/src/RtmpMuxer/RtmpDemuxer.h index e59e5e13..344fb94c 100644 --- a/src/RtmpMuxer/RtmpDemuxer.h +++ b/src/RtmpMuxer/RtmpDemuxer.h @@ -32,12 +32,11 @@ #include "Rtmp/amf.h" #include "Rtmp/Rtmp.h" #include "Player/Player.h" -#include "Util/TimeTicker.h" #include "Player/PlayerBase.h" -using namespace toolkit; +#include "Util/TimeTicker.h" +#include "RtmpCodec.h" -#define H264_CODEC_ID 7 -#define AAC_CODEC_ID 10 +using namespace toolkit; namespace mediakit { @@ -47,67 +46,61 @@ public: RtmpDemuxer(const AMFValue &val); virtual ~RtmpDemuxer(); + /** + * 开始解复用 + * @param pkt rtmp包 + * @return true 代表是i帧 + */ bool inputRtmp(const RtmpPacket::Ptr &pkt); - bool isInited() const override{ - if((_iAudioCodecID | _iVideoCodecID) == 0){ - //音视频codec_id都未获取到，说明还未初始化成功 - return false; - } - if((_iAudioCodecID & _iVideoCodecID) == 0 && _ticker.elapsedTime() < 300){ - //音视频codec_id有其一未获取到,且最少分析300ms才能断定没有音频或视频 - return false; - } - if (_iAudioCodecID && !_strAudioCfg.size()) { - //如果音频是aac但是还未获取aac config ，则未初始化成功 - return false; - } - if (_iVideoCodecID && !_strSPS.size()) { - //如果视频是h264但是还未获取sps ，则未初始化成功 - return false; - } - //初始化成功 - return true; - } - float getDuration() const override{ - return _fDuration; - } + /** + * 获取节目总时长 + * @return + */ + float getDuration() const override; + + /** + * 返回是否完成初始化完毕 + * 由于在构造该对象时是无法获取sps pps aac_cfg等这些信息， + * 所以要调用inputRtmp后才会获取到这些信息，这时才初始化成功 + * @return + */ + bool isInited() const override; + + /** + * 获取所有可用Track，请在isInited()返回true时调用 + * @return + */ + vector getTracks() const override; +private: + void makeVideoTrack(const AMFValue &val); + void makeAudioTrack(const AMFValue &val); private: - inline void onCheckMedia(const AMFValue &obj); - - //返回值：true 代表是i帧第一个rtp包 - inline bool inputVideo(const RtmpPacket::Ptr &pkt); - inline bool inputAudio(const RtmpPacket::Ptr &pkt); - inline void _onGetH264(const char *pcData, int iLen, uint32_t ui32TimeStamp); - inline void onGetH264(const char *pcData, int iLen, uint32_t ui32TimeStamp); - inline void onGetAAC(const char *pcData, int iLen, uint32_t ui32TimeStamp); - //video - H264Frame _h264frame; - //aduio - AACFrame _adts; - - int _iSampleRate = 44100; - int _iSampleBit = 16; - int _iChannel = 1; - - string _strSPS; - string _strPPS; - string _strAudioCfg; - int _iVideoWidth = 0; - int _iVideoHeight = 0; - float _fVideoFps = 0; - //音视频codec_id初始为0代表尚未获取到 - int _iAudioCodecID = 0; - int _iVideoCodecID = 0; float _fDuration = 0; - mutable Ticker _ticker; - function onVideo; - function onAudio; - recursive_mutex _mtxCB; - - + bool _tryGetVideoTrack = false; + bool _tryGetAudioTrack = false; + AudioTrack::Ptr _audioTrack; + VideoTrack::Ptr _videoTrack; + RtmpCodec::Ptr _audioRtmpDecoder; + RtmpCodec::Ptr _videoRtmpDecoder; }; } /* namespace mediakit */ + + + + + + + + + + + + + + + + #endif /* SRC_RTMP_RTMPDEMUXER_H_ */ diff --git a/src/RtspMuxer/RtspDemuxer.cpp b/src/RtspMuxer/RtspDemuxer.cpp index b9c81f60..60883338 100644 --- a/src/RtspMuxer/RtspDemuxer.cpp +++ b/src/RtspMuxer/RtspDemuxer.cpp @@ -56,11 +56,11 @@ RtspDemuxer::RtspDemuxer(const string& sdp) { for (int i = 0; i < cnt; i++) { switch (tmp[i].type) { case TrackVideo: { - onGetVideoTrack(tmp[i]); + makeVideoTrack(tmp[i]); } break; case TrackAudio: { - onGetAudioTrack(tmp[i]); + makeAudioTrack(tmp[i]); } break; default: @@ -79,7 +79,10 @@ bool RtspDemuxer::inputRtp(const RtpPacket::Ptr & rtp) { return false; } case TrackAudio:{ - _audioRtpDecoder->inputRtp(rtp, false); + if(_audioRtpDecoder){ + _audioRtpDecoder->inputRtp(rtp, false); + return false; + } return false; } default: @@ -88,7 +91,7 @@ bool RtspDemuxer::inputRtp(const RtpPacket::Ptr & rtp) { } -inline void RtspDemuxer::onGetAudioTrack(const RtspTrack& audio) { +void RtspDemuxer::makeAudioTrack(const RtspTrack &audio) { //生成Track对象 _audioTrack = dynamic_pointer_cast(Factory::getTrackBySdp(audio.trackSdp)); if(_audioTrack){ @@ -97,11 +100,14 @@ inline void RtspDemuxer::onGetAudioTrack(const RtspTrack& audio) { if(_audioRtpDecoder){ //设置rtp解码器代理，生成的frame写入该Track _audioRtpDecoder->setDelegate(_audioTrack); + } else{ + //找不到相应的rtp解码器，该track无效 + _audioTrack.reset(); } } } -inline void RtspDemuxer::onGetVideoTrack(const RtspTrack& video) { +void RtspDemuxer::makeVideoTrack(const RtspTrack &video) { //生成Track对象 _videoTrack = dynamic_pointer_cast(Factory::getTrackBySdp(video.trackSdp)); if(_videoTrack){ @@ -110,6 +116,9 @@ inline void RtspDemuxer::onGetVideoTrack(const RtspTrack& video) { if(_videoRtpDecoder){ //设置rtp解码器代理，生成的frame写入该Track _videoRtpDecoder->setDelegate(_videoTrack); + }else{ + //找不到相应的rtp解码器，该track无效 + _videoTrack.reset(); } } } @@ -125,5 +134,22 @@ vector RtspDemuxer::getTracks() const { return ret; } +bool RtspDemuxer::isInited() const { + bool ret = true; + if(ret && _audioTrack){ + //getTrackType() 等于TrackInvalid时说明该Track还未准备好 + ret = _audioTrack->getTrackType() != TrackInvalid; + } + if(ret && _videoTrack){ + //getTrackType() 等于TrackInvalid时说明该Track还未准备好 + ret = _videoTrack->getTrackType() != TrackInvalid; + } + return ret; +} + +float RtspDemuxer::getDuration() const { + return _fDuration; +} + } /* namespace mediakit */ diff --git a/src/RtspMuxer/RtspDemuxer.h b/src/RtspMuxer/RtspDemuxer.h index 7a84adfa..0bd70a31 100644 --- a/src/RtspMuxer/RtspDemuxer.h +++ b/src/RtspMuxer/RtspDemuxer.h @@ -45,12 +45,18 @@ public: RtspDemuxer(const string &sdp); virtual ~RtspDemuxer(){}; - //返回值：true 代表是i帧第一个rtp包 + /** + * 开始解复用 + * @param rtp rtp包 + * @return true 代表是i帧第一个rtp包 + */ bool inputRtp(const RtpPacket::Ptr &rtp); - float getDuration() const override { - return _fDuration; - } + /** + * 获取节目总时长 + * @return + */ + float getDuration() const override; /** * 返回是否完成初始化完毕 @@ -58,21 +64,16 @@ public: * 所以要等待接收到到sps的rtp包后才能完成 * @return */ - bool isInited() const override{ - bool ret = true; - if(ret && _audioTrack){ - ret = _audioTrack->getTrackType() != TrackInvalid; - } - if(ret && _videoTrack){ - ret = _videoTrack->getTrackType() != TrackInvalid; - } - return ret; - } + bool isInited() const override; + /** + * 获取所有可用Track，请在isInited()返回true时调用 + * @return + */ vector getTracks() const override; private: - inline void onGetAudioTrack(const RtspTrack &audio); - inline void onGetVideoTrack(const RtspTrack &video); + void makeAudioTrack(const RtspTrack &audio); + void makeVideoTrack(const RtspTrack &video); private: float _fDuration = 0; AudioTrack::Ptr _audioTrack;