Commit ef642060 authored by conrad's avatar conrad

Export Theora colorspace info if present

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21776 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 031fc098
...@@ -2109,7 +2109,7 @@ static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb) ...@@ -2109,7 +2109,7 @@ static int read_huffman_tree(AVCodecContext *avctx, GetBitContext *gb)
static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
{ {
Vp3DecodeContext *s = avctx->priv_data; Vp3DecodeContext *s = avctx->priv_data;
int visible_width, visible_height; int visible_width, visible_height, colorspace;
s->theora = get_bits_long(gb, 24); s->theora = get_bits_long(gb, 24);
av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora); 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) ...@@ -2146,7 +2146,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
if (s->theora < 0x030200) if (s->theora < 0x030200)
skip_bits(gb, 5); /* keyframe frequency force */ 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, 24); /* bitrate */
skip_bits(gb, 6); /* quality hint */ skip_bits(gb, 6); /* quality hint */
...@@ -2166,6 +2166,16 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) ...@@ -2166,6 +2166,16 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
else else
avcodec_set_dimensions(avctx, s->width, s->height); 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment