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

Merge branch 'develop' into merge/develop

Browse source
This commit is contained in:
winlin 2021-07-24 21:03:29 +08:00
commit 80fad01676
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3115,6 +3115,10 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRtcUserConfig* ruc, s
// @see https://github.com/ossrs/srs/issues/2370
track->extmaps_.clear();
// We should clear the rtcp_fbs of source(publisher).
// @see https://github.com/ossrs/srs/issues/2371
track->media_->rtcp_fbs_.clear();
// Use remote/source/offer PayloadType.
track->media_->pt_of_publisher_ = track->media_->pt_;
track->media_->pt_ = remote_payload.payload_type_;
@ -3131,7 +3135,7 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRtcUserConfig* ruc, s
uint32_t publish_ssrc = track->ssrc_;
vector<string> rtcp_fb;
track->media_->rtcp_fbs_.swap(rtcp_fb);
remote_payload.rtcp_fb_.swap(rtcp_fb);
for (int j = 0; j < (int)rtcp_fb.size(); j++) {
if (nack_enabled) {
if (rtcp_fb.at(j) == "nack" || rtcp_fb.at(j) == "nack pli") {