# HG changeset patch # User conrad # Date 1266012082 0 # Node ID b6a0e8a2794123d4415053577a9d455fbaee7db0 # Parent 2f7baf2042a324489112ef87487364ff9ed90258 Export Theora colorspace info if present diff -r 2f7baf2042a3 -r b6a0e8a27941 vp3.c --- a/vp3.c Fri Feb 12 22:01:18 2010 +0000 +++ b/vp3.c Fri Feb 12 22:01:22 2010 +0000 @@ -2109,7 +2109,7 @@ 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 @@ 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 @@ 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; }