external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Add RTC stream merging demo by FFmpeg. 4.0.97

Browse source
This commit is contained in:
winlin 2021-05-03 15:53:55 +08:00
parent aa9c4e8604
commit 9fb2b69212
5 changed files with 65 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -1012,6 +1012,10 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcStreamDescripti
return srs_error_new(ERROR_SYSTEM_STREAM_BUSY, "rtmp stream %s busy", r->get_stream_url().c_str());
}
// Disable GOP cache for RTC2RTMP bridger, to keep the streams in sync,
// especially for stream merging.
rtmp->set_cache(false);
SrsRtmpFromRtcBridger *bridger = new SrsRtmpFromRtcBridger(rtmp);
if ((err = bridger->initialize(r)) != srs_success) {
srs_freep(bridger);