virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mimic: Use hpeldsp instead of dsputil for half-pel functions

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Ronald S. Bultje 2013-03-10 13:32:10 -07:00 committed by Martin Storsjö
parent 8071264f21
commit c10470035e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1587,7 +1587,7 @@ lagarith_decoder_select="dsputil"
ljpeg_encoder_select="aandcttables mpegvideoenc" ljpeg_encoder_select="aandcttables mpegvideoenc"
loco_decoder_select="golomb" loco_decoder_select="golomb"
mdec_decoder_select="dsputil error_resilience mpegvideo" mdec_decoder_select="dsputil error_resilience mpegvideo"
mimic_decoder_select="dsputil" mimic_decoder_select="dsputil hpeldsp"
mjpeg_decoder_select="dsputil" mjpeg_decoder_select="dsputil"
mjpegb_decoder_select="dsputil" mjpegb_decoder_select="dsputil"
mjpeg_encoder_select="aandcttables dsputil mpegvideoenc" mjpeg_encoder_select="aandcttables dsputil mpegvideoenc"

7
libavcodec/mimic.c
View File

@ -28,6 +28,7 @@
#include "get_bits.h" #include "get_bits.h"
#include "bytestream.h" #include "bytestream.h"
#include "dsputil.h" #include "dsputil.h"
#include "hpeldsp.h"
#include "thread.h" #include "thread.h"
#define MIMIC_HEADER_SIZE 20 #define MIMIC_HEADER_SIZE 20
@ -52,6 +53,7 @@ typedef struct {
GetBitContext gb; GetBitContext gb;
ScanTable scantable; ScanTable scantable;
DSPContext dsp; DSPContext dsp;
HpelDSPContext hdsp;
VLC vlc; VLC vlc;
/* Kept in the context so multithreading can have a constant to read from */ /* Kept in the context so multithreading can have a constant to read from */
@ -144,6 +146,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx)
return ret; return ret;
} }
ff_dsputil_init(&ctx->dsp, avctx); ff_dsputil_init(&ctx->dsp, avctx);
ff_hpeldsp_init(&ctx->hdsp, avctx->flags);
ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, col_zag); ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, col_zag);
for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) { for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) {
@ -304,7 +307,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
cur_row, 0); cur_row, 0);
p += src - p += src -
ctx->flipped_ptrs[ctx->prev_index].data[plane]; ctx->flipped_ptrs[ctx->prev_index].data[plane];
ctx->dsp.put_pixels_tab[1][0](dst, p, stride, 8); ctx->hdsp.put_pixels_tab[1][0](dst, p, stride, 8);
} else { } else {
av_log(ctx->avctx, AV_LOG_ERROR, av_log(ctx->avctx, AV_LOG_ERROR,
"No such backreference! Buggy sample.\n"); "No such backreference! Buggy sample.\n");
@ -313,7 +316,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
} else { } else {
ff_thread_await_progress(&ctx->frames[ctx->prev_index], ff_thread_await_progress(&ctx->frames[ctx->prev_index],
cur_row, 0); cur_row, 0);
ctx->dsp.put_pixels_tab[1][0](dst, src, stride, 8); ctx->hdsp.put_pixels_tab[1][0](dst, src, stride, 8);
} }
src += 8; src += 8;
dst += 8; dst += 8;