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 49a3fb893d855a7cb1286282aa550d22f86273a7..058c3563d1036452dc0efc0a5ed6699abda516da 100644 |
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc |
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc |
@@ -382,7 +382,10 @@ int32_t MediaCodecVideoEncoder::InitEncode( |
codec_mode_ = codec_settings->mode; |
int init_width = codec_settings->width; |
int init_height = codec_settings->height; |
- scale_ = codecType_ != kVideoCodecVP9; |
+ // Scaling is disabled for VP9, but optionally enabled for VP8. |
+ // TODO(pbos): Extract automaticResizeOn out of VP8 settings. |
+ scale_ = codecType_ == kVideoCodecVP8 ? codec_settings->VP8.automaticResizeOn |
AlexG
2016/06/30 12:53:43
nit: easier to read:
if (codecType_ == kVideoCodec
|
+ : codecType_ != kVideoCodecVP9; |
ALOGD << "InitEncode request: " << init_width << " x " << init_height; |
ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled"); |