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/common/vp9_enums.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/common/vp9_enums.h')
| -rw-r--r-- | libvpx/vp9/common/vp9_enums.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libvpx/vp9/common/vp9_enums.h b/libvpx/vp9/common/vp9_enums.h index e96e769..068284f 100644 --- a/libvpx/vp9/common/vp9_enums.h +++ b/libvpx/vp9/common/vp9_enums.h @@ -25,6 +25,23 @@ extern "C" { #define MI_MASK (MI_BLOCK_SIZE - 1) +// Bitstream profiles indicated by 2 bits in the uncompressed header. +// 00: Profile 0. 4:2:0 only. +// 10: Profile 1. adds 4:4:4, 4:2:2, alpha. +// 01: Profile 2. Supports 10-bit and 12-bit color only. +// 11: Undefined profile. +typedef enum BITSTREAM_PROFILE { + PROFILE_0, + PROFILE_1, + PROFILE_2, + MAX_PROFILES +} BITSTREAM_PROFILE; + +typedef enum BIT_DEPTH { + BITS_8, + BITS_10, + BITS_12 +} BIT_DEPTH; typedef enum BLOCK_SIZE { BLOCK_4X4, @@ -94,6 +111,12 @@ typedef enum { SRGB = 7 // RGB } COLOR_SPACE; +typedef enum { + VP9_LAST_FLAG = 1 << 0, + VP9_GOLD_FLAG = 1 << 1, + VP9_ALT_FLAG = 1 << 2, +} VP9_REFFRAME; + #ifdef __cplusplus } // extern "C" #endif |