From 744999100dac6bf92d266ca2c512c4a31f1deddb Mon Sep 17 00:00:00 2001 From: chenlei Date: Tue, 30 Jul 2019 13:06:59 +0800 Subject: [PATCH] =?UTF-8?q?1,=20=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE,=20?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E6=A0=B9=E6=8D=AE=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=BA=90=E7=B1=BB=E5=9E=8B=E6=9D=A5=E7=A1=AE=E5=AE=9A=20?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=B5=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Player/PlayerProxy.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Player/PlayerProxy.cpp b/src/Player/PlayerProxy.cpp index f4bbe1be..a71c287e 100644 --- a/src/Player/PlayerProxy.cpp +++ b/src/Player/PlayerProxy.cpp @@ -227,7 +227,7 @@ private: void PlayerProxy::onPlaySuccess() { //chenxiaolei 修改为int, 录像最大录制天数,0就是不录 - if (dynamic_pointer_cast(_pMediaSrc)) { + /*if (dynamic_pointer_cast(_pMediaSrc)) { //rtsp拉流代理 _mediaMuxer.reset(new MultiMediaSourceMuxer(_strVhost, _strApp, _strSrc, getDuration(), false, _bEnableRtmp, _bEnableHls, _bRecordMp4)); } else if (dynamic_pointer_cast(_pMediaSrc)) { @@ -236,7 +236,9 @@ void PlayerProxy::onPlaySuccess() { } else { //其他拉流代理 _mediaMuxer.reset(new MultiMediaSourceMuxer(_strVhost, _strApp, _strSrc, getDuration(), _bEnableRtsp, _bEnableRtmp, _bEnableHls, _bRecordMp4)); - } + }*/ + //chenxiaolei 根据配置来做 类型输出, 而不是根据接入源类型, 有些时候就是想要 rtmp->rtmp + _mediaMuxer.reset(new MultiMediaSourceMuxer(_strVhost, _strApp, _strSrc, getDuration(), _bEnableRtsp, _bEnableRtmp, _bEnableHls, _bRecordMp4)); _mediaMuxer->setListener(shared_from_this()); auto videoTrack = getTrack(TrackVideo,false);