[SCM] libav/experimental: Export Theora colorspace info if present

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ea3c2d539313f5fb824cedeefea052b590bdf9b9
Author: David Conrad <lessen42 at gmail.com>
Date:   Fri Feb 12 22:01:22 2010 +0000

    Export Theora colorspace info if present
    
    Originally committed as revision 21776 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 42c3061..f54dff3 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2109,7 +2109,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);
@@ -2146,7 +2146,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 */
@@ -2166,6 +2166,16 @@ 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;
 }
 

-- 
Libav/FFmpeg packaging