| Index: webrtc/api/android/jni/androidmediaencoder_jni.cc
|
| diff --git a/webrtc/api/android/jni/androidmediaencoder_jni.cc b/webrtc/api/android/jni/androidmediaencoder_jni.cc
|
| index 8d0d3b54bd512557401dcf652b94d62d930388f4..e84b850287944bbc8f76d07c0c250bb3526c1ce0 100644
|
| --- a/webrtc/api/android/jni/androidmediaencoder_jni.cc
|
| +++ b/webrtc/api/android/jni/androidmediaencoder_jni.cc
|
| @@ -395,16 +395,9 @@ int32_t MediaCodecVideoEncoder::InitEncode(
|
| ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled");
|
|
|
| if (scale_) {
|
| - if (codecType_ == kVideoCodecVP8) {
|
| - quality_scaler_.Init(
|
| - QualityScaler::kLowVp8QpThreshold, QualityScaler::kBadVp8QpThreshold,
|
| - codec_settings->startBitrate, codec_settings->width,
|
| - codec_settings->height, codec_settings->maxFramerate);
|
| - } else if (codecType_ == kVideoCodecH264) {
|
| - quality_scaler_.Init(QualityScaler::kLowH264QpThreshold,
|
| - QualityScaler::kBadH264QpThreshold,
|
| - codec_settings->startBitrate, codec_settings->width,
|
| - codec_settings->height,
|
| + if (codecType_ == kVideoCodecVP8 || codecType_ == kVideoCodecH264) {
|
| + quality_scaler_.Init(codecType_, codec_settings->startBitrate,
|
| + codec_settings->width, codec_settings->height,
|
| codec_settings->maxFramerate);
|
| } else {
|
| // When adding codec support to additional hardware codecs, also configure
|
|
|