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 <danilchap@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30508}
This commit is contained in:
Danil Chapovalov
2020-02-12 13:59:54 +01:00
committed by Commit Bot
parent 0e6d36ae8c
commit e2b466e925
2 changed files with 0 additions and 11 deletions

View File

@ -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;

View File

@ -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.