Bug 1283619: enable far end REMB support for sending conduits depending on signaling. r=jesup draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Thu, 30 Jun 2016 14:22:38 -0700
changeset 382925 e69e462f94b121f8e7640b436c598f6ad3daee5a
parent 382798 82e1f1b9c0559f38a8460e2f2f3044de4c7712d6
child 524340 e0ebf62f03254df37f1b8d3ef7c4970d5b1bc505
push id21877
push userdrno@ohlmeier.org
push dateThu, 30 Jun 2016 21:22:53 +0000
reviewersjesup
bugs1283619
milestone50.0a1
Bug 1283619: enable far end REMB support for sending conduits depending on signaling. r=jesup MozReview-Commit-ID: BBuhSHw2Wyb
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -789,17 +789,18 @@ WebrtcVideoConduit::ConfigureSendMediaCo
 
   {
     MutexAutoLock lock(mCodecMutex);
 
     //Copy the applied config for future reference.
     mCurSendCodecConfig = new VideoCodecConfig(*codecConfig);
   }
 
-  mPtrRTP->SetRembStatus(mChannel, true, false);
+  bool remb_requested = codecConfig->RtcpFbRembIsSet();
+  mPtrRTP->SetRembStatus(mChannel, true, remb_requested);
 
   return kMediaConduitNoError;
 }
 
 MediaConduitErrorCode
 WebrtcVideoConduit::ConfigureRecvMediaCodecs(
     const std::vector<VideoCodecConfig* >& codecConfigList)
 {