LineageOS/android_external_libvpx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Replace "colorspace" with "color_space""

Browse Source
This commit is contained in:
Yaowu Xu
2015-01-21 08:58:09 -08:00
committed by Gerrit Code Review
parent 469ff48d7b bc5d3fae5c
commit c97d435243
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vp9/vp9_dx_iface.c
View File

@@ -95,12 +95,11 @@ static vpx_codec_err_t decoder_destroy(vpx_codec_alg_priv_t *ctx) {
static int parse_bitdepth_colorspace_sampling( static int parse_bitdepth_colorspace_sampling(
BITSTREAM_PROFILE profile, struct vp9_read_bit_buffer *rb) { BITSTREAM_PROFILE profile, struct vp9_read_bit_buffer *rb) {
const int sRGB = 7; vpx_color_space_t color_space;
int colorspace;
if (profile >= PROFILE_2) if (profile >= PROFILE_2)
rb->bit_offset += 1; // Bit-depth 10 or 12. rb->bit_offset += 1; // Bit-depth 10 or 12.
colorspace = vp9_rb_read_literal(rb, 3); color_space = (vpx_color_space_t)vp9_rb_read_literal(rb, 3);
if (colorspace != sRGB) { if (color_space != VPX_CS_SRGB) {
rb->bit_offset += 1; // [16,235] (including xvycc) vs [0,255] range. rb->bit_offset += 1; // [16,235] (including xvycc) vs [0,255] range.
if (profile == PROFILE_1 || profile == PROFILE_3) { if (profile == PROFILE_1 || profile == PROFILE_3) {
rb->bit_offset += 2; // subsampling x/y. rb->bit_offset += 2; // subsampling x/y.