generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_spp: Use dct->get_pixels()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-03 23:36:01 +02:00
parent e680c731a2
commit a7e87fef21
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/vf_spp.c
View File

@ -250,7 +250,7 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src,
const int x1 = x + offset[i + count - 1][0]; const int x1 = x + offset[i + count - 1][0];
const int y1 = y + offset[i + count - 1][1]; const int y1 = y + offset[i + count - 1][1];
const int index = x1 + y1*linesize; const int index = x1 + y1*linesize;
p->pdsp.get_pixels(block, p->src + index, linesize); p->dct->get_pixels(block, p->src + index, linesize);
p->dct->fdct(block); p->dct->fdct(block);
p->requantize(block2, block, qp, p->dct->idct_permutation); p->requantize(block2, block, qp, p->dct->idct_permutation);
p->dct->idct(block2); p->dct->idct(block2);
@ -400,7 +400,6 @@ static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts)
spp->dct = avcodec_dct_alloc(); spp->dct = avcodec_dct_alloc();
if (!spp->avctx || !spp->dct) if (!spp->avctx || !spp->dct)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ff_pixblockdsp_init(&spp->pdsp, spp->avctx);
if (opts) { if (opts) {
AVDictionaryEntry *e = NULL; AVDictionaryEntry *e = NULL;

2
libavfilter/vf_spp.h
View File

@ -23,7 +23,6 @@
#define AVFILTER_SPP_H #define AVFILTER_SPP_H
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/pixblockdsp.h"
#include "libavcodec/avdct.h" #include "libavcodec/avdct.h"
#include "avfilter.h" #include "avfilter.h"
@ -40,7 +39,6 @@ typedef struct {
uint8_t *src; uint8_t *src;
int16_t *temp; int16_t *temp;
AVCodecContext *avctx; AVCodecContext *avctx;
PixblockDSPContext pdsp;
AVDCT *dct; AVDCT *dct;
int8_t *non_b_qp_table; int8_t *non_b_qp_table;
int non_b_qp_alloc_size; int non_b_qp_alloc_size;