From e2b466e925065db3953fd2490314f3c774e95d46 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 12 Feb 2020 13:59:54 +0100 Subject: [PATCH] Stop advertising generic frame descriptor v1 it is deprecated in favor of dependency descriptor rtp header extension which is a later version of the generic frame descriptor. Bug: webrtc:11358 Change-Id: I95062885dd204c9afc096a3284df8f66b05998b3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168497 Commit-Queue: Danil Chapovalov Reviewed-by: Philip Eliasson Reviewed-by: Niels Moller Cr-Commit-Position: refs/heads/master@{#30508} --- media/engine/webrtc_video_engine.cc | 2 -- media/engine/webrtc_video_engine_unittest.cc | 9 --------- 2 files changed, 11 deletions(-) diff --git a/media/engine/webrtc_video_engine.cc b/media/engine/webrtc_video_engine.cc index 4166a5f3c5..73893589aa 100644 --- a/media/engine/webrtc_video_engine.cc +++ b/media/engine/webrtc_video_engine.cc @@ -521,8 +521,6 @@ RtpCapabilities WebRtcVideoEngine::GetCapabilities() const { if (webrtc::field_trial::IsEnabled("WebRTC-GenericDescriptorAdvertised")) { capabilities.header_extensions.push_back(webrtc::RtpExtension( webrtc::RtpExtension::kGenericFrameDescriptorUri00, id++)); - capabilities.header_extensions.push_back(webrtc::RtpExtension( - webrtc::RtpExtension::kGenericFrameDescriptorUri01, id++)); } return capabilities; diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc index e5ebc5e816..8b5b26c91f 100644 --- a/media/engine/webrtc_video_engine_unittest.cc +++ b/media/engine/webrtc_video_engine_unittest.cc @@ -349,10 +349,6 @@ TEST_F(WebRtcVideoEngineTest, AdvertiseGenericDescriptor00) { ExpectRtpCapabilitySupport(RtpExtension::kGenericFrameDescriptorUri00, false); } -TEST_F(WebRtcVideoEngineTest, AdvertiseGenericDescriptor01) { - ExpectRtpCapabilitySupport(RtpExtension::kGenericFrameDescriptorUri01, false); -} - class WebRtcVideoEngineTestWithGenericDescriptor : public WebRtcVideoEngineTest { public: @@ -365,11 +361,6 @@ TEST_F(WebRtcVideoEngineTestWithGenericDescriptor, ExpectRtpCapabilitySupport(RtpExtension::kGenericFrameDescriptorUri00, true); } -TEST_F(WebRtcVideoEngineTestWithGenericDescriptor, - AdvertiseGenericDescriptor01) { - ExpectRtpCapabilitySupport(RtpExtension::kGenericFrameDescriptorUri01, true); -} - TEST_F(WebRtcVideoEngineTest, CVOSetHeaderExtensionBeforeCapturer) { // Allocate the source first to prevent early destruction before channel's // dtor is called.