Bug 1402495 - Use constants for the RtpExtension URIs. r=drno draft
authorMichael Froman <mfroman@mozilla.com>
Fri, 01 Sep 2017 16:53:46 -0500
changeset 674487 56191da92de7dce56bef3ce3e1beb36a23aff6a2
parent 674486 65a5054a1f922b83929c80658062f441ca3da6a0
child 674488 863b94fe968f55f86c19b13073b831326e5387bb
push id82864
push userbmo:mfroman@nostrum.com
push dateTue, 03 Oct 2017 21:50:00 +0000
reviewersdrno
bugs1402495
milestone58.0a1
Bug 1402495 - Use constants for the RtpExtension URIs. r=drno MozReview-Commit-ID: EldtSM9Ygtl
media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -333,17 +333,17 @@ JsepSessionImpl::SetParameters(const std
         default: {
           MOZ_ASSERT(false);
           return NS_ERROR_INVALID_ARG;
         }
       }
     }
   }
   if (addVideoExt != SdpDirectionAttribute::kInactive) {
-    AddVideoRtpExtension("urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id", addVideoExt);
+    AddVideoRtpExtension(webrtc::RtpExtension::kRtpStreamIdUri, addVideoExt);
   }
 
   it->mTrack->SetJsConstraints(constraints);
 
   auto track = it->mTrack;
   if (track->GetDirection() == sdp::kSend) {
     // Establish minimum number of required SSRCs
     // Note that AddTrack is only for send direction
@@ -2382,22 +2382,21 @@ JsepSessionImpl::SetupDefaultCodecs()
   // Update the redundant encodings for the RED codec with the supported
   // codecs.  Note: only uses the video codecs.
   red->UpdateRedundantEncodings(mSupportedCodecs.values);
 }
 
 void
 JsepSessionImpl::SetupDefaultRtpExtensions()
 {
-  AddAudioRtpExtension("urn:ietf:params:rtp-hdrext:ssrc-audio-level",
+  AddAudioRtpExtension(webrtc::RtpExtension::kAudioLevelUri,
                        SdpDirectionAttribute::Direction::kSendonly);
-  AddVideoRtpExtension(
-    "http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time",
+  AddVideoRtpExtension(webrtc::RtpExtension::kAbsSendTimeUri,
                        SdpDirectionAttribute::Direction::kSendrecv);
-  AddVideoRtpExtension("urn:ietf:params:rtp-hdrext:toffset",
+  AddVideoRtpExtension(webrtc::RtpExtension::kTimestampOffsetUri,
                        SdpDirectionAttribute::Direction::kSendrecv);
 }
 
 void
 JsepSessionImpl::SetState(JsepSignalingState state)
 {
   if (state == mState)
     return;
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -744,17 +744,17 @@ MediaPipelineFactory::GetOrCreateAudioCo
     auto error = conduit->ConfigureSendMediaCodec(configs.values[0]);
     if (error) {
       MOZ_MTLOG(ML_ERROR, "ConfigureSendMediaCodec failed: " << error);
       return NS_ERROR_FAILURE;
     }
 
     const SdpExtmapAttributeList::Extmap* audioLevelExt =
         aTrack.GetNegotiatedDetails()->GetExt(
-            "urn:ietf:params:rtp-hdrext:ssrc-audio-level");
+            webrtc::RtpExtension::kAudioLevelUri);
 
     if (audioLevelExt) {
       MOZ_MTLOG(ML_DEBUG, "Calling EnableAudioLevelExtension");
       error = conduit->EnableAudioLevelExtension(true, audioLevelExt->entry);
 
       if (error) {
         MOZ_MTLOG(ML_ERROR, "EnableAudioLevelExtension failed: " << error);
         return NS_ERROR_FAILURE;