THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from xiongziliang/master 

merge
This commit is contained in:
kqbi 2019-12-11 11:12:53 +08:00 committed by GitHub
parent 2f12a66372 99c1dd339f
commit f8c8465aa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/WebApi.cpp
View File

@ -697,7 +697,11 @@ void installWebApi() {
API_REGIST(api,getSsrcInfo,{ API_REGIST(api,getSsrcInfo,{
CHECK_SECRET(); CHECK_SECRET();
CHECK_ARGS("ssrc"); CHECK_ARGS("ssrc");
auto process = RtpSelector::Instance().getProcess(allArgs["ssrc"],false); uint32_t ssrc = 0;
stringstream ss(allArgs["ssrc"]);
ss >> std::hex >> ssrc;
auto process = RtpSelector::Instance().getProcess(ssrc,false);
if(!process){ if(!process){
val["exist"] = false; val["exist"] = false;
return; return;

3
src/Extension/AAC.h
View File

@ -257,6 +257,9 @@ private:
* 解析2个字节的aac配置 * 解析2个字节的aac配置
*/ */
void onReady(){ void onReady(){
if(_cfg.size() < 2){
return;
}
AACFrame aacFrame; AACFrame aacFrame;
makeAdtsHeader(_cfg,aacFrame); makeAdtsHeader(_cfg,aacFrame);
getAACInfo(aacFrame,_sampleRate,_channel); getAACInfo(aacFrame,_sampleRate,_channel);

7
src/Rtp/RtpProcess.cpp
View File

@ -84,7 +84,12 @@ RtpProcess::RtpProcess(uint32_t ssrc) {
_track->_type = TrackVideo; _track->_type = TrackVideo;
_track->_ssrc = _ssrc; _track->_ssrc = _ssrc;
DebugL << printSSRC(_ssrc); DebugL << printSSRC(_ssrc);
_muxer = std::make_shared<MultiMediaSourceMuxer>(DEFAULT_VHOST,"rtp",printSSRC(_ssrc));
GET_CONFIG(bool,toRtxp,General::kPublishToRtxp);
GET_CONFIG(bool,toHls,General::kPublishToHls);
GET_CONFIG(bool,toMP4,General::kPublishToMP4);
_muxer = std::make_shared<MultiMediaSourceMuxer>(DEFAULT_VHOST,"rtp",printSSRC(_ssrc),0,toRtxp,toRtxp,toHls,toMP4);
GET_CONFIG(string,dump_dir,RtpProxy::kDumpDir); GET_CONFIG(string,dump_dir,RtpProxy::kDumpDir);
{ {