From 8b7289a689b530a0000b0dd0b9c949a2ed5cb8f9 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Sun, 11 Apr 2021 12:06:40 +0800
Subject: [PATCH] =?UTF-8?q?rtsp=E6=8E=A8=E6=B5=81=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9B=B4=E6=8E=A5=E4=BB=A3=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Rtsp/RtspMediaSourceImp.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Rtsp/RtspMediaSourceImp.h b/src/Rtsp/RtspMediaSourceImp.h
index 4ecc93b7..8401d4b8 100644
--- a/src/Rtsp/RtspMediaSourceImp.h
+++ b/src/Rtsp/RtspMediaSourceImp.h
@@ -56,7 +56,11 @@ public:
             //需要解复用rtp
             key_pos = _demuxer->inputRtp(rtp);
         }
-        RtspMediaSource::onWrite(std::move(rtp), key_pos);
+        GET_CONFIG(bool, directProxy, Rtsp::kDirectProxy);
+        if (directProxy) {
+            //直接代理模式才直接使用原始rtp
+            RtspMediaSource::onWrite(std::move(rtp), key_pos);
+        }
     }
 
     /**
@@ -72,8 +76,10 @@ public:
      * @param enableMP4  是否mp4录制
      */
     void setProtocolTranslation(bool enableHls,bool enableMP4){
-        //不重复生成rtsp
-        _muxer = std::make_shared<MultiMediaSourceMuxer>(getVhost(), getApp(), getId(), _demuxer->getDuration(), false, true, enableHls, enableMP4);
+        GET_CONFIG(bool, directProxy, Rtsp::kDirectProxy);
+        //开启直接代理模式时，rtsp直接代理，不重复产生；但是有些rtsp推流端，由于sdp中已有sps pps，rtp中就不再包括sps pps,
+        //导致rtc无法播放，所以在rtsp推流rtc播放时，建议关闭直接代理模式
+        _muxer = std::make_shared<MultiMediaSourceMuxer>(getVhost(), getApp(), getId(), _demuxer->getDuration(), !directProxy, true, enableHls, enableMP4);
         _muxer->setMediaListener(getListener());
         _muxer->setTrackListener(static_pointer_cast<RtspMediaSourceImp>(shared_from_this()));
         //让_muxer对象拦截一部分事件(比如说录像相关事件)