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

interplayvideo: use hpeldsp instead of dsputil for half-pel functions.

Browse Source 
This makes interplayvideo independent of dsputil.
This commit is contained in:
Ronald S. Bultje 2013-03-10 12:58:02 -07:00 committed by Michael Niedermayer
parent af1e3dfb9e
commit 04a75bb74f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1741,7 +1741,7 @@ huffyuv_encoder_select="huffman"
iac_decoder_select="fft mdct sinewin" iac_decoder_select="fft mdct sinewin"
imc_decoder_select="dsputil fft mdct sinewin" imc_decoder_select="dsputil fft mdct sinewin"
indeo3_decoder_select="hpeldsp" indeo3_decoder_select="hpeldsp"
interplayvideo_decoder_select="dsputil" interplay_video_decoder_select="hpeldsp"
jpegls_decoder_select="golomb" jpegls_decoder_select="golomb"
jpegls_encoder_select="golomb" jpegls_encoder_select="golomb"
jv_decoder_select="dsputil" jv_decoder_select="dsputil"

10
libavcodec/interplayvideo.c
View File

@ -40,7 +40,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "dsputil.h" #include "hpeldsp.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
@ -50,7 +50,7 @@
typedef struct IpvideoContext { typedef struct IpvideoContext {
AVCodecContext *avctx; AVCodecContext *avctx;
DSPContext dsp; HpelDSPContext hdsp;
AVFrame *second_last_frame; AVFrame *second_last_frame;
AVFrame *last_frame; AVFrame *last_frame;
const unsigned char *decoding_map; const unsigned char *decoding_map;
@ -83,8 +83,8 @@ static int copy_from(IpvideoContext *s, AVFrame *src, AVFrame *dst, int delta_x,
av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n"); av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
s->dsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset, s->hdsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
dst->linesize[0], 8); dst->linesize[0], 8);
return 0; return 0;
} }
@ -939,7 +939,7 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx)
s->is_16bpp = avctx->bits_per_coded_sample == 16; s->is_16bpp = avctx->bits_per_coded_sample == 16;
avctx->pix_fmt = s->is_16bpp ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_PAL8; avctx->pix_fmt = s->is_16bpp ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_PAL8;
ff_dsputil_init(&s->dsp, avctx); ff_hpeldsp_init(&s->hdsp, avctx->flags);
s->last_frame = av_frame_alloc(); s->last_frame = av_frame_alloc();
s->second_last_frame = av_frame_alloc(); s->second_last_frame = av_frame_alloc();