From 65875a8b3b079752da25a61ec188d2e3d90a569f Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Sun, 5 Oct 2014 22:58:50 +0100 Subject: [PATCH] vp8: initialize color space and range properties --- libavcodec/vp8.c | 12 ++++++++++-- libavcodec/vp8.h | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 5426555793..0d2cab31ff 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -670,9 +670,10 @@ static int vp8_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_si buf_size -= header_size; if (s->keyframe) { - if (vp8_rac_get(c)) + s->colorspace = vp8_rac_get(c); + if (s->colorspace) av_log(s->avctx, AV_LOG_WARNING, "Unspecified colorspace\n"); - vp8_rac_get(c); // whether we can skip clamping in dsp functions + s->fullrange = vp8_rac_get(c); } if ((s->segmentation.enabled = vp8_rac_get(c))) @@ -2490,6 +2491,13 @@ int vp78_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, curframe = s->framep[VP56_FRAME_CURRENT] = vp8_find_free_buffer(s); + if (!s->colorspace) + avctx->colorspace = AVCOL_SPC_BT470BG; + if (s->fullrange) + avctx->color_range = AVCOL_RANGE_JPEG; + else + avctx->color_range = AVCOL_RANGE_MPEG; + /* Given that arithmetic probabilities are updated every frame, it's quite * likely that the values we have on a random interframe are complete * junk if we didn't start decode on a keyframe. So just don't display diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index 365e7b76cb..2919a143af 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -264,6 +264,9 @@ typedef struct VP8Context { vp8_mc_func put_pixels_tab[3][3][3]; VP8Frame frames[5]; + uint8_t colorspace; ///< 0 is the only value allowed (meaning bt601) + uint8_t fullrange; ///< whether we can skip clamping in dsp functions + int num_jobs; /** * This describes the macroblock memory layout.