Mercurial > mplayer.hg
comparison libmpcodecs/vf_spp.c @ 37142:7ef7684adaa0
update for PixblockDSPContext
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
author | michael |
---|---|
date | Wed, 09 Jul 2014 23:20:47 +0000 |
parents | b69f68af3d6e |
children |
comparison
equal
deleted
inserted
replaced
37141:4f5d3812b268 | 37142:7ef7684adaa0 |
---|---|
39 | 39 |
40 #include "libavutil/common.h" | 40 #include "libavutil/common.h" |
41 #include "libavutil/internal.h" | 41 #include "libavutil/internal.h" |
42 #include "libavutil/intreadwrite.h" | 42 #include "libavutil/intreadwrite.h" |
43 #include "libavcodec/avcodec.h" | 43 #include "libavcodec/avcodec.h" |
44 #include "libavcodec/dsputil.h" | 44 #include "libavcodec/pixblockdsp.h" |
45 #include "libavcodec/idctdsp.h" | 45 #include "libavcodec/idctdsp.h" |
46 #include "libavcodec/fdctdsp.h" | 46 #include "libavcodec/fdctdsp.h" |
47 | 47 |
48 #undef fprintf | 48 #undef fprintf |
49 #undef free | 49 #undef free |
100 int mpeg2; | 100 int mpeg2; |
101 int temp_stride; | 101 int temp_stride; |
102 uint8_t *src; | 102 uint8_t *src; |
103 int16_t *temp; | 103 int16_t *temp; |
104 AVCodecContext *avctx; | 104 AVCodecContext *avctx; |
105 DSPContext dsp; | |
106 IDCTDSPContext idsp; | 105 IDCTDSPContext idsp; |
107 FDCTDSPContext fdsp; | 106 FDCTDSPContext fdsp; |
107 PixblockDSPContext pdsp; | |
108 char *non_b_qp; | 108 char *non_b_qp; |
109 }; | 109 }; |
110 | 110 |
111 #define SHIFT 22 | 111 #define SHIFT 22 |
112 | 112 |
416 } | 416 } |
417 for(i=0; i<count; i++){ | 417 for(i=0; i<count; i++){ |
418 const int x1= x + offset[i+count-1][0]; | 418 const int x1= x + offset[i+count-1][0]; |
419 const int y1= y + offset[i+count-1][1]; | 419 const int y1= y + offset[i+count-1][1]; |
420 const int index= x1 + y1*stride; | 420 const int index= x1 + y1*stride; |
421 p->dsp.get_pixels(block, p->src + index, stride); | 421 p->pdsp.get_pixels(block, p->src + index, stride); |
422 p->fdsp.fdct(block); | 422 p->fdsp.fdct(block); |
423 requantize(block2, block, qp, p->idsp.idct_permutation); | 423 requantize(block2, block, qp, p->idsp.idct_permutation); |
424 p->idsp.idct(block2); | 424 p->idsp.idct(block2); |
425 add_block(p->temp + index, stride, block2); | 425 add_block(p->temp + index, stride, block2); |
426 } | 426 } |
582 memset(vf->priv, 0, sizeof(struct vf_priv_s)); | 582 memset(vf->priv, 0, sizeof(struct vf_priv_s)); |
583 | 583 |
584 init_avcodec(); | 584 init_avcodec(); |
585 | 585 |
586 vf->priv->avctx= avcodec_alloc_context3(NULL); | 586 vf->priv->avctx= avcodec_alloc_context3(NULL); |
587 ff_dsputil_init(&vf->priv->dsp, vf->priv->avctx); | 587 ff_pixblockdsp_init(&vf->priv->pdsp, vf->priv->avctx); |
588 ff_idctdsp_init(&vf->priv->idsp, vf->priv->avctx); | 588 ff_idctdsp_init(&vf->priv->idsp, vf->priv->avctx); |
589 ff_fdctdsp_init(&vf->priv->fdsp, vf->priv->avctx); | 589 ff_fdctdsp_init(&vf->priv->fdsp, vf->priv->avctx); |
590 | 590 |
591 vf->priv->log2_count= 3; | 591 vf->priv->log2_count= 3; |
592 | 592 |