Mercurial > mplayer.hg
changeset 37135:488545e72316
update for idctdsp split
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| author | michael |
|---|---|
| date | Tue, 01 Jul 2014 13:35:47 +0000 |
| parents | 39b662840ac7 |
| children | 36638a3ccfe2 |
| files | configure libmpcodecs/vf_spp.c |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Jun 28 19:57:15 2014 +0000 +++ b/configure Tue Jul 01 13:35:47 2014 +0000 @@ -8670,6 +8670,7 @@ CONFIG_QPELDSP = yes CONFIG_HUFFYUVDSP = yes CONFIG_HUFFYUVENCDSP = yes +CONFIG_IDCTDSP = yes CONFIG_TPELDSP = yes CONFIG_HUFFMAN = yes CONFIG_INTRAX8 = yes @@ -9299,6 +9300,7 @@ #define CONFIG_H264PRED 1 #define CONFIG_H264QPEL 1 #define CONFIG_HUFFMAN 1 +#define CONFIG_IDCTDSP 1 #define CONFIG_LPC 1 #define CONFIG_LZO 1 #define CONFIG_MDCT 1
--- a/libmpcodecs/vf_spp.c Sat Jun 28 19:57:15 2014 +0000 +++ b/libmpcodecs/vf_spp.c Tue Jul 01 13:35:47 2014 +0000 @@ -42,6 +42,7 @@ #include "libavutil/intreadwrite.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#include "libavcodec/idctdsp.h" #undef fprintf #undef free @@ -101,6 +102,7 @@ int16_t *temp; AVCodecContext *avctx; DSPContext dsp; + IDCTDSPContext idsp; char *non_b_qp; }; @@ -416,8 +418,8 @@ const int index= x1 + y1*stride; p->dsp.get_pixels(block, p->src + index, stride); p->dsp.fdct(block); - requantize(block2, block, qp, p->dsp.idct_permutation); - p->dsp.idct(block2); + requantize(block2, block, qp, p->idsp.idct_permutation); + p->idsp.idct(block2); add_block(p->temp + index, stride, block2); } } @@ -581,6 +583,7 @@ vf->priv->avctx= avcodec_alloc_context3(NULL); ff_dsputil_init(&vf->priv->dsp, vf->priv->avctx); + ff_idctdsp_init(&vf->priv->idsp, vf->priv->avctx); vf->priv->log2_count= 3;