Module: libav Branch: master Commit: 18df366a1857f9a92e158858cf495b61d096c7f1
Author: Ronald S. Bultje <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Sat Mar 9 09:08:36 2013 -0800 vp3: Embed idct_permutation array directly in VP3DecoderContext This makes the vp3 decoder less dependent on dsputil, and will aid in making it (eventually) dsputil-independent. Signed-off-by: Martin Storsjö <[email protected]> --- libavcodec/vp3.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 3d55c78..18b9cb8 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -135,6 +135,7 @@ typedef struct Vp3DecodeContext { ThreadFrame last_frame; ThreadFrame current_frame; int keyframe; + uint8_t idct_permutation[64]; DSPContext dsp; VideoDSPContext vdsp; VP3DSPContext vp3dsp; @@ -374,7 +375,8 @@ static void init_dequantizer(Vp3DecodeContext *s, int qpi) int qmin= 8<<(inter + !i); int qscale= i ? ac_scale_factor : dc_scale_factor; - s->qmat[qpi][inter][plane][s->dsp.idct_permutation[i]]= av_clip((qscale * coeff)/100 * 4, qmin, 4096); + s->qmat[qpi][inter][plane][s->idct_permutation[i]] = + av_clip((qscale * coeff) / 100 * 4, qmin, 4096); } // all DC coefficients use the same quant so as not to interfere with DC prediction s->qmat[qpi][inter][plane][0] = s->qmat[0][inter][plane][0]; @@ -1698,8 +1700,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) ff_videodsp_init(&s->vdsp, 8); ff_vp3dsp_init(&s->vp3dsp, avctx->flags); - ff_init_scantable_permutation(s->dsp.idct_permutation, s->vp3dsp.idct_perm); - ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct); + ff_init_scantable_permutation(s->idct_permutation, s->vp3dsp.idct_perm); + ff_init_scantable(s->idct_permutation, &s->scantable, ff_zigzag_direct); /* initialize to an impossible value which will force a recalculation * in the first frame decode */ _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
