From fa4fac1e0dbc4ec8150760ad1ca6c6f986385958 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Mon, 9 Dec 2019 17:49:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?rtp=E6=8E=A8=E6=B5=81=E7=94=B1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=86=B3=E5=AE=9A=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BD=95=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtp/RtpProcess.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Rtp/RtpProcess.cpp b/src/Rtp/RtpProcess.cpp
index b19c43c9..d4d57847 100644
--- a/src/Rtp/RtpProcess.cpp
+++ b/src/Rtp/RtpProcess.cpp
@@ -84,7 +84,12 @@ RtpProcess::RtpProcess(uint32_t ssrc) {
     _track->_type = TrackVideo;
     _track->_ssrc = _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);
     {

From df73eb2c10dfe817c413cc42afb48294287bfeee Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Mon, 9 Dec 2019 18:15:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?getSsrcInfo=E6=8E=A5=E5=8F=A3ssrc=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A816=E8=BF=9B=E5=88=B6=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/WebApi.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/WebApi.cpp b/server/WebApi.cpp
index 64402ad8..8b7487a5 100644
--- a/server/WebApi.cpp
+++ b/server/WebApi.cpp
@@ -697,7 +697,11 @@ void installWebApi() {
     API_REGIST(api,getSsrcInfo,{
         CHECK_SECRET();
         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){
             val["exist"] = false;
             return;

From 99c1dd339fe07b4dbc25ce4dc8cb2d5437212e11 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Wed, 11 Dec 2019 09:29:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dadts=E5=A4=B4=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Extension/AAC.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Extension/AAC.h b/src/Extension/AAC.h
index 156c4122..fe78509e 100644
--- a/src/Extension/AAC.h
+++ b/src/Extension/AAC.h
@@ -257,6 +257,9 @@ private:
      * 解析2个字节的aac配置
      */
     void onReady(){
+        if(_cfg.size() < 2){
+            return;
+        }
         AACFrame aacFrame;
         makeAdtsHeader(_cfg,aacFrame);
         getAACInfo(aacFrame,_sampleRate,_channel);