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

Revert of Protect new header extension by field trial experiment to allow hardcoding it in SDP (patchset #3 id:40001 of https://codereview.webrtc.org/2922683002/ )

Browse Source 
Reason for revert:
Breaks tests in downstream projects.

Original issue's description:
> Protect new header extension by field trial experiment to allow hardcoding it in SDP
>
> BUG=chrome:718738
>
> Review-Url: https://codereview.webrtc.org/2922683002
> Cr-Commit-Position: refs/heads/master@{#18409}
> Committed: cafa1d6bbe

TBR=sprang@webrtc.org,asapersson@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chrome:718738

Review-Url: https://codereview.webrtc.org/2922723002
Cr-Commit-Position: refs/heads/master@{#18414}
This commit is contained in:
ilnik 2017-06-02 07:30:20 -07:00 committed by Commit Bot
parent dc2018b87f
commit ed9b9ff597
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc
View File

@ -28,7 +28,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "webrtc/system_wrappers/include/field_trial.h"
namespace webrtc {
namespace {
@ -328,8 +328,7 @@ bool RTPSenderVideo::SendVideo(RtpVideoCodecTypes video_type,
last_rotation_ = current_rotation;
// Report content type only for key frames.
if (frame_type == kVideoFrameKey &&
video_header->content_type != VideoContentType::UNSPECIFIED &&
webrtc::field_trial::IsEnabled("WebRTC-VideoContentTypeExtension")) {
video_header->content_type != VideoContentType::UNSPECIFIED) {
last_packet->SetExtension<VideoContentTypeExtension>(
video_header->content_type);
}

4
webrtc/video/end_to_end_tests.cc
View File

@ -2791,8 +2791,6 @@ 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());
@ -2877,8 +2875,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);
}

2
webrtc/video/video_send_stream_tests.cc
View File

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