admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WebRTC-videocontenttypeextension field trial completely

Browse Source 
BUG=webrtc:7420

Review-Url: https://codereview.webrtc.org/3003673002
Cr-Commit-Position: refs/heads/master@{#19459}
This commit is contained in:
ilnik 2017-08-23 00:44:27 -07:00 committed by Commit Bot
parent c3c125662e
commit 41cadbcb0a
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/video/end_to_end_tests.cc
View File

@ -2954,15 +2954,13 @@ TEST_F(EndToEndTest, MAYBE_ContentTypeSwitches) {
int num_frames_received_ GUARDED_BY(&crit_);
} test;
test::ScopedFieldTrials override_field_trials(
"WebRTC-VideoContentTypeExtension/Enabled/");
metrics::Reset();
Call::Config send_config(test.GetSenderCallConfig());
Call::Config recv_config(test.GetReceiverCallConfig());
VideoEncoderConfig encoder_config_with_screenshare;
task_queue_.SendTask([this, &test, &override_field_trials, &send_config,
task_queue_.SendTask([this, &test, &send_config,
&recv_config, &encoder_config_with_screenshare]() {
CreateSenderCall(send_config);
CreateReceiverCall(recv_config);
@ -3056,8 +3054,6 @@ TEST_F(EndToEndTest, VerifyHistogramStatsWithScreenshare) {
const bool kEnabledRtx = false;
const bool kEnabledRed = false;
const bool kScreenshare = true;
test::ScopedFieldTrials override_field_trials(
"WebRTC-VideoContentTypeExtension/Enabled/");
VerifyHistogramStats(kEnabledRtx, kEnabledRed, kScreenshare);
}

4
webrtc/video/video_send_stream.cc
View File

@ -740,10 +740,6 @@ VideoSendStreamImpl::VideoSendStreamImpl(
RTC_DCHECK_GE(id, 1);
RTC_DCHECK_LE(id, 14);
RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension));
if (StringToRtpExtensionType(extension) == kRtpExtensionVideoContentType &&
!field_trial::IsEnabled("WebRTC-VideoContentTypeExtension")) {
continue;
}
for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
RTC_CHECK_EQ(0, rtp_rtcp->RegisterSendRtpHeaderExtension(
StringToRtpExtensionType(extension), id));

2
webrtc/video/video_send_stream_tests.cc
View File

@ -340,8 +340,6 @@ TEST_F(VideoSendStreamTest, SupportsVideoContentType) {
}
} test;
test::ScopedFieldTrials override_field_trials(
"WebRTC-VideoContentTypeExtension/Enabled/");
RunBaseTest(&test);
}