diff options
| author | Stefan Holmer <stefan@webrtc.org> | 2015-05-26 22:10:28 +0200 |
|---|---|---|
| committer | Stefan Holmer <stefan@webrtc.org> | 2015-05-26 20:10:38 +0000 |
| commit | e87d48719f8478148fc6ec28c3b3663709d585a4 (patch) | |
| tree | 940fc414242edb839c1b9e877fa21a3d02e21a29 /webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc | |
| parent | fc052055e939fa93d3ab92914e0dc8ed5e5d1d90 (diff) | |
| download | webrtc-e87d48719f8478148fc6ec28c3b3663709d585a4.tar.gz | |
Fix ARM64 detection for VP8 and VP9 wrappers.
BUG=4702
R=marpan@google.com, stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/57459004
Cr-Commit-Position: refs/heads/master@{#9287}
Diffstat (limited to 'webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc')
| -rw-r--r-- | webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index aa0d163f03..798d53154a 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -610,7 +610,7 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst, } int VP8EncoderImpl::SetCpuSpeed(int width, int height) { -#if defined(WEBRTC_ARCH_ARM) +#if defined(WEBRTC_ARCH_ARM) || defined(WEBRTC_ARCH_ARM64) // On mobile platform, always set to -12 to leverage between cpu usage // and video quality. return -12; @@ -670,7 +670,7 @@ int VP8EncoderImpl::InitAndSetControlSettings() { // when encoding lower resolution streams. Would it work with the // multi-res encoding feature? denoiserState denoiser_state = kDenoiserOnYOnly; -#ifdef WEBRTC_ARCH_ARM +#if defined(WEBRTC_ARCH_ARM) || defined(WEBRTC_ARCH_ARM64) denoiser_state = kDenoiserOnYOnly; #else denoiser_state = kDenoiserOnAdaptive; @@ -1101,7 +1101,7 @@ int VP8DecoderImpl::InitDecode(const VideoCodec* inst, cfg.h = cfg.w = 0; // set after decode vpx_codec_flags_t flags = 0; -#ifndef WEBRTC_ARCH_ARM +#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) flags = VPX_CODEC_USE_POSTPROC; #ifdef INDEPENDENT_PARTITIONS flags |= VPX_CODEC_USE_INPUT_PARTITION; @@ -1148,7 +1148,7 @@ int VP8DecoderImpl::Decode(const EncodedImage& input_image, } #endif -#ifndef WEBRTC_ARCH_ARM +#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) vp8_postproc_cfg_t ppcfg; // MFQE enabled to reduce key frame popping. ppcfg.post_proc_flag = VP8_MFQE | VP8_DEBLOCK; |