From 8cc711a7e1fa2adb95cd3596d6a26e624017645d Mon Sep 17 00:00:00 2001 From: Johannes Kron Date: Thu, 7 Mar 2019 22:36:35 +0100 Subject: [PATCH] Update URI of TransportSequenceNumberV2 The previous URI was a placeholder and is not valid. The URI https://webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02/ must be used instead. Bug: webrtc:10264 Change-Id: Ibabde599b5bbd116c1c5e86ba0c9c64019bf7026 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126360 Reviewed-by: Danil Chapovalov Reviewed-by: Per Kjellander Commit-Queue: Johannes Kron Cr-Commit-Position: refs/heads/master@{#27051} --- api/rtp_parameters.cc | 2 +- modules/rtp_rtcp/source/rtp_header_extensions.h | 3 +-- pc/media_session.cc | 2 +- pc/media_session_unittest.cc | 12 ++++++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/api/rtp_parameters.cc b/api/rtp_parameters.cc index 6177dd3eb9..9ba2423bff 100644 --- a/api/rtp_parameters.cc +++ b/api/rtp_parameters.cc @@ -105,7 +105,7 @@ const char RtpExtension::kVideoRotationUri[] = "urn:3gpp:video-orientation"; const char RtpExtension::kTransportSequenceNumberUri[] = "http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01"; const char RtpExtension::kTransportSequenceNumberV2Uri[] = - "http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-02"; + "http://www.webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02"; // This extension allows applications to adaptively limit the playout delay // on frames as per the current needs. For example, a gaming application diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h index e36c83f31b..8aacb9acb0 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -97,8 +97,7 @@ class TransportSequenceNumberV2 { static constexpr uint8_t kValueSizeBytes = 4; static constexpr uint8_t kValueSizeBytesWithoutFeedbackRequest = 2; static constexpr const char kUri[] = - "http://www.ietf.org/id/" - "draft-holmer-rmcat-transport-wide-cc-extensions-02"; + "http://www.webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02"; static bool Parse(rtc::ArrayView data, uint16_t* transport_sequence_number, absl::optional* feedback_request); diff --git a/pc/media_session.cc b/pc/media_session.cc index ca4434e0d5..8377f1003f 100644 --- a/pc/media_session.cc +++ b/pc/media_session.cc @@ -1113,7 +1113,7 @@ static void NegotiateRtpHeaderExtensions( // Don't respond to // http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01 // if we get an offer including - // http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-02 + // http://www.webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02 continue; } else { // We respond with their RTP header extension id. diff --git a/pc/media_session_unittest.cc b/pc/media_session_unittest.cc index e876c36301..7c0a7debf2 100644 --- a/pc/media_session_unittest.cc +++ b/pc/media_session_unittest.cc @@ -223,15 +223,15 @@ static const RtpExtension kRtpExtensionTransportSequenceNumber01And02[] = { RtpExtension("http://www.ietf.org/id/" "draft-holmer-rmcat-transport-wide-cc-extensions-01", 1), - RtpExtension("http://www.ietf.org/id/" - "draft-holmer-rmcat-transport-wide-cc-extensions-02", - 2), + RtpExtension( + "http://www.webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02", + 2), }; static const RtpExtension kRtpExtensionTransportSequenceNumber02[] = { - RtpExtension("http://www.ietf.org/id/" - "draft-holmer-rmcat-transport-wide-cc-extensions-02", - 2), + RtpExtension( + "http://www.webrtc.org/experiments/rtp-hdrext/transport-wide-cc-02", + 2), }; static const uint32_t kSimulcastParamsSsrc[] = {10, 11, 20, 21, 30, 31};