diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-25 12:35:20 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-10-25 12:35:20 -0700 |
| commit | d5ac877f7f033ab4d33f4ca00d1b3ca1fc142361 (patch) | |
| tree | 72d4b587df702b7a84bd4746f57e5f1f1dc22136 /vp9/decoder | |
| parent | 9f528ce057e0945abd8382f551119dc2e20bfcc5 (diff) | |
| download | libvpx-d5ac877f7f033ab4d33f4ca00d1b3ca1fc142361.tar libvpx-d5ac877f7f033ab4d33f4ca00d1b3ca1fc142361.tar.gz libvpx-d5ac877f7f033ab4d33f4ca00d1b3ca1fc142361.tar.bz2 libvpx-d5ac877f7f033ab4d33f4ca00d1b3ca1fc142361.zip | |
Adding COLOR_SPACE enum.
Change-Id: If5711eb166609cce0a88b3cb5b56b3afeebc4fb0
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index d4dcfbc1a..601168ef1 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -898,12 +898,10 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi, cm->error_resilient_mode = vp9_rb_read_bit(rb); if (cm->frame_type == KEY_FRAME) { - int csp; - check_sync_code(cm, rb); - csp = vp9_rb_read_literal(rb, 3); // colorspace - if (csp != 7) { // != sRGB + cm->color_space = vp9_rb_read_literal(rb, 3); // colorspace + if (cm->color_space != SRGB) { vp9_rb_read_bit(rb); // [16,235] (including xvycc) vs [0,255] range if (cm->version == 1) { cm->subsampling_x = vp9_rb_read_bit(rb); |