Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-28 21:52:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复无法编译的bug

Browse Source
This commit is contained in:
xiongziliang
2018-10-25 17:39:19 +08:00
parent 3d83a236b6
commit dc1ce6fe11
7 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/MediaSource.cpp
View File

@@ -150,8 +150,8 @@ void MediaInfo::parse(const string &url){
auto pos = steamid.find("?");
if(pos != string::npos){
_streamid = steamid.substr(0,pos);
_para_strs = steamid.substr(pos + 1);
_params = Parser::parseArgs(_para_strs);
_param_strs = steamid.substr(pos + 1);
_params = Parser::parseArgs(_param_strs);
if(_params.find(VHOST_KEY) != _params.end()){
_vhost = _params[VHOST_KEY];
}

2
src/Common/MediaSource.h
View File

@@ -85,7 +85,7 @@ public:
string _app;
string _streamid;
StrCaseMap _params;
string _para_strs;
string _param_strs;
};

3
src/Player/MediaPlayer.cpp
View File

@@ -45,9 +45,6 @@ void MediaPlayer::play(const char* strUrl) {
_strPrefix = strPrefix;
_parser = PlayerBase::createPlayer(strUrl);
_parser->setOnShutdown(_shutdownCB);
//todo(xzl) 修复此处
// _parser->setOnVideoCB(_onGetVideoCB);
// _parser->setOnAudioCB(_onGetAudioCB);
}
_parser->setOnPlayResult(_playResultCB);
_parser->mINI::operator=(*this);

18
src/Rtmp/RtmpPlayerImp.h
View File

@@ -64,24 +64,14 @@ private:
if(_pRtmpMediaSrc){
_pRtmpMediaSrc->onGetMetaData(val);
}
try {
_parser.reset(new RtmpDemuxer(val));
//todo(xzl) 修复此处
// _parser->setOnVideoCB(_onGetVideoCB);
// _parser->setOnAudioCB(_onGetAudioCB);
return true;
} catch (std::exception &ex) {
WarnL << ex.what();
return _pRtmpMediaSrc ? true : false;
}
_parser.reset(new RtmpDemuxer(val));
return true;
}
void onMediaData(const RtmpPacket::Ptr &chunkData) override {
if(_parser){
_parser->inputRtmp(chunkData);
}
if(_pRtmpMediaSrc){
_pRtmpMediaSrc->onWrite(chunkData);
}
}
_parser->inputRtmp(chunkData);
}
private:

25
src/Rtsp/RtspPlayerImp.h
View File

@@ -67,26 +67,15 @@ private:
if(_pRtspMediaSrc){
_pRtspMediaSrc->onGetSDP(sdp);
}
try {
_parser.reset(new RtspDemuxer(sdp));
//todo(xzl) 修复此处
// _parser->setOnVideoCB(_onGetVideoCB);
// _parser->setOnAudioCB(_onGetAudioCB);
return true;
} catch (std::exception &ex) {
WarnL << ex.what();
return _pRtspMediaSrc ? true : false;
}
_parser.reset(new RtspDemuxer(sdp));
return true;
}
void onRecvRTP(const RtpPacket::Ptr &rtppt, const RtspTrack &track) override {
if(_parser){
_parser->inputRtp(rtppt);
}
if(_pRtspMediaSrc){
_pRtspMediaSrc->onWrite(rtppt,true);
}
}
if(_pRtspMediaSrc){
_pRtspMediaSrc->onWrite(rtppt,true);
}
_parser->inputRtp(rtppt);
}
private:
RtspMediaSource::Ptr _pRtspMediaSrc;