generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ronald S. Bultje 2015-10-20 15:57:21 +00:00 committed by Gerrit Code Review
commit 9897e1c27c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vp10/decoder/decodeframe.c
View File

@ -1989,6 +1989,9 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
if (!vp10_read_sync_code(rb))
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
"Invalid frame sync code");
#if CONFIG_MISC_FIXES
read_bitdepth_colorspace_sampling(cm, rb);
#else
if (cm->profile > PROFILE_0) {
read_bitdepth_colorspace_sampling(cm, rb);
} else {
@ -2004,6 +2007,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
cm->use_highbitdepth = 0;
#endif
}
#endif
pbi->refresh_frame_flags = vpx_rb_read_literal(rb, REF_FRAMES);
setup_frame_size(cm, rb);

4
vp10/encoder/bitstream.c
View File

@ -1284,10 +1284,14 @@ static void write_uncompressed_header(VP10_COMP *cpi,
if (cm->intra_only) {
write_sync_code(wb);
#if CONFIG_MISC_FIXES
write_bitdepth_colorspace_sampling(cm, wb);
#else
// Note for profile 0, 420 8bpp is assumed.
if (cm->profile > PROFILE_0) {
write_bitdepth_colorspace_sampling(cm, wb);
}
#endif
vpx_wb_write_literal(wb, get_refresh_mask(cpi), REF_FRAMES);
write_frame_size(cm, wb);