diff options
author | hkuang <hkuang@google.com> | 2014-04-09 14:20:00 -0700 |
---|---|---|
committer | hkuang <hkuang@google.com> | 2014-04-09 14:20:00 -0700 |
commit | 6ac915abcdb404a00d927fe6308a47fcf09d9519 (patch) | |
tree | e1b38724c6741b657c04a788d42226d5f69d5c3d /libvpx/vp9/encoder/vp9_aq_variance.h | |
parent | cf2f478820e07635bb013420f0498ab685190718 (diff) | |
download | android_external_libvpx-6ac915abcdb404a00d927fe6308a47fcf09d9519.tar.gz android_external_libvpx-6ac915abcdb404a00d927fe6308a47fcf09d9519.tar.bz2 android_external_libvpx-6ac915abcdb404a00d927fe6308a47fcf09d9519.zip |
Roll latest libvpx to fix hang when doing adaptive playback.
VP9 decoder will hang when switching from frames with 2 tiles to
4 tiles on a 4 core device.
libvpx hash:4fffefe189a9123d4b04482c26a1be5eb632b397
Bug: 13931133
Change-Id: I24a51fd572ca7e872bc440491e2c645a20e9a736
Diffstat (limited to 'libvpx/vp9/encoder/vp9_aq_variance.h')
-rw-r--r-- | libvpx/vp9/encoder/vp9_aq_variance.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/libvpx/vp9/encoder/vp9_aq_variance.h b/libvpx/vp9/encoder/vp9_aq_variance.h new file mode 100644 index 0000000..381fe50 --- /dev/null +++ b/libvpx/vp9/encoder/vp9_aq_variance.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2013 The WebM project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + + +#ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_ +#define VP9_ENCODER_VP9_AQ_VARIANCE_H_ + +#include "vp9/encoder/vp9_onyx_int.h" + +#ifdef __cplusplus +extern "C" { +#endif + +unsigned int vp9_vaq_segment_id(int energy); +double vp9_vaq_rdmult_ratio(int energy); +double vp9_vaq_inv_q_ratio(int energy); + +void vp9_vaq_init(); +void vp9_vaq_frame_setup(VP9_COMP *cpi); + +int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // VP9_ENCODER_VP9_AQ_VARIANCE_H_ |