ref: 9897e1c27c664b45b81e60a277df3e8186e03c4d
parent: bafadaafbbec3bef243e6c95391881c8d5cd0eb8
parent: 2a388b53f2e6f728127e800032712b3dbe3295ec
author: Ronald S. Bultje <rsbultje@gmail.com>
date: Tue Oct 20 11:57:21 EDT 2015
Merge "vp10: write colorspace info for profile 0 intraonly frames."
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -1989,6 +1989,9 @@
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 @@
cm->use_highbitdepth = 0;
#endif
}
+#endif
pbi->refresh_frame_flags = vpx_rb_read_literal(rb, REF_FRAMES);
setup_frame_size(cm, rb);
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1284,10 +1284,14 @@
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);