| Index: 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 d83c4314c6c558c0937ffcc344d1d605e8197cf6..593554e5e0a72839a1a3cc45d8cd9df2cfef2416 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");
|
|
|