vp10: write colorspace info for profile 0 intraonly frames.

See issue 1087.

Change-Id: I231f6f12f870d0a56391daf1673536048418b207

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 2c3f357ea02f20f9822216c6423b0ef2664e9ca9..c3ab3d2bc98cfd2c863aabcfb1e3bdb5d57f7dc0 100644 (file)
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -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);

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index ea3d05e327081da49dcb7ba2dbfe857fb1283396..adc05cce246a10d733812424626747198870491a 100644 (file)
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -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);