From ef5d5e45cb2b13b17f98747ea9b8e8af7b293977 Mon Sep 17 00:00:00 2001 From: asapersson Date: Tue, 22 Sep 2015 01:40:42 -0700 Subject: [PATCH] Add field trial for automic resize in MediaCodecVideoEncoder. BUG=webrtc:4968 Review URL: https://codereview.webrtc.org/1351573002 Cr-Commit-Position: refs/heads/master@{#10009} --- talk/app/webrtc/java/jni/androidmediaencoder_jni.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc index bd9456291f..a74044600a 100644 --- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc +++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc @@ -36,6 +36,7 @@ #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/utility/include/quality_scaler.h" #include "webrtc/modules/video_coding/utility/include/vp8_header_parser.h" +#include "webrtc/system_wrappers/interface/field_trial.h" #include "webrtc/system_wrappers/interface/logcat_trace_context.h" #include "third_party/libyuv/include/libyuv/convert.h" #include "third_party/libyuv/include/libyuv/convert_from.h" @@ -297,7 +298,11 @@ int32_t MediaCodecVideoEncoder::InitEncode( << codecType_; ALOGD("InitEncode request"); - scale_ = false; + + scale_ = webrtc::field_trial::FindFullName( + "WebRTC-MediaCodecVideoEncoder-AutomaticResize") == "Enabled"; + ALOGD("Automatic resize: %s", scale_ ? "enabled" : "disabled"); + if (scale_ && codecType_ == kVideoCodecVP8) { quality_scaler_->Init(kMaxQP / kLowQpThresholdDenominator, true); quality_scaler_->SetMinResolution(kMinWidth, kMinHeight);