diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-02-23 13:01:14 -0800 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-02-23 13:01:14 -0800 |
| commit | 6cf3031286ca2b20187406f5953a5ea1f9924388 (patch) | |
| tree | 4bf118d468208b2fb66a870289e4294ac6cde12d /vp9 | |
| parent | 44adb8e28386fbac27b64b36119b18e563357fb8 (diff) | |
| download | libvpx-6cf3031286ca2b20187406f5953a5ea1f9924388.tar libvpx-6cf3031286ca2b20187406f5953a5ea1f9924388.tar.gz libvpx-6cf3031286ca2b20187406f5953a5ea1f9924388.tar.bz2 libvpx-6cf3031286ca2b20187406f5953a5ea1f9924388.zip | |
fix the propagation of color space info in decoder
This addresses the issue #960
Change-Id: Iddf45b4bd4f53cb0ddfd879e800a071cd843b915
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 18e0bf53f..d345a0578 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -741,6 +741,7 @@ static void setup_frame_size(VP9_COMMON *cm, struct vp9_read_bit_buffer *rb) { pool->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x; pool->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y; pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth; + pool->frame_bufs[cm->new_fb_idx].buf.color_space = cm->color_space; } static INLINE int valid_ref_frame_img_fmt(vpx_bit_depth_t ref_bit_depth, @@ -821,6 +822,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm, pool->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x; pool->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y; pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth; + pool->frame_bufs[cm->new_fb_idx].buf.color_space = cm->color_space; } static void setup_tile_info(VP9_COMMON *cm, struct vp9_read_bit_buffer *rb) { @@ -1436,6 +1438,7 @@ static size_t read_uncompressed_header(VP9Decoder *pbi, #if CONFIG_VP9_HIGHBITDEPTH get_frame_new_buffer(cm)->bit_depth = cm->bit_depth; #endif + get_frame_new_buffer(cm)->color_space = cm->color_space; if (pbi->need_resync) { vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, |