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

1, 根据配置, 而不是根据输入源类型来确定 输出流类型

This commit is contained in:
chenlei 2019-07-30 13:06:59 +08:00
parent c9d913929e
commit 744999100d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Player/PlayerProxy.cpp
View File

@ -227,7 +227,7 @@ private:
void PlayerProxy::onPlaySuccess() { void PlayerProxy::onPlaySuccess() {
//chenxiaolei 修改为int, 录像最大录制天数,0就是不录 //chenxiaolei 修改为int, 录像最大录制天数,0就是不录
if (dynamic_pointer_cast<RtspMediaSource>(_pMediaSrc)) { /*if (dynamic_pointer_cast<RtspMediaSource>(_pMediaSrc)) {
//rtsp拉流代理 //rtsp拉流代理
_mediaMuxer.reset(new MultiMediaSourceMuxer(_strVhost, _strApp, _strSrc, getDuration(), false, _bEnableRtmp, _bEnableHls, _bRecordMp4)); _mediaMuxer.reset(new MultiMediaSourceMuxer(_strVhost, _strApp, _strSrc, getDuration(), false, _bEnableRtmp, _bEnableHls, _bRecordMp4));
} else if (dynamic_pointer_cast<RtmpMediaSource>(_pMediaSrc)) { } else if (dynamic_pointer_cast<RtmpMediaSource>(_pMediaSrc)) {
@ -236,7 +236,9 @@ void PlayerProxy::onPlaySuccess() {
} else { } else {
//其他拉流代理 //其他拉流代理
_mediaMuxer.reset(new MultiMediaSourceMuxer(_strVhost, _strApp, _strSrc, getDuration(), _bEnableRtsp, _bEnableRtmp, _bEnableHls, _bRecordMp4)); _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()); _mediaMuxer->setListener(shared_from_this());
auto videoTrack = getTrack(TrackVideo,false); auto videoTrack = getTrack(TrackVideo,false);