From 7ace488f477a7e4cce77d5aaebbfe8c7327a425a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Thu, 14 Apr 2016 00:54:56 +0200 Subject: [PATCH] Remove field trial for scaling down MediaCodec. This should be on everywhere. BUG=webrtc:5678 R=glaznev@webrtc.org Review URL: https://codereview.webrtc.org/1889463002 . Cr-Commit-Position: refs/heads/master@{#12355} --- webrtc/api/java/jni/androidmediaencoder_jni.cc | 3 +-- .../src/org/appspot/apprtc/PeerConnectionClient.java | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc index d83c4314c6..593554e5e0 100644 --- a/webrtc/api/java/jni/androidmediaencoder_jni.cc +++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc @@ -365,8 +365,7 @@ int32_t MediaCodecVideoEncoder::InitEncode( codec_mode_ = codec_settings->mode; int init_width = codec_settings->width; int init_height = codec_settings->height; - scale_ = (codecType_ != kVideoCodecVP9) && (webrtc::field_trial::FindFullName( - "WebRTC-MediaCodecVideoEncoder-AutomaticResize") == "Enabled"); + scale_ = codecType_ != kVideoCodecVP9; ALOGD << "InitEncode request: " << init_width << " x " << init_height; ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled"); diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 9c33b6159a..4ac7e0508b 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -60,8 +60,6 @@ public class PeerConnectionClient { public static final String VIDEO_TRACK_ID = "ARDAMSv0"; public static final String AUDIO_TRACK_ID = "ARDAMSa0"; private static final String TAG = "PCRTCClient"; - private static final String FIELD_TRIAL_AUTOMATIC_RESIZE = - "WebRTC-MediaCodecVideoEncoder-AutomaticResize/Enabled/"; private static final String VIDEO_CODEC_VP8 = "VP8"; private static final String VIDEO_CODEC_VP9 = "VP9"; private static final String VIDEO_CODEC_H264 = "H264"; @@ -314,7 +312,7 @@ public class PeerConnectionClient { isError = false; // Initialize field trials. - PeerConnectionFactory.initializeFieldTrials(FIELD_TRIAL_AUTOMATIC_RESIZE); + PeerConnectionFactory.initializeFieldTrials(""); // Check preferred video codec. preferredVideoCodec = VIDEO_CODEC_VP8;