commit 7ace488f477a7e4cce77d5aaebbfe8c7327a425a
author Peter Boström <pbos@webrtc.org> Thu Apr 14 00:54:56 2016 +0200
committer Peter Boström <pbos@webrtc.org> Wed Apr 13 22:55:10 2016 +0000
tree e53ce2df7dbce2d3542b33e738e49674799bc0f5
parent d4badbcb6d46fb268f2c9256701f207c6534012d

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

diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc
index d83c431..593554e 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc
@@ -365,8 +365,7 @@
   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");