Index: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
index 31e1d8063600deec1ea6a34eb46b752f695ee520..efa2401b32e43853c411a7c0890ecfa41c571aff 100644 |
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
@@ -617,7 +617,7 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst, |
} |
int VP8EncoderImpl::SetCpuSpeed(int width, int height) { |
-#if defined(WEBRTC_ARCH_ARM) || defined(WEBRTC_ARCH_ARM64) |
+#if defined(WEBRTC_ARCH_ARM) || defined(WEBRTC_ARCH_ARM64) || defined(ANDROID) |
// On mobile platform, always set to -12 to leverage between cpu usage |
// and video quality. |
return -12; |
@@ -672,7 +672,7 @@ int VP8EncoderImpl::InitAndSetControlSettings() { |
// when encoding lower resolution streams. Would it work with the |
// multi-res encoding feature? |
denoiserState denoiser_state = kDenoiserOnYOnly; |
-#if defined(WEBRTC_ARCH_ARM) || defined(WEBRTC_ARCH_ARM64) |
+#if defined(WEBRTC_ARCH_ARM) || defined(WEBRTC_ARCH_ARM64) || defined(ANDROID) |
denoiser_state = kDenoiserOnYOnly; |
#else |
denoiser_state = kDenoiserOnAdaptive; |
@@ -1105,7 +1105,8 @@ int VP8DecoderImpl::InitDecode(const VideoCodec* inst, int number_of_cores) { |
cfg.h = cfg.w = 0; // set after decode |
vpx_codec_flags_t flags = 0; |
-#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) |
+#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) && \ |
+ !defined(ANDROID) |
flags = VPX_CODEC_USE_POSTPROC; |
#ifdef INDEPENDENT_PARTITIONS |
flags |= VPX_CODEC_USE_INPUT_PARTITION; |
@@ -1152,7 +1153,8 @@ int VP8DecoderImpl::Decode(const EncodedImage& input_image, |
} |
#endif |
-#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) |
+#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) && \ |
+ !defined(ANDROID) |
vp8_postproc_cfg_t ppcfg; |
// MFQE enabled to reduce key frame popping. |
ppcfg.post_proc_flag = VP8_MFQE | VP8_DEBLOCK; |