amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-29 22:55:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

开始修改播放器

Browse Source
This commit is contained in:
xiongziliang 2018-10-23 16:41:25 +08:00
parent c5e372c155
commit 49daa1baad
21 changed files with 394 additions and 641 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/Device/PlayerProxy.cpp
View File

@ -83,31 +83,33 @@ PlayerProxy::PlayerProxy(const char *strVhost,
} }
void PlayerProxy::play(const char* strUrl) { void PlayerProxy::play(const char* strUrl) {
weak_ptr<PlayerProxy> weakSelf = shared_from_this(); weak_ptr<PlayerProxy> weakSelf = shared_from_this();
setOnVideoCB( [weakSelf](const H264Frame &data ) {
auto strongSelf = weakSelf.lock(); //todo(xzl) 修复此处
if(!strongSelf){ // setOnVideoCB( [weakSelf](const H264Frame &data ) {
return; // auto strongSelf = weakSelf.lock();
} // if(!strongSelf){
if(strongSelf->m_pChn){ // return;
strongSelf->m_pChn->inputH264((char *)data.data(), data.size(), data.timeStamp); // }
if(!strongSelf->m_haveAudio){ // if(strongSelf->m_pChn){
strongSelf->makeMuteAudio(data.timeStamp); // strongSelf->m_pChn->inputH264((char *)data.data(), data.size(), data.timeStamp);
} // if(!strongSelf->m_haveAudio){
}else{ // strongSelf->makeMuteAudio(data.timeStamp);
strongSelf->initMedia(); // }
} // }else{
}); // strongSelf->initMedia();
setOnAudioCB( [weakSelf](const AACFrame &data ) { // }
auto strongSelf = weakSelf.lock(); // });
if(!strongSelf){ // setOnAudioCB( [weakSelf](const AACFrame &data ) {
return; // auto strongSelf = weakSelf.lock();
} // if(!strongSelf){
if(strongSelf->m_pChn){ // return;
strongSelf->m_pChn->inputAAC((char *)data.data(), data.size(), data.timeStamp); // }
}else{ // if(strongSelf->m_pChn){
strongSelf->initMedia(); // strongSelf->m_pChn->inputAAC((char *)data.data(), data.size(), data.timeStamp);
} // }else{
}); // strongSelf->initMedia();
// }
// });
std::shared_ptr<int> piFailedCnt(new int(0)); //连续播放失败次数 std::shared_ptr<int> piFailedCnt(new int(0)); //连续播放失败次数
string strUrlTmp(strUrl); string strUrlTmp(strUrl);
@ -166,28 +168,31 @@ void PlayerProxy::initMedia() {
} }
m_pChn.reset(new DevChannel(m_strVhost.data(),m_strApp.data(),m_strSrc.data(),getDuration(),m_bEnableHls,m_bEnableMp4)); m_pChn.reset(new DevChannel(m_strVhost.data(),m_strApp.data(),m_strSrc.data(),getDuration(),m_bEnableHls,m_bEnableMp4));
m_pChn->setListener(shared_from_this()); m_pChn->setListener(shared_from_this());
if (containVideo()) {
VideoInfo info;
info.iFrameRate = getVideoFps();
info.iWidth = getVideoWidth();
info.iHeight = getVideoHeight();
m_pChn->initVideo(info);
}
m_haveAudio = containAudio(); //todo(xzl) 修复此处
if (containAudio()) {
AudioInfo info; // if (containVideo()) {
info.iSampleRate = getAudioSampleRate(); // VideoInfo info;
info.iChannel = getAudioChannel(); // info.iFrameRate = getVideoFps();
info.iSampleBit = getAudioSampleBit(); // info.iWidth = getVideoWidth();
m_pChn->initAudio(info); // info.iHeight = getVideoHeight();
}else{ // m_pChn->initVideo(info);
AudioInfo info; // }
info.iSampleRate = MUTE_ADTS_SAMPLE_RATE; //
info.iChannel = MUTE_ADTS_CHN_CNT; // m_haveAudio = containAudio();
info.iSampleBit = MUTE_ADTS_SAMPLE_BIT; // if (containAudio()) {
m_pChn->initAudio(info); // AudioInfo info;
} // info.iSampleRate = getAudioSampleRate();
// info.iChannel = getAudioChannel();
// info.iSampleBit = getAudioSampleBit();
// m_pChn->initAudio(info);
// }else{
// AudioInfo info;
// info.iSampleRate = MUTE_ADTS_SAMPLE_RATE;
// info.iChannel = MUTE_ADTS_CHN_CNT;
// info.iSampleBit = MUTE_ADTS_SAMPLE_BIT;
// m_pChn->initAudio(info);
// }
} }
bool PlayerProxy::shutDown() { bool PlayerProxy::shutDown() {
//通知其停止推流 //通知其停止推流

68
src/MediaFile/Mp4Maker.cpp
View File

@ -131,15 +131,18 @@ void Mp4Maker::_inputH264(void* pData, uint32_t ui32Length, uint32_t ui32Duratio
void Mp4Maker::_inputAAC(void* pData, uint32_t ui32Length, uint32_t ui32Duration) { void Mp4Maker::_inputAAC(void* pData, uint32_t ui32Length, uint32_t ui32Duration) {
GET_CONFIG_AND_REGISTER(uint32_t,recordSec,Config::Record::kFileSecond); GET_CONFIG_AND_REGISTER(uint32_t,recordSec,Config::Record::kFileSecond);
if (!m_pPlayer->containVideo() && (m_hMp4 == MP4_INVALID_FILE_HANDLE || m_ticker.elapsedTime() > recordSec * 1000)) { //todo(xzl) 修复此处
//在I帧率处新建MP4文件
//如果文件未创建或者文件超过10分钟则创建新文件 //
createFile(); // if (!m_pPlayer->containVideo() && (m_hMp4 == MP4_INVALID_FILE_HANDLE || m_ticker.elapsedTime() > recordSec * 1000)) {
} // //在I帧率处新建MP4文件
if (m_hAudio != MP4_INVALID_TRACK_ID) { // //如果文件未创建或者文件超过10分钟则创建新文件
auto duration = ui32Duration * m_pPlayer->getAudioSampleRate() /1000.0; // createFile();
MP4WriteSample(m_hMp4, m_hAudio, (uint8_t*)pData + 7, ui32Length - 7,duration,0,false); // }
} // if (m_hAudio != MP4_INVALID_TRACK_ID) {
// auto duration = ui32Duration * m_pPlayer->getAudioSampleRate() /1000.0;
// MP4WriteSample(m_hMp4, m_hAudio, (uint8_t*)pData + 7, ui32Length - 7,duration,0,false);
// }
} }
void Mp4Maker::createFile() { void Mp4Maker::createFile() {
@ -182,28 +185,31 @@ void Mp4Maker::createFile() {
m_strFileTmp = strFileTmp; m_strFileTmp = strFileTmp;
m_strFile = strFile; m_strFile = strFile;
m_ticker.resetTime(); m_ticker.resetTime();
if(m_pPlayer->containVideo()){
auto &sps = m_pPlayer->getSps(); //todo(xzl) 修复此处
auto &pps = m_pPlayer->getPps();
m_hVideo = MP4AddH264VideoTrack(m_hMp4, 90000, MP4_INVALID_DURATION, // if(m_pPlayer->containVideo()){
m_pPlayer->getVideoWidth(), m_pPlayer->getVideoHeight(), // auto &sps = m_pPlayer->getSps();
sps[5], sps[6], sps[7], 3); // auto &pps = m_pPlayer->getPps();
if(m_hVideo !=MP4_INVALID_TRACK_ID){ // m_hVideo = MP4AddH264VideoTrack(m_hMp4, 90000, MP4_INVALID_DURATION,
MP4AddH264SequenceParameterSet(m_hMp4, m_hVideo, (uint8_t *)sps.data() + 4, sps.size() - 4); // m_pPlayer->getVideoWidth(), m_pPlayer->getVideoHeight(),
MP4AddH264PictureParameterSet(m_hMp4, m_hVideo, (uint8_t *)pps.data() + 4, pps.size() - 4); // sps[5], sps[6], sps[7], 3);
}else{ // if(m_hVideo !=MP4_INVALID_TRACK_ID){
WarnL << "添加视频通道失败:" << strFileTmp; // MP4AddH264SequenceParameterSet(m_hMp4, m_hVideo, (uint8_t *)sps.data() + 4, sps.size() - 4);
} // MP4AddH264PictureParameterSet(m_hMp4, m_hVideo, (uint8_t *)pps.data() + 4, pps.size() - 4);
} // }else{
if(m_pPlayer->containAudio()){ // WarnL << "添加视频通道失败:" << strFileTmp;
m_hAudio = MP4AddAudioTrack(m_hMp4, m_pPlayer->getAudioSampleRate(), MP4_INVALID_DURATION, MP4_MPEG4_AUDIO_TYPE); // }
if (m_hAudio != MP4_INVALID_TRACK_ID) { // }
auto &cfg = m_pPlayer->getAudioCfg(); // if(m_pPlayer->containAudio()){
MP4SetTrackESConfiguration(m_hMp4, m_hAudio,(uint8_t *)cfg.data(), cfg.size()); // m_hAudio = MP4AddAudioTrack(m_hMp4, m_pPlayer->getAudioSampleRate(), MP4_INVALID_DURATION, MP4_MPEG4_AUDIO_TYPE);
}else{ // if (m_hAudio != MP4_INVALID_TRACK_ID) {
WarnL << "添加音频通道失败:" << strFileTmp; // auto &cfg = m_pPlayer->getAudioCfg();
} // MP4SetTrackESConfiguration(m_hMp4, m_hAudio,(uint8_t *)cfg.data(), cfg.size());
} // }else{
// WarnL << "添加音频通道失败:" << strFileTmp;
// }
// }
} }
void Mp4Maker::closeFile() { void Mp4Maker::closeFile() {

3
src/Player/Frame.h
View File

@ -93,8 +93,7 @@ public:
typedef std::shared_ptr<FrameRing> Ptr; typedef std::shared_ptr<FrameRing> Ptr;
FrameRing(){ FrameRing(){
//禁用缓存 _frameRing = std::make_shared<RingType>();
_frameRing = std::make_shared<RingType>(1);
} }
virtual ~FrameRing(){} virtual ~FrameRing(){}

5
src/Player/MediaPlayer.cpp
View File

@ -48,8 +48,9 @@ void MediaPlayer::play(const char* strUrl) {
m_strPrefix = strPrefix; m_strPrefix = strPrefix;
m_parser = PlayerBase::createPlayer(strUrl); m_parser = PlayerBase::createPlayer(strUrl);
m_parser->setOnShutdown(m_shutdownCB); m_parser->setOnShutdown(m_shutdownCB);
m_parser->setOnVideoCB(m_onGetVideoCB); //todo(xzl) 修复此处
m_parser->setOnAudioCB(m_onGetAudioCB); // m_parser->setOnVideoCB(m_onGetVideoCB);
// m_parser->setOnAudioCB(m_onGetAudioCB);
} }
m_parser->setOnPlayResult(m_playResultCB); m_parser->setOnPlayResult(m_playResultCB);
m_parser->mINI::operator=(*this); m_parser->mINI::operator=(*this);

168
src/Player/PlayerBase.h
View File

@ -47,23 +47,7 @@ using namespace ZL::Network;
namespace ZL { namespace ZL {
namespace Player { namespace Player {
class MediaFormat { class PlayerBase : public mINI{
public:
virtual ~MediaFormat(){};
virtual int getVideoHeight() const { return 0; };
virtual int getVideoWidth() const { return 0; };
virtual float getVideoFps() const { return 0; };
virtual int getAudioSampleRate() const { return 0; };
virtual int getAudioSampleBit() const { return 0; };
virtual int getAudioChannel() const { return 0; };
virtual const string& getPps() const { static string null;return null; };
virtual const string& getSps() const { static string null;return null; };
virtual const string& getAudioCfg() const { static string null;return null; };
};
class PlayerBase : public MediaFormat,public mINI{
public: public:
typedef std::shared_ptr<PlayerBase> Ptr; typedef std::shared_ptr<PlayerBase> Ptr;
typedef enum { typedef enum {
@ -85,34 +69,29 @@ public:
//rtsp认证用用户密码是否为md5 //rtsp认证用用户密码是否为md5
static const char kRtspPwdIsMD5[]; static const char kRtspPwdIsMD5[];
PlayerBase(){}; PlayerBase(){}
virtual ~PlayerBase(){}; virtual ~PlayerBase(){}
virtual void play(const char* strUrl) {}; virtual void play(const char* strUrl) {}
virtual void pause(bool bPause) {}; virtual void pause(bool bPause) {}
virtual void teardown() {}; virtual void teardown() {}
virtual void setOnShutdown( const function<void(const SockException &)> &cb) {}; virtual void setOnShutdown( const function<void(const SockException &)> &cb) {}
virtual void setOnPlayResult( const function<void(const SockException &ex)> &cb) {}; virtual void setOnPlayResult( const function<void(const SockException &ex)> &cb) {}
virtual void setOnVideoCB( const function<void(const H264Frame &frame)> &cb) {};
virtual void setOnAudioCB( const function<void(const AACFrame &frame)> &cb) {};
virtual float getProgress() const { return 0;}; virtual float getProgress() const { return 0;}
virtual void seekTo(float fProgress) {}; virtual void seekTo(float fProgress) {}
virtual void setMediaSouce(const MediaSource::Ptr & src) {}; virtual void setMediaSouce(const MediaSource::Ptr & src) {}
virtual bool isInited() const { return true; }; virtual bool isInited() const { return true; }
//TrackVideo = 0, TrackAudio = 1 //TrackVideo = 0, TrackAudio = 1
virtual float getRtpLossRate(int trackType) const {return 0; }; virtual float getRtpLossRate(int trackType) const {return 0; }
virtual float getDuration() const { return 0;}; virtual float getDuration() const { return 0;}
virtual bool containAudio() const { return false; }; virtual int getTrackCount() const { return 0;}
virtual bool containVideo() const { return false; }; virtual Track::Ptr getTrack(int index) const {return nullptr;}
virtual int getTrackCount() const { return 0;};
virtual Track::Ptr getTrack(int index) const {return nullptr;};
protected: protected:
virtual void onShutdown(const SockException &ex) {}; virtual void onShutdown(const SockException &ex) {}
virtual void onPlayResult(const SockException &ex) {}; virtual void onPlayResult(const SockException &ex) {}
}; };
template<typename Parent,typename Parser> template<typename Parent,typename Parser>
@ -120,8 +99,8 @@ class PlayerImp : public Parent
{ {
public: public:
typedef std::shared_ptr<PlayerImp> Ptr; typedef std::shared_ptr<PlayerImp> Ptr;
PlayerImp(){}; PlayerImp(){}
virtual ~PlayerImp(){}; virtual ~PlayerImp(){}
void setOnShutdown(const function<void(const SockException &)> &cb) override { void setOnShutdown(const function<void(const SockException &)> &cb) override {
if (m_parser) { if (m_parser) {
m_parser->setOnShutdown(cb); m_parser->setOnShutdown(cb);
@ -134,92 +113,7 @@ public:
} }
m_playResultCB = cb; m_playResultCB = cb;
} }
void setOnVideoCB(const function<void(const H264Frame &frame)> &cb) override{
if (m_parser) {
m_parser->setOnVideoCB(cb);
}
m_onGetVideoCB = cb;
}
void setOnAudioCB(const function<void(const AACFrame &frame)> &cb) override{
if (m_parser) {
m_parser->setOnAudioCB(cb);
}
m_onGetAudioCB = cb;
}
int getVideoHeight() const override{
if (m_parser) {
return m_parser->getVideoHeight();
}
return PlayerBase::getVideoHeight();
}
int getVideoWidth() const override{
if (m_parser) {
return m_parser->getVideoWidth();
}
return PlayerBase::getVideoWidth();
}
float getVideoFps() const override{
if (m_parser) {
return m_parser->getVideoFps();
}
return PlayerBase::getVideoFps();
}
int getAudioSampleRate() const override{
if (m_parser) {
return m_parser->getAudioSampleRate();
}
return PlayerBase::getAudioSampleRate();
}
int getAudioSampleBit() const override{
if (m_parser) {
return m_parser->getAudioSampleBit();
}
return PlayerBase::getAudioSampleBit();
}
int getAudioChannel() const override{
if (m_parser) {
return m_parser->getAudioChannel();
}
return PlayerBase::getAudioChannel();
}
const string& getPps() const override{
if (m_parser) {
return m_parser->getPps();
}
return PlayerBase::getPps();
}
const string& getSps() const override{
if (m_parser) {
return m_parser->getSps();
}
return PlayerBase::getSps();
}
const string& getAudioCfg() const override{
if (m_parser) {
return m_parser->getAudioCfg();
}
return PlayerBase::getAudioCfg();
}
bool containAudio() const override{
if (m_parser) {
return m_parser->containAudio();
}
return PlayerBase::containAudio();
}
bool containVideo() const override{
if (m_parser) {
return m_parser->containVideo();
}
return PlayerBase::containVideo();
}
bool isInited() const override{ bool isInited() const override{
if (m_parser) { if (m_parser) {
return m_parser->isInited(); return m_parser->isInited();
@ -237,21 +131,33 @@ public:
return m_parser->getProgress(); return m_parser->getProgress();
} }
return PlayerBase::getProgress(); return PlayerBase::getProgress();
}; }
void seekTo(float fProgress) override{ void seekTo(float fProgress) override{
if (m_parser) { if (m_parser) {
return m_parser->seekTo(fProgress); return m_parser->seekTo(fProgress);
} }
return PlayerBase::seekTo(fProgress); return PlayerBase::seekTo(fProgress);
}; }
void setMediaSouce(const MediaSource::Ptr & src) override { void setMediaSouce(const MediaSource::Ptr & src) override {
if (m_parser) { if (m_parser) {
return m_parser->setMediaSouce(src); return m_parser->setMediaSouce(src);
} }
m_pMediaSrc = src; m_pMediaSrc = src;
}; }
virtual int getTrackCount() const override{
if (m_parser) {
return m_parser->getTrackCount();
}
return PlayerBase::getTrackCount();
}
virtual Track::Ptr getTrack(int index) const override{
if (m_parser) {
return m_parser->getTrack(index);
}
return PlayerBase::getTrack(index);
}
protected: protected:
void onShutdown(const SockException &ex) override { void onShutdown(const SockException &ex) override {
if (m_shutdownCB) { if (m_shutdownCB) {
@ -268,11 +174,9 @@ protected:
function<void(const SockException &ex)> m_shutdownCB; function<void(const SockException &ex)> m_shutdownCB;
function<void(const SockException &ex)> m_playResultCB; function<void(const SockException &ex)> m_playResultCB;
std::shared_ptr<Parser> m_parser; std::shared_ptr<Parser> m_parser;
function<void(const H264Frame &frame)> m_onGetVideoCB;
function<void(const AACFrame &frame)> m_onGetAudioCB;
MediaSource::Ptr m_pMediaSrc; MediaSource::Ptr m_pMediaSrc;
}; };
} /* namespace Player */ } /* namespace Player */
} /* namespace ZL */ } /* namespace ZL */

48
src/Player/Track.cpp
View File

@ -3,3 +3,51 @@
// //
#include "Track.h" #include "Track.h"
#include "Util/util.h"
#include "Util/base64.h"
using namespace ZL::Util;
Track::Ptr Track::getTrackBySdp(const string &sdp) {
if (strcasestr(sdp.data(), "mpeg4-generic") != nullptr) {
string aac_cfg_str = FindField(sdp.c_str(), "config=", "\r\n");
if (aac_cfg_str.size() != 4) {
aac_cfg_str = FindField(sdp.c_str(), "config=", ";");
}
if (aac_cfg_str.size() != 4) {
return nullptr;
}
string aac_cfg;
unsigned int cfg1;
sscanf(aac_cfg_str.substr(0, 2).c_str(), "%02X", &cfg1);
cfg1 &= 0x00FF;
aac_cfg.push_back(cfg1);
unsigned int cfg2;
sscanf(aac_cfg_str.substr(2, 2).c_str(), "%02X", &cfg2);
cfg2 &= 0x00FF;
aac_cfg.push_back(cfg2);
return std::make_shared<AACTrack>(aac_cfg);
}
if (strcasestr(sdp.data(), "h264") != nullptr) {
string sps_pps = FindField(sdp.c_str(), "sprop-parameter-sets=", "\r\n");
if(sps_pps.empty()){
return std::make_shared<H264Track>();
}
string base64_SPS = FindField(sps_pps.c_str(), NULL, ",");
string base64_PPS = FindField(sps_pps.c_str(), ",", NULL);
if(base64_PPS.back() == ';'){
base64_PPS.pop_back();
}
auto sps = decodeBase64(base64_SPS);
auto pps = decodeBase64(base64_PPS);
return std::make_shared<H264Track>(sps,pps,0,0);
}
return nullptr;
}

70
src/Player/Track.h
View File

@ -20,6 +20,8 @@ public:
typedef std::shared_ptr<Track> Ptr; typedef std::shared_ptr<Track> Ptr;
Track(){} Track(){}
virtual ~Track(){} virtual ~Track(){}
static Ptr getTrackBySdp(const string &sdp);
}; };
class VideoTrack : public Track { class VideoTrack : public Track {
@ -71,6 +73,11 @@ public:
class H264Track : public VideoTrack{ class H264Track : public VideoTrack{
public: public:
/**
* 不指定sps pps构造h264类型的媒体
* 在随后的inputFrame中获取sps pps
*/
H264Track(){}
/** /**
* 构造h264类型的媒体 * 构造h264类型的媒体
* @param sps sps帧数据 * @param sps sps帧数据
@ -98,7 +105,6 @@ public:
parseSps(_sps); parseSps(_sps);
} }
/** /**
* 返回不带0x00 00 00 01头的sps * 返回不带0x00 00 00 01头的sps
* @return * @return
@ -142,6 +148,68 @@ public:
float getVideoFps() const override{ float getVideoFps() const override{
return _fps; return _fps;
} }
TrackType getTrackType() const override {
if(_sps.empty() || _pps.empty()){
return TrackInvalid;
}
return TrackAudio;
}
/**
* 输入数据帧,并获取sps pps
* @param frame 数据帧
* @param key_pos 是否为关键帧
*/
void inputFrame(const Frame::Ptr &frame,bool key_pos) override{
int type = (*((uint8_t *)frame->data() + frame->prefixSize())) & 0x1F;
switch (type){
case 7:{
//sps
bool flag = _sps.empty();
_sps = string(frame->data() + frame->prefixSize(),frame->size() - frame->prefixSize());
if(flag && _width == 0){
parseSps(_sps);
}
}
break;
case 8:{
//pps
_pps = string(frame->data() + frame->prefixSize(),frame->size() - frame->prefixSize());
}
break;
case 5:{
//I
if(!_sps.empty()){
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->timeStamp = frame->stamp();
insertFrame->type = 7;
insertFrame->buffer = _sps;
insertFrame->iPrefixSize = 0;
VideoTrack::inputFrame(insertFrame, true);
}
if(!_pps.empty()){
H264Frame::Ptr insertFrame = std::make_shared<H264Frame>();
insertFrame->timeStamp = frame->stamp();
insertFrame->type = 8;
insertFrame->buffer = _pps;
insertFrame->iPrefixSize = 0;
VideoTrack::inputFrame(insertFrame, false);
}
VideoTrack::inputFrame(frame, false);
}
break;
case 1:{
//B or P
VideoTrack::inputFrame(frame, false);
}
break;
}
}
private: private:
/** /**
* 解析sps获取宽高fps * 解析sps获取宽高fps

2
src/RTP/RtpCodec.cpp
View File

@ -6,7 +6,7 @@
#include "AACRtpCodec.h" #include "AACRtpCodec.h"
#include "H264RtpCodec.h" #include "H264RtpCodec.h"
RtpCodec::Ptr RtpCodec::getRtpCodec(CodecId codecId, RtpCodec::Ptr RtpCodec::getRtpCodecById(CodecId codecId,
uint32_t ui32Ssrc, uint32_t ui32Ssrc,
uint32_t ui32MtuSize, uint32_t ui32MtuSize,
uint32_t ui32SampleRate, uint32_t ui32SampleRate,

4
src/RTP/RtpCodec.h
View File

@ -55,7 +55,7 @@ public:
RtpRing(){ RtpRing(){
//禁用缓存 //禁用缓存
_rtpRing = std::make_shared<RingType>(1); _rtpRing = std::make_shared<RingType>();
} }
virtual ~RtpRing(){} virtual ~RtpRing(){}
@ -143,7 +143,7 @@ public:
RtpCodec(){} RtpCodec(){}
virtual ~RtpCodec(){} virtual ~RtpCodec(){}
static Ptr getRtpCodec(CodecId codecId, static Ptr getRtpCodecById(CodecId codecId,
uint32_t ui32Ssrc, uint32_t ui32Ssrc,
uint32_t ui32MtuSize, uint32_t ui32MtuSize,
uint32_t ui32SampleRate, uint32_t ui32SampleRate,

2
src/Rtmp/RtmpMediaSource.h
View File

@ -85,7 +85,7 @@ public:
lock_guard<recursive_mutex> lock(m_mtxMap); lock_guard<recursive_mutex> lock(m_mtxMap);
m_metadata = _metadata; m_metadata = _metadata;
RtmpParser parser(_metadata); RtmpParser parser(_metadata);
m_iCfgFrameSize = parser.containAudio() + parser.containVideo(); m_iCfgFrameSize = parser.getTrackCount();
if(ready()){ if(ready()){
MediaSource::regist(); MediaSource::regist();
m_bRegisted = true; m_bRegisted = true;

52
src/Rtmp/RtmpParser.h
View File

@ -53,58 +53,6 @@ public:
bool inputRtmp(const RtmpPacket::Ptr &pkt); bool inputRtmp(const RtmpPacket::Ptr &pkt);
void setOnVideoCB(const function<void(const H264Frame &frame)> &cb) override{
lock_guard<recursive_mutex> lck(m_mtxCB);
onVideo = cb;
}
void setOnAudioCB(const function<void(const AACFrame &frame)> &cb) override{
lock_guard<recursive_mutex> lck(m_mtxCB);
onAudio = cb;
}
int getVideoHeight() const override{
return m_iVideoHeight;
}
int getVideoWidth() const override{
return m_iVideoWidth;
}
float getVideoFps() const override{
return m_fVideoFps;
}
int getAudioSampleRate() const override{
return m_iSampleRate;
}
int getAudioSampleBit() const override{
return m_iSampleBit;
}
int getAudioChannel() const override{
return m_iChannel;
}
const string& getPps() const override{
return m_strPPS;
}
const string& getSps() const override{
return m_strSPS;
}
const string& getAudioCfg() const override{
return m_strAudioCfg;
}
bool containAudio() const override{
//音频只支持aac
return m_iAudioCodecID == AAC_CODEC_ID;
}
bool containVideo () const override{
//视频只支持264
return m_iVideoCodecID == H264_CODEC_ID;
}
bool isInited() const override{ bool isInited() const override{
if((m_iAudioCodecID | m_iVideoCodecID) == 0){ if((m_iAudioCodecID | m_iVideoCodecID) == 0){
//音视频codec_id都未获取到，说明还未初始化成功 //音视频codec_id都未获取到，说明还未初始化成功

5
src/Rtmp/RtmpPlayerImp.h
View File

@ -69,8 +69,9 @@ private:
} }
try { try {
m_parser.reset(new RtmpParser(val)); m_parser.reset(new RtmpParser(val));
m_parser->setOnVideoCB(m_onGetVideoCB); //todo(xzl) 修复此处
m_parser->setOnAudioCB(m_onGetAudioCB); // m_parser->setOnVideoCB(m_onGetVideoCB);
// m_parser->setOnAudioCB(m_onGetAudioCB);
return true; return true;
} catch (std::exception &ex) { } catch (std::exception &ex) {
WarnL << ex.what(); WarnL << ex.what();

139
src/Rtmp/RtmpToRtspMediaSource.cpp
View File

@ -79,76 +79,79 @@ void RtmpToRtspMediaSource::makeSDP() {
strSDP += StrPrinter << "0-"<< m_pParser->getDuration()<< "\r\n" << endl; strSDP += StrPrinter << "0-"<< m_pParser->getDuration()<< "\r\n" << endl;
} }
strSDP += "a=control:*\r\n"; strSDP += "a=control:*\r\n";
if (m_pParser->containVideo()) {
uint32_t ssrc0;
memcpy(&ssrc0, makeRandStr(4, false).data(), 4);
auto lam = [this](const RtpPacket::Ptr &pkt, bool bKeyPos) {
m_pRtspSrc->onGetRTP(pkt,bKeyPos);
};
GET_CONFIG_AND_REGISTER(uint32_t,videoMtu,Config::Rtp::kVideoMtuSize); //todo(xzl) 修复此处
m_pRtpMaker_h264.reset(new RtpMaker_H264(lam, ssrc0,videoMtu));
char strTemp[100]; // if (m_pParser->containVideo()) {
int profile_level_id = 0; // uint32_t ssrc0;
string strSPS =m_pParser->getSps().substr(4); // memcpy(&ssrc0, makeRandStr(4, false).data(), 4);
string strPPS =m_pParser->getPps().substr(4); // auto lam = [this](const RtpPacket::Ptr &pkt, bool bKeyPos) {
if (strSPS.length() >= 4) { // sanity check // m_pRtspSrc->onGetRTP(pkt,bKeyPos);
profile_level_id = (strSPS[1] << 16) | (strSPS[2] << 8) | strSPS[3]; // profile_idc|constraint_setN_flag|level_idc // };
} //
// GET_CONFIG_AND_REGISTER(uint32_t,videoMtu,Config::Rtp::kVideoMtuSize);
//视频通道 // m_pRtpMaker_h264.reset(new RtpMaker_H264(lam, ssrc0,videoMtu));
strSDP += StrPrinter << "m=video 0 RTP/AVP " << m_pRtpMaker_h264->getPlayloadType() //
<< "\r\n" << endl; // char strTemp[100];
strSDP += "b=AS:5100\r\n"; // int profile_level_id = 0;
strSDP += StrPrinter << "a=rtpmap:" << m_pRtpMaker_h264->getPlayloadType() // string strSPS =m_pParser->getSps().substr(4);
<< " H264/" << m_pRtpMaker_h264->getSampleRate() << "\r\n" << endl; // string strPPS =m_pParser->getPps().substr(4);
strSDP += StrPrinter << "a=fmtp:" << m_pRtpMaker_h264->getPlayloadType() // if (strSPS.length() >= 4) { // sanity check
<< " packetization-mode=1;profile-level-id=" << endl; // profile_level_id = (strSPS[1] << 16) | (strSPS[2] << 8) | strSPS[3]; // profile_idc|constraint_setN_flag|level_idc
// }
memset(strTemp, 0, 100); //
sprintf(strTemp, "%06X", profile_level_id); // //视频通道
strSDP += strTemp; // strSDP += StrPrinter << "m=video 0 RTP/AVP " << m_pRtpMaker_h264->getPlayloadType()
strSDP += ";sprop-parameter-sets="; // << "\r\n" << endl;
memset(strTemp, 0, 100); // strSDP += "b=AS:5100\r\n";
av_base64_encode(strTemp, 100, (uint8_t *) strSPS.data(), strSPS.size()); // strSDP += StrPrinter << "a=rtpmap:" << m_pRtpMaker_h264->getPlayloadType()
strSDP += strTemp; // << " H264/" << m_pRtpMaker_h264->getSampleRate() << "\r\n" << endl;
strSDP += ","; // strSDP += StrPrinter << "a=fmtp:" << m_pRtpMaker_h264->getPlayloadType()
memset(strTemp, 0, 100); // << " packetization-mode=1;profile-level-id=" << endl;
av_base64_encode(strTemp, 100, (uint8_t *) strPPS.data(), strPPS.size()); //
strSDP += strTemp; // memset(strTemp, 0, 100);
strSDP += "\r\n"; // sprintf(strTemp, "%06X", profile_level_id);
strSDP += StrPrinter << "a=control:trackID=" << m_pRtpMaker_h264->getInterleaved() / 2 // strSDP += strTemp;
<< "\r\n" << endl; // strSDP += ";sprop-parameter-sets=";
} // memset(strTemp, 0, 100);
// av_base64_encode(strTemp, 100, (uint8_t *) strSPS.data(), strSPS.size());
if (m_pParser->containAudio()) { // strSDP += strTemp;
uint32_t ssrc1; // strSDP += ",";
memcpy(&ssrc1, makeRandStr(8, false).data() + 4, 4); // memset(strTemp, 0, 100);
auto lam = [this](const RtpPacket::Ptr &pkt, bool bKeyPos) { // av_base64_encode(strTemp, 100, (uint8_t *) strPPS.data(), strPPS.size());
m_pRtspSrc->onGetRTP(pkt,bKeyPos); // strSDP += strTemp;
}; // strSDP += "\r\n";
GET_CONFIG_AND_REGISTER(uint32_t,audioMtu,Config::Rtp::kAudioMtuSize); // strSDP += StrPrinter << "a=control:trackID=" << m_pRtpMaker_h264->getInterleaved() / 2
m_pRtpMaker_aac.reset(new RtpMaker_AAC(lam, ssrc1, audioMtu,m_pParser->getAudioSampleRate())); // << "\r\n" << endl;
// }
char configStr[32]; //
const string & strAacCfg = m_pParser->getAudioCfg(); // if (m_pParser->containAudio()) {
snprintf(configStr, sizeof(configStr), "%02X%02x", strAacCfg[0], strAacCfg[1]); // uint32_t ssrc1;
strSDP += StrPrinter << "m=audio 0 RTP/AVP " << m_pRtpMaker_aac->getPlayloadType() // memcpy(&ssrc1, makeRandStr(8, false).data() + 4, 4);
<< "\r\n" << endl; // auto lam = [this](const RtpPacket::Ptr &pkt, bool bKeyPos) {
strSDP += "b=AS:96\r\n"; // m_pRtspSrc->onGetRTP(pkt,bKeyPos);
strSDP += StrPrinter << "a=rtpmap:" << m_pRtpMaker_aac->getPlayloadType() // };
<< " MPEG4-GENERIC/" << m_pRtpMaker_aac->getSampleRate() << "\r\n" // GET_CONFIG_AND_REGISTER(uint32_t,audioMtu,Config::Rtp::kAudioMtuSize);
<< endl; // m_pRtpMaker_aac.reset(new RtpMaker_AAC(lam, ssrc1, audioMtu,m_pParser->getAudioSampleRate()));
strSDP += StrPrinter << "a=fmtp:" << m_pRtpMaker_aac->getPlayloadType() //
<< " streamtype=5;profile-level-id=1;mode=AAC-hbr;" // char configStr[32];
<< "sizelength=13;indexlength=3;indexdeltalength=3;config=" // const string & strAacCfg = m_pParser->getAudioCfg();
<< endl; // snprintf(configStr, sizeof(configStr), "%02X%02x", strAacCfg[0], strAacCfg[1]);
strSDP.append(configStr, 4); // strSDP += StrPrinter << "m=audio 0 RTP/AVP " << m_pRtpMaker_aac->getPlayloadType()
strSDP += "\r\n"; // << "\r\n" << endl;
strSDP += StrPrinter << "a=control:trackID=" << m_pRtpMaker_aac->getInterleaved() / 2 // strSDP += "b=AS:96\r\n";
<< "\r\n" << endl; // strSDP += StrPrinter << "a=rtpmap:" << m_pRtpMaker_aac->getPlayloadType()
} // << " MPEG4-GENERIC/" << m_pRtpMaker_aac->getSampleRate() << "\r\n"
// << endl;
// strSDP += StrPrinter << "a=fmtp:" << m_pRtpMaker_aac->getPlayloadType()
// << " streamtype=5;profile-level-id=1;mode=AAC-hbr;"
// << "sizelength=13;indexlength=3;indexdeltalength=3;config="
// << endl;
// strSDP.append(configStr, 4);
// strSDP += "\r\n";
// strSDP += StrPrinter << "a=control:trackID=" << m_pRtpMaker_aac->getInterleaved() / 2
// << "\r\n" << endl;
// }
m_pRtspSrc.reset(new RtspMediaSource(getVhost(),getApp(),getId())); m_pRtspSrc.reset(new RtspMediaSource(getVhost(),getApp(),getId()));
m_pRtspSrc->setListener(m_listener); m_pRtspSrc->setListener(m_listener);

6
src/Rtmp/RtmpToRtspMediaSource.h
View File

@ -67,8 +67,10 @@ public:
try { try {
m_pParser.reset(new RtmpParser(_metadata)); m_pParser.reset(new RtmpParser(_metadata));
m_pRecorder.reset(new MediaRecorder(getVhost(),getApp(),getId(),m_pParser,m_bEnableHls,m_bEnableMp4)); m_pRecorder.reset(new MediaRecorder(getVhost(),getApp(),getId(),m_pParser,m_bEnableHls,m_bEnableMp4));
m_pParser->setOnAudioCB(std::bind(&RtmpToRtspMediaSource::onGetAdts, this, placeholders::_1)); //todo(xzl) 修复此处
m_pParser->setOnVideoCB(std::bind(&RtmpToRtspMediaSource::onGetH264, this, placeholders::_1));
// m_pParser->setOnAudioCB(std::bind(&RtmpToRtspMediaSource::onGetAdts, this, placeholders::_1));
// m_pParser->setOnVideoCB(std::bind(&RtmpToRtspMediaSource::onGetH264, this, placeholders::_1));
} catch (exception &ex) { } catch (exception &ex) {
WarnL << ex.what(); WarnL << ex.what();
} }

196
src/Rtsp/RtpParser.cpp
View File

@ -91,8 +91,8 @@ RtpParser::RtpParser(const string& sdp) {
RtpParser::~RtpParser() { RtpParser::~RtpParser() {
} }
bool RtpParser::inputRtp(const RtpPacket& rtp) { bool RtpParser::inputRtp(const RtpPacket::Ptr & rtp) {
auto &track = m_mapTracks[rtp.PT]; auto &track = m_mapTracks[rtp->PT];
switch (track.type) { switch (track.type) {
case TrackVideo: case TrackVideo:
if (m_bHaveVideo) { if (m_bHaveVideo) {
@ -109,205 +109,19 @@ bool RtpParser::inputRtp(const RtpPacket& rtp) {
} }
} }
inline bool RtpParser::inputVideo(const RtpPacket& rtppack, inline bool RtpParser::inputVideo(const RtpPacket::Ptr & rtp, const RtspTrack& track) {
const RtspTrack& track) {
const uint8_t *frame = (uint8_t *) rtppack.payload + rtppack.offset;
int length = rtppack.length - rtppack.offset;
NALU nal;
MakeNalu(*frame, nal);
//Type==1:P frame
//Type==6:SEI frame
//Type==7:SPS frame
//Type==8:PPS frame
if (nal.type >= 0 && nal.type < 24) {
//a full frame
m_h264frame.buffer.assign("\x0\x0\x0\x1", 4);
m_h264frame.buffer.append((char *)frame, length);
m_h264frame.type = nal.type;
m_h264frame.timeStamp = rtppack.timeStamp / 90;
m_h264frame.sequence = rtppack.sequence;
_onGetH264(m_h264frame);
m_h264frame.buffer.clear();
return (m_h264frame.type == 7);
}
if (nal.type == 28) {
//FU-A
FU fu;
MakeFU(frame[1], fu);
if (fu.S == 1) {
//FU-A start
char tmp = (nal.forbidden_zero_bit << 7 | nal.nal_ref_idc << 5 | fu.type);
m_h264frame.buffer.assign("\x0\x0\x0\x1", 4);
m_h264frame.buffer.push_back(tmp);
m_h264frame.buffer.append((char *)frame + 2, length - 2);
m_h264frame.type = fu.type;
m_h264frame.timeStamp = rtppack.timeStamp / 90;
m_h264frame.sequence = rtppack.sequence;
return (m_h264frame.type == 7); //i frame
}
if (rtppack.sequence != (uint16_t)(m_h264frame.sequence + 1)) {
m_h264frame.buffer.clear();
WarnL << "丢包,帧废弃:" << rtppack.sequence << "," << m_h264frame.sequence;
return false;
}
m_h264frame.sequence = rtppack.sequence;
if (fu.E == 1) {
//FU-A end
m_h264frame.buffer.append((char *)frame + 2, length - 2);
m_h264frame.timeStamp = rtppack.timeStamp / 90;
_onGetH264(m_h264frame);
m_h264frame.buffer.clear();
return false;
}
//FU-A mid
m_h264frame.buffer.append((char *)frame + 2, length - 2);
return false;
}
WarnL << nal.type << " " << rtppack.sequence;
return false;
// 29 FU-B 单NAL单元B模式
// 24 STAP-A 单一时间的组合包
// 25 STAP-B 单一时间的组合包
// 26 MTAP16 多个时间的组合包
// 27 MTAP24 多个时间的组合包
// 0 udef
// 30 udef
// 31 udef
} }
inline void RtpParser::onGetAudioTrack(const RtspTrack& audio) { inline void RtpParser::onGetAudioTrack(const RtspTrack& audio) {
for (auto &ch : const_cast<string &>(audio.trackSdp)) {
ch = tolower(ch);
}
if (audio.trackSdp.find("mpeg4-generic") == string::npos) {
throw std::runtime_error("只支持aac格式的音频！");
}
string fConfigStr = FindField(audio.trackSdp.c_str(), "config=", "\r\n");
if (fConfigStr.size() != 4) {
fConfigStr = FindField(audio.trackSdp.c_str(), "config=", ";");
}
if (fConfigStr.size() != 4) {
throw std::runtime_error("解析aac格式头失败！");
}
m_strAudioCfg.clear();
unsigned int cfg1;
sscanf(fConfigStr.substr(0, 2).c_str(), "%02X", &cfg1);
cfg1 &= 0x00FF;
m_strAudioCfg.push_back(cfg1);
unsigned int cfg2;
sscanf(fConfigStr.substr(2, 2).c_str(), "%02X", &cfg2);
cfg2 &= 0x00FF;
m_strAudioCfg.push_back(cfg2);
makeAdtsHeader(m_strAudioCfg,m_adts);
getAACInfo(m_adts, m_iSampleRate, m_iChannel);
if(m_adts.profile >= 3){
throw std::runtime_error("不支持该profile的AAC");
}
} }
inline void RtpParser::onGetVideoTrack(const RtspTrack& video) { inline void RtpParser::onGetVideoTrack(const RtspTrack& video) {
if (video.trackSdp.find("H264") == string::npos) {
throw std::runtime_error("只支持264格式的视频！");
}
string sps_pps = FindField(video.trackSdp.c_str(), "sprop-parameter-sets=", "\r\n");
if(sps_pps.empty()){
//SDP里面没SPS_PPS描述，需要在后续rtp中获取
m_bParseSpsDelay = true;
return;
}
string base64_SPS = FindField(sps_pps.c_str(), NULL, ",");
string base64_PPS = FindField(sps_pps.c_str(), ",", NULL);
if(base64_PPS.back() == ';'){
base64_PPS.pop_back();
}
uint8_t SPS_BUF[256], PPS_BUF[256];
int SPS_LEN = av_base64_decode(SPS_BUF, base64_SPS.c_str(), sizeof(SPS_BUF));
int PPS_LEN = av_base64_decode(PPS_BUF, base64_PPS.c_str(), sizeof(PPS_BUF));
m_strSPS.assign("\x00\x00\x00\x01", 4);
m_strSPS.append((char *) SPS_BUF, SPS_LEN);
m_strPPS.assign("\x00\x00\x00\x01", 4);
m_strPPS.append((char *) PPS_BUF, PPS_LEN);
string strTmp((char *)SPS_BUF, SPS_LEN);
if (!getAVCInfo(strTmp, m_iVideoWidth, m_iVideoHeight, m_fVideoFps)) {
throw std::runtime_error("parse sdp failed");
}
} }
inline bool RtpParser::inputAudio(const RtpPacket& rtppack, inline bool RtpParser::inputAudio(const RtpPacket::Ptr &rtppack, const RtspTrack& track) {
const RtspTrack& track) {
char *frame = (char *) rtppack.payload + rtppack.offset;
int length = rtppack.length - rtppack.offset;
if (m_adts.aac_frame_length + length - 4 > sizeof(AACFrame::buffer)) {
m_adts.aac_frame_length = 7;
return false;
}
memcpy(m_adts.buffer + m_adts.aac_frame_length, frame + 4, length - 4);
m_adts.aac_frame_length += (length - 4);
if (rtppack.mark == true) {
m_adts.sequence = rtppack.sequence;
m_adts.timeStamp = rtppack.timeStamp * (1000.0 / m_iSampleRate);
writeAdtsHeader(m_adts, m_adts.buffer);
onGetAdts(m_adts);
m_adts.aac_frame_length = 7;
}
return false;
}
inline void RtpParser::_onGetH264(H264Frame& frame) {
switch (frame.type) {
case 5: { //I
H264Frame insertedFrame;
insertedFrame.type = 7; //SPS
insertedFrame.timeStamp = frame.timeStamp;
insertedFrame.buffer = m_strSPS;
onGetH264(insertedFrame);
insertedFrame.type = 8; //PPS
insertedFrame.timeStamp = frame.timeStamp;
insertedFrame.buffer = m_strPPS;
onGetH264(insertedFrame);
onGetH264(frame);
}
break;
case 7: {//SPS
m_strSPS = frame.buffer;
if(m_bParseSpsDelay && !m_strSPS.empty()){
m_bParseSpsDelay = false;
getAVCInfo(m_strSPS, m_iVideoWidth, m_iVideoHeight, m_fVideoFps);
}
}
break;
case 8://PPS
m_strPPS=frame.buffer;
break;
case 1:
//B or P
onGetH264(frame);
break;
default:
break;
}
}
inline void RtpParser::onGetH264(H264Frame& frame) {
//frame.timeStamp=ticker0.elapsedTime();
lock_guard<recursive_mutex> lck(m_mtxCB);
if (onVideo) {
onVideo(frame);
}
}
inline void RtpParser::onGetAdts(AACFrame& frame) {
//frame.timeStamp=ticker1.elapsedTime();
lock_guard<recursive_mutex> lck(m_mtxCB);
if (onAudio) {
onAudio(frame);
}
} }
} /* namespace Rtsp */ } /* namespace Rtsp */

77
src/Rtsp/RtpParser.h
View File

@ -47,57 +47,12 @@ public:
RtpParser(const string &sdp); RtpParser(const string &sdp);
virtual ~RtpParser(); virtual ~RtpParser();
//返回值：true 代表是i帧第一个rtp包 //返回值：true 代表是i帧第一个rtp包
bool inputRtp(const RtpPacket &rtp); bool inputRtp(const RtpPacket::Ptr &rtp);
void setOnVideoCB(const function<void(const H264Frame &frame)> &cb) override{
lock_guard<recursive_mutex> lck(m_mtxCB); float getDuration() const override {
onVideo = cb; return m_fDuration;
}
void setOnAudioCB(const function<void(const AACFrame &frame)> &cb) override{
lock_guard<recursive_mutex> lck(m_mtxCB);
onAudio = cb;
} }
int getVideoHeight() const override{
return m_iVideoHeight;
}
int getVideoWidth() const override{
return m_iVideoWidth;
}
float getVideoFps() const override{
return m_fVideoFps;
}
int getAudioSampleRate() const override{
return m_iSampleRate;
}
int getAudioSampleBit() const override{
return m_iSampleBit;
}
int getAudioChannel() const override{
return m_iChannel;
}
const string& getPps() const override{
return m_strPPS;
}
const string& getSps() const override{
return m_strSPS;
}
const string& getAudioCfg() const override{
return m_strAudioCfg;
}
bool containAudio() const override{
return m_bHaveAudio;
}
bool containVideo() const override{
return m_bHaveVideo;
}
bool isInited() const override{ bool isInited() const override{
if (m_bHaveAudio && !m_strAudioCfg.size()) { if (m_bHaveAudio && !m_strAudioCfg.size()) {
return false; return false;
@ -107,9 +62,6 @@ public:
} }
return true; return true;
} }
float getDuration() const override {
return m_fDuration;
}
private: private:
std::unordered_map<uint8_t, RtspTrack> m_mapTracks; std::unordered_map<uint8_t, RtspTrack> m_mapTracks;
@ -117,33 +69,16 @@ private:
inline void onGetVideoTrack(const RtspTrack &video); inline void onGetVideoTrack(const RtspTrack &video);
//返回值：true 代表是i帧第一个rtp包 //返回值：true 代表是i帧第一个rtp包
inline bool inputVideo(const RtpPacket &rtp, const RtspTrack &track); inline bool inputVideo(const RtpPacket::Ptr &rtp, const RtspTrack &track);
inline bool inputAudio(const RtpPacket &rtp, const RtspTrack &track); inline bool inputAudio(const RtpPacket::Ptr &rtp, const RtspTrack &track);
inline void _onGetH264(H264Frame &frame);
inline void onGetH264(H264Frame &frame);
inline void onGetAdts(AACFrame &frame);
//video
H264Frame m_h264frame;
//aduio
AACFrame m_adts;
int m_iSampleRate = 44100;
int m_iSampleBit = 16;
int m_iChannel = 1;
string m_strSPS; string m_strSPS;
string m_strPPS; string m_strPPS;
string m_strAudioCfg; string m_strAudioCfg;
int m_iVideoWidth = 0;
int m_iVideoHeight = 0;
float m_fVideoFps = 0;
bool m_bHaveAudio = false; bool m_bHaveAudio = false;
bool m_bHaveVideo= false; bool m_bHaveVideo= false;
float m_fDuration = 0; float m_fDuration = 0;
bool m_bParseSpsDelay = false;
function<void(const H264Frame &frame)> onVideo;
function<void(const AACFrame &frame)> onAudio;
recursive_mutex m_mtxCB; recursive_mutex m_mtxCB;
}; };

8
src/Rtsp/RtspEncoder.h
View File

@ -108,7 +108,7 @@ public:
* @param mtu mtu大小，一般小于1500字节，推荐1400 * @param mtu mtu大小，一般小于1500字节，推荐1400
*/ */
virtual void createRtpEncoder(uint32_t ssrc, int mtu) { virtual void createRtpEncoder(uint32_t ssrc, int mtu) {
_encoder = RtpCodec::getRtpCodec (getCodecId(), _encoder = RtpCodec::getRtpCodecById(getCodecId(),
ssrc, ssrc,
mtu, mtu,
_sample_rate, _sample_rate,
@ -275,10 +275,8 @@ public:
* 构成函数 * 构成函数
*/ */
RtspEncoder(){ RtspEncoder(){
//自适应缓存 _rtpRing = std::make_shared<RtpRingInterface::RingType>();
_rtpRing = std::make_shared<RtpRingInterface::RingType>(0); _frameRing = std::make_shared<FrameRingInterface::RingType>();
//禁用缓存
_frameRing = std::make_shared<FrameRingInterface::RingType>(1);
} }
virtual ~RtspEncoder(){} virtual ~RtspEncoder(){}

6
src/Rtsp/RtspPlayer.cpp
View File

@ -442,7 +442,8 @@ bool RtspPlayer::sendPause(bool bPause,float fTime){
if (m_aTrackInfo[i].type == TrackVideo) { if (m_aTrackInfo[i].type == TrackVideo) {
m_adFistStamp[i] = m_adNowStamp[i] + iTimeInc * 90000.0; m_adFistStamp[i] = m_adNowStamp[i] + iTimeInc * 90000.0;
}else if (m_aTrackInfo[i].type == TrackAudio){ }else if (m_aTrackInfo[i].type == TrackAudio){
m_adFistStamp[i] = m_adNowStamp[i] + iTimeInc * getAudioSampleRate(); //todo(xzl) 修复此处
// m_adFistStamp[i] = m_adNowStamp[i] + iTimeInc * getAudioSampleRate();
} }
m_adNowStamp[i] = m_adFistStamp[i]; m_adNowStamp[i] = m_adFistStamp[i];
} }
@ -718,7 +719,10 @@ float RtspPlayer::getProgressTime() const{
if (m_aTrackInfo[i].type == TrackVideo) { if (m_aTrackInfo[i].type == TrackVideo) {
iTime[i] = (m_adNowStamp[i] - m_adFistStamp[i]) / 90000.0; iTime[i] = (m_adNowStamp[i] - m_adFistStamp[i]) / 90000.0;
}else if (m_aTrackInfo[i].type == TrackAudio){ }else if (m_aTrackInfo[i].type == TrackAudio){
//todo(xzl) 修复此处
#if 0
iTime[i] = (m_adNowStamp[i] - m_adFistStamp[i]) / getAudioSampleRate(); iTime[i] = (m_adNowStamp[i] - m_adFistStamp[i]) / getAudioSampleRate();
#endif
} }
} }
return m_fSeekTo + MAX(iTime[0],iTime[1]); return m_fSeekTo + MAX(iTime[0],iTime[1]);

7
src/Rtsp/RtspPlayerImp.h
View File

@ -71,8 +71,9 @@ private:
} }
try { try {
m_parser.reset(new RtpParser(sdp)); m_parser.reset(new RtpParser(sdp));
m_parser->setOnVideoCB(m_onGetVideoCB); //todo(xzl) 修复此处
m_parser->setOnAudioCB(m_onGetAudioCB); // m_parser->setOnVideoCB(m_onGetVideoCB);
// m_parser->setOnAudioCB(m_onGetAudioCB);
return true; return true;
} catch (std::exception &ex) { } catch (std::exception &ex) {
WarnL << ex.what(); WarnL << ex.what();
@ -81,7 +82,7 @@ private:
} }
void onRecvRTP(const RtpPacket::Ptr &rtppt, const RtspTrack &track) override { void onRecvRTP(const RtpPacket::Ptr &rtppt, const RtspTrack &track) override {
if(m_parser){ if(m_parser){
m_parser->inputRtp(*rtppt); m_parser->inputRtp(rtppt);
} }
if(m_pRtspMediaSrc){ if(m_pRtspMediaSrc){

14
src/Rtsp/RtspToRtmpMediaSource.cpp
View File

@ -63,8 +63,10 @@ void RtspToRtmpMediaSource::makeVideoConfigPkt() {
////////////sps ////////////sps
rtmpPkt->strBuf.push_back(1); // version rtmpPkt->strBuf.push_back(1); // version
string m_sps = m_pParser->getSps().substr(4);
string m_pps = m_pParser->getPps().substr(4); //todo(xzl) 修复此处
string m_sps ;//= m_pParser->getSps().substr(4);
string m_pps ;//= m_pParser->getPps().substr(4);
//DebugL<<hexdump(m_sps.data(), m_sps.size()); //DebugL<<hexdump(m_sps.data(), m_sps.size());
rtmpPkt->strBuf.push_back(m_sps[1]); // profile rtmpPkt->strBuf.push_back(m_sps[1]); // profile
rtmpPkt->strBuf.push_back(m_sps[2]); // compat rtmpPkt->strBuf.push_back(m_sps[2]); // compat
@ -145,6 +147,8 @@ void RtspToRtmpMediaSource::onGetAdts(const AACFrame& frame) {
} }
void RtspToRtmpMediaSource::makeAudioConfigPkt() { void RtspToRtmpMediaSource::makeAudioConfigPkt() {
//todo(xzl) 修复此处
#if 0
uint8_t flvStereoOrMono = (m_pParser->getAudioChannel() > 1); uint8_t flvStereoOrMono = (m_pParser->getAudioChannel() > 1);
uint8_t flvSampleRate; uint8_t flvSampleRate;
switch (m_pParser->getAudioSampleRate()) { switch (m_pParser->getAudioSampleRate()) {
@ -182,6 +186,8 @@ void RtspToRtmpMediaSource::makeAudioConfigPkt() {
rtmpPkt->timeStamp = 0; rtmpPkt->timeStamp = 0;
rtmpPkt->typeId = MSG_AUDIO; rtmpPkt->typeId = MSG_AUDIO;
m_pRtmpSrc->onGetMedia(rtmpPkt); m_pRtmpSrc->onGetMedia(rtmpPkt);
#endif
} }
void RtspToRtmpMediaSource::makeMetaData() { void RtspToRtmpMediaSource::makeMetaData() {
@ -190,6 +196,9 @@ void RtspToRtmpMediaSource::makeMetaData() {
AMFValue metaData(AMF_OBJECT); AMFValue metaData(AMF_OBJECT);
metaData.set("duration", m_pParser->getDuration()); metaData.set("duration", m_pParser->getDuration());
metaData.set("fileSize", 0); metaData.set("fileSize", 0);
//todo(xzl) 修复此处
#if 0
if (m_pParser->containVideo()) { if (m_pParser->containVideo()) {
metaData.set("width", m_pParser->getVideoWidth()); metaData.set("width", m_pParser->getVideoWidth());
metaData.set("height", m_pParser->getVideoHeight()); metaData.set("height", m_pParser->getVideoHeight());
@ -208,6 +217,7 @@ void RtspToRtmpMediaSource::makeMetaData() {
makeAudioConfigPkt(); makeAudioConfigPkt();
} }
#endif
m_pRtmpSrc->onGetMetaData(metaData); m_pRtmpSrc->onGetMetaData(metaData);
} }
} /* namespace Rtsp */ } /* namespace Rtsp */

24
src/Rtsp/RtspToRtmpMediaSource.h
View File

@ -54,8 +54,9 @@ public:
try { try {
m_pParser.reset(new RtpParser(strSdp)); m_pParser.reset(new RtpParser(strSdp));
m_pRecorder.reset(new MediaRecorder(getVhost(),getApp(),getId(),m_pParser,m_bEnableHls,m_bEnableMp4)); m_pRecorder.reset(new MediaRecorder(getVhost(),getApp(),getId(),m_pParser,m_bEnableHls,m_bEnableMp4));
m_pParser->setOnAudioCB( std::bind(&RtspToRtmpMediaSource::onGetAdts, this, placeholders::_1)); //todo(xzl) 修复此处
m_pParser->setOnVideoCB( std::bind(&RtspToRtmpMediaSource::onGetH264, this, placeholders::_1)); // m_pParser->setOnAudioCB( std::bind(&RtspToRtmpMediaSource::onGetAdts, this, placeholders::_1));
// m_pParser->setOnVideoCB( std::bind(&RtspToRtmpMediaSource::onGetH264, this, placeholders::_1));
makeMetaData(); makeMetaData();
} catch (exception &ex) { } catch (exception &ex) {
WarnL << ex.what(); WarnL << ex.what();
@ -64,7 +65,7 @@ public:
} }
virtual void onGetRTP(const RtpPacket::Ptr &pRtppkt, bool bKeyPos) override{ virtual void onGetRTP(const RtpPacket::Ptr &pRtppkt, bool bKeyPos) override{
if (m_pParser) { if (m_pParser) {
bKeyPos = m_pParser->inputRtp(*pRtppkt); bKeyPos = m_pParser->inputRtp(pRtppkt);
} }
RtspMediaSource::onGetRTP(pRtppkt, bKeyPos); RtspMediaSource::onGetRTP(pRtppkt, bKeyPos);
} }
@ -77,7 +78,8 @@ public:
for (auto &pr : m_mapTracks) { for (auto &pr : m_mapTracks) {
switch (pr.second.type) { switch (pr.second.type) {
case TrackAudio: { case TrackAudio: {
pr.second.timeStamp = uiStamp * (m_pParser->getAudioSampleRate() / 1000.0); //todo(xzl) 修复此处
// pr.second.timeStamp = uiStamp * (m_pParser->getAudioSampleRate() / 1000.0);
} }
break; break;
case TrackVideo: { case TrackVideo: {
@ -89,6 +91,14 @@ public:
} }
} }
} }
protected:
void onGetH264(const H264Frame &frame);
void onGetAdts(const AACFrame &frame);
private:
void makeVideoConfigPkt();
void makeAudioConfigPkt();
void makeMetaData();
private: private:
RtpParser::Ptr m_pParser; RtpParser::Ptr m_pParser;
RtmpMediaSource::Ptr m_pRtmpSrc; RtmpMediaSource::Ptr m_pRtmpSrc;
@ -96,11 +106,7 @@ private:
MediaRecorder::Ptr m_pRecorder; MediaRecorder::Ptr m_pRecorder;
bool m_bEnableHls; bool m_bEnableHls;
bool m_bEnableMp4; bool m_bEnableMp4;
void onGetH264(const H264Frame &frame);
void onGetAdts(const AACFrame &frame);
void makeVideoConfigPkt();
void makeAudioConfigPkt();
void makeMetaData();
}; };
} /* namespace Rtsp */ } /* namespace Rtsp */