Bug 1283619: enable far end REMB support for sending conduits depending on signaling. r=mjf
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Thu, 30 Jun 2016 14:22:38 -0700
changeset 304002 3361195d371f260f11bc283f3181ecd07fde4e14
parent 303866 b572895ade9e53c485fee34def41378f040a930e
child 304003 7cd947b360b89bc46372f58d3c0a3fb8b86b92aa
push id30409
push usergszorc@mozilla.com
push dateThu, 07 Jul 2016 18:27:11 +0000
treeherdermozilla-central@94cce4e79310 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmjf
bugs1283619
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1283619: enable far end REMB support for sending conduits depending on signaling. r=mjf 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
@@ -784,17 +784,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)
 {