generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ARM64 detection for VP8 and VP9 wrappers.

Browse Source 
BUG=4702
R=marpan@google.com, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/57459004

Cr-Commit-Position: refs/heads/master@{#9287}
This commit is contained in:
Stefan Holmer 2015-05-26 22:10:28 +02:00
parent fc052055e9
commit e87d48719f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
View File

@ -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;

2
webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
View File

@ -236,7 +236,7 @@ int VP9EncoderImpl::InitAndSetControlSettings(const VideoCodec* inst) {
// The number tile columns will be capped by the encoder based on image size
// (minimum width of tile column is 256 pixels, maximum is 4096).
vpx_codec_control(encoder_, VP9E_SET_TILE_COLUMNS, (config_->g_threads >> 1));
#if !defined(WEBRTC_ARCH_ARM)
#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64)
// Note denoiser is still off by default until further testing/optimization,
// i.e., codecSpecific.VP9.denoisingOn == 0.
vpx_codec_control(encoder_, VP9E_SET_NOISE_SENSITIVITY,