Bug 1406941 - Remove unused error handling code from SetLocalRTPExtensions; r=padenot
authorDan Minor <dminor@mozilla.com>
Mon, 19 Nov 2018 17:46:15 +0000
changeset 503473 3f0b3e4421c02371dc83404acb259512a278905b
parent 503472 c0f52a7424dece45164a7af535a8ce85d0cf0053
child 503474 0968b25b736fbc2456ae99e21580e0f204e9ded8
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspadenot
bugs1406941
milestone65.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 1406941 - Remove unused error handling code from SetLocalRTPExtensions; r=padenot Rather than returning an error, the channel proxies have asserts that the underlying calls to the channel objects succeeded. Depends on D12015 Differential Revision: https://phabricator.services.mozilla.com/D12016
media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -540,17 +540,16 @@ WebrtcAudioConduit::SetLocalRTPExtension
 
   bool isSend = aDirection == LocalDirection::kSend;
   if (isSend) {
     mSendStreamConfig.rtp.extensions.clear();
   } else {
     mRecvStreamConfig.rtp.extensions.clear();
   }
   for(const auto& extension : extensions) {
-    int ret = 0;
     // ssrc-audio-level RTP header extension
     if (extension.uri == webrtc::RtpExtension::kAudioLevelUri) {
       if (isSend) {
         mSendStreamConfig.rtp.extensions.push_back(
           webrtc::RtpExtension(extension.uri, extension.id));
         mSendChannelProxy->SetSendAudioLevelIndicationStatus(true, extension.id);
       } else {
         mRecvStreamConfig.rtp.extensions.push_back(
@@ -571,23 +570,16 @@ WebrtcAudioConduit::SetLocalRTPExtension
     }
     // MID RTP header extension
     if (aDirection == LocalDirection::kSend &&
         extension.uri == webrtc::RtpExtension::kMIdUri) {
         mSendStreamConfig.rtp.extensions.push_back(
           webrtc::RtpExtension(extension.uri, extension.id));
         mSendChannelProxy->SetSendMIDStatus(true, extension.id);
     }
-    // Handle errors
-    if (ret == -1) {
-      CSFLogError(LOGTAG, "Failed %s setting extension %s with id %d",
-                  __FUNCTION__, extension.uri.c_str(),
-                  static_cast<int>(extension.id));
-      return kMediaConduitUnknownError;
-    }
   }
   return kMediaConduitNoError;
 }
 
 MediaConduitErrorCode
 WebrtcAudioConduit::SendAudioFrame(const int16_t audio_data[],
                                    int32_t lengthSamples, // per channel
                                    int32_t samplingFreqHz,