[MPlayer-cvslog] r37231 - in trunk: configure libmpcodecs/vf_spp.c

[michael]

Author: michael
Date: Tue Jul  1 15:35:47 2014
New Revision: 37231

Log:
update for idctdsp split

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

Modified:
   trunk/configure
   trunk/libmpcodecs/vf_spp.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Jun 28 21:57:15 2014	(r37230)
+++ trunk/configure	Tue Jul  1 15:35:47 2014	(r37231)
@@ -8670,6 +8670,7 @@ CONFIG_HPELDSP = yes
 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 @@ $def_truncf
 #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

Modified: trunk/libmpcodecs/vf_spp.c
==============================================================================
--- trunk/libmpcodecs/vf_spp.c	Sat Jun 28 21:57:15 2014	(r37230)
+++ trunk/libmpcodecs/vf_spp.c	Tue Jul  1 15:35:47 2014	(r37231)
@@ -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 @@ struct vf_priv_s {
         int16_t *temp;
         AVCodecContext *avctx;
         DSPContext dsp;
+        IDCTDSPContext idsp;
         char *non_b_qp;
 };
 
@@ -416,8 +418,8 @@ static void filter(struct vf_priv_s *p, 
                                 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 @@ static int vf_open(vf_instance_t *vf, ch
 
     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;