diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc index 2dec8f43b6..ea1926b388 100644 --- a/webrtc/media/engine/webrtcvideoengine2.cc +++ b/webrtc/media/engine/webrtcvideoengine2.cc @@ -580,11 +580,9 @@ RtpCapabilities WebRtcVideoEngine2::GetCapabilities() const { capabilities.header_extensions.push_back( webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri, webrtc::RtpExtension::kVideoRotationDefaultId)); - if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe") == "Enabled") { - capabilities.header_extensions.push_back(webrtc::RtpExtension( - webrtc::RtpExtension::kTransportSequenceNumberUri, - webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); - } + capabilities.header_extensions.push_back(webrtc::RtpExtension( + webrtc::RtpExtension::kTransportSequenceNumberUri, + webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); capabilities.header_extensions.push_back( webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, webrtc::RtpExtension::kPlayoutDelayDefaultId)); diff --git a/webrtc/media/engine/webrtcvideoengine2_unittest.cc b/webrtc/media/engine/webrtcvideoengine2_unittest.cc index 26b13ed398..05f5bf38d9 100644 --- a/webrtc/media/engine/webrtcvideoengine2_unittest.cc +++ b/webrtc/media/engine/webrtcvideoengine2_unittest.cc @@ -200,14 +200,7 @@ TEST_F(WebRtcVideoEngine2Test, SupportsAbsoluteSenderTimeHeaderExtension) { FAIL() << "Absolute Sender Time extension not in header-extension list."; } -class WebRtcVideoEngine2WithSendSideBweTest : public WebRtcVideoEngine2Test { - public: - WebRtcVideoEngine2WithSendSideBweTest() - : WebRtcVideoEngine2Test("WebRTC-SendSideBwe/Enabled/") {} -}; - -TEST_F(WebRtcVideoEngine2WithSendSideBweTest, - SupportsTransportSequenceNumberHeaderExtension) { +TEST_F(WebRtcVideoEngine2Test, SupportsTransportSequenceNumberHeaderExtension) { RtpCapabilities capabilities = engine_.GetCapabilities(); ASSERT_FALSE(capabilities.header_extensions.empty()); for (const RtpExtension& extension : capabilities.header_extensions) { @@ -1293,19 +1286,11 @@ TEST_F(WebRtcVideoChannel2Test, FiltersExtensionsPicksAbsSendTime) { TestExtensionFilter(extensions, RtpExtension::kAbsSendTimeUri); } -class WebRtcVideoChannel2WithSendSideBweTest : public WebRtcVideoChannel2Test { - public: - WebRtcVideoChannel2WithSendSideBweTest() - : WebRtcVideoChannel2Test("WebRTC-SendSideBwe/Enabled/") {} -}; - // Test support for transport sequence number header extension. -TEST_F(WebRtcVideoChannel2WithSendSideBweTest, - SendTransportSequenceNumberHeaderExtensions) { +TEST_F(WebRtcVideoChannel2Test, SendTransportSequenceNumberHeaderExtensions) { TestSetSendRtpHeaderExtensions(RtpExtension::kTransportSequenceNumberUri); } -TEST_F(WebRtcVideoChannel2WithSendSideBweTest, - RecvTransportSequenceNumberHeaderExtensions) { +TEST_F(WebRtcVideoChannel2Test, RecvTransportSequenceNumberHeaderExtensions) { TestSetRecvRtpHeaderExtensions(RtpExtension::kTransportSequenceNumberUri); } diff --git a/webrtc/sdk/objc/Framework/Classes/RTCFieldTrials.mm b/webrtc/sdk/objc/Framework/Classes/RTCFieldTrials.mm index 38c293f0ec..6e4230de88 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCFieldTrials.mm +++ b/webrtc/sdk/objc/Framework/Classes/RTCFieldTrials.mm @@ -16,15 +16,10 @@ #include "webrtc/system_wrappers/include/field_trial_default.h" -static NSString * const kRTCEnableSendSideBweString = - @"WebRTC-SendSideBwe/Enabled/"; static std::unique_ptr gFieldTrialInitString; void RTCInitFieldTrials(RTCFieldTrialOptions options) { NSMutableString *fieldTrialInitString = [NSMutableString string]; - if (options & RTCFieldTrialOptionsSendSideBwe) { - [fieldTrialInitString appendString:kRTCEnableSendSideBweString]; - } size_t len = fieldTrialInitString.length + 1; gFieldTrialInitString.reset(new char[len]); if (![fieldTrialInitString getCString:gFieldTrialInitString.get()