Commit 9897e1c2 authored by Ronald S. Bultje's avatar Ronald S. Bultje Committed by Gerrit Code Review
Browse files

Merge "vp10: write colorspace info for profile 0 intraonly frames."

parents bafadaaf 2a388b53
...@@ -1989,6 +1989,9 @@ static size_t read_uncompressed_header(VP10Decoder *pbi, ...@@ -1989,6 +1989,9 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
if (!vp10_read_sync_code(rb)) if (!vp10_read_sync_code(rb))
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
"Invalid frame sync code"); "Invalid frame sync code");
#if CONFIG_MISC_FIXES
read_bitdepth_colorspace_sampling(cm, rb);
#else
if (cm->profile > PROFILE_0) { if (cm->profile > PROFILE_0) {
read_bitdepth_colorspace_sampling(cm, rb); read_bitdepth_colorspace_sampling(cm, rb);
} else { } else {
...@@ -2004,6 +2007,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi, ...@@ -2004,6 +2007,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
cm->use_highbitdepth = 0; cm->use_highbitdepth = 0;
#endif #endif
} }
#endif
pbi->refresh_frame_flags = vpx_rb_read_literal(rb, REF_FRAMES); pbi->refresh_frame_flags = vpx_rb_read_literal(rb, REF_FRAMES);
setup_frame_size(cm, rb); setup_frame_size(cm, rb);
......
...@@ -1284,10 +1284,14 @@ static void write_uncompressed_header(VP10_COMP *cpi, ...@@ -1284,10 +1284,14 @@ static void write_uncompressed_header(VP10_COMP *cpi,
if (cm->intra_only) { if (cm->intra_only) {
write_sync_code(wb); write_sync_code(wb);
#if CONFIG_MISC_FIXES
write_bitdepth_colorspace_sampling(cm, wb);
#else
// Note for profile 0, 420 8bpp is assumed. // Note for profile 0, 420 8bpp is assumed.
if (cm->profile > PROFILE_0) { if (cm->profile > PROFILE_0) {
write_bitdepth_colorspace_sampling(cm, wb); write_bitdepth_colorspace_sampling(cm, wb);
} }
#endif
vpx_wb_write_literal(wb, get_refresh_mask(cpi), REF_FRAMES); vpx_wb_write_literal(wb, get_refresh_mask(cpi), REF_FRAMES);
write_frame_size(cm, wb); write_frame_size(cm, wb);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment