[FFmpeg-devel] [PATCH 4/4] Export Theora colorspace info if present

[David Conrad]

---
 libavcodec/vp3.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index fedc8e9..a715160 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2107,7 +2107,7 @@ static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
 static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
 {
     Vp3DecodeContext *s = avctx->priv_data;
-    int visible_width, visible_height;
+    int visible_width, visible_height, colorspace;
 
     s->theora = get_bits_long(gb, 24);
     av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
@@ -2144,7 +2144,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
 
     if (s->theora < 0x030200)
         skip_bits(gb, 5); /* keyframe frequency force */
-    skip_bits(gb, 8); /* colorspace */
+    colorspace = get_bits(gb, 8);
     skip_bits(gb, 24); /* bitrate */
 
     skip_bits(gb, 6); /* quality hint */
@@ -2164,6 +2164,15 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
     else
         avcodec_set_dimensions(avctx, s->width, s->height);
 
+    if (colorspace == 1)
+        avctx->color_primaries == AVCOL_PRI_BT470M;
+    else if (colorspace == 2)
+        avctx->color_primaries == AVCOL_PRI_BT470BG;
+    if (colorspace == 1 || colorspace == 2) {
+        avctx->colorspace = AVCOL_SPC_BT470BG;
+        avctx->color_trc = AVCOL_TRC_BT709;
+    }
+
     return 0;
 }
 
-- 
1.6.6