Commit 98a6806f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '368f5035'

* commit '368f5035':
  dsputil: Split off quarterpel bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/h263dec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/qpeldsp.asm
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d35899cc 368f5035
...@@ -1816,6 +1816,7 @@ CONFIG_EXTRA=" ...@@ -1816,6 +1816,7 @@ CONFIG_EXTRA="
mpegvideo mpegvideo
mpegvideoenc mpegvideoenc
nettle nettle
qpeldsp
rangecoder rangecoder
riffdec riffdec
riffenc riffenc
...@@ -1987,7 +1988,7 @@ rdft_select="fft" ...@@ -1987,7 +1988,7 @@ rdft_select="fft"
mpegaudio_select="mpegaudiodsp" mpegaudio_select="mpegaudiodsp"
mpegaudiodsp_select="dct" mpegaudiodsp_select="dct"
mpegvideo_select="dsputil h264chroma hpeldsp videodsp" mpegvideo_select="dsputil h264chroma hpeldsp videodsp"
mpegvideoenc_select="dsputil mpegvideo" mpegvideoenc_select="dsputil mpegvideo qpeldsp"
# decoders / encoders # decoders / encoders
aac_decoder_select="mdct sinewin" aac_decoder_select="mdct sinewin"
...@@ -2016,7 +2017,7 @@ avrn_decoder_select="exif" ...@@ -2016,7 +2017,7 @@ avrn_decoder_select="exif"
bink_decoder_select="dsputil hpeldsp" bink_decoder_select="dsputil hpeldsp"
binkaudio_dct_decoder_select="mdct rdft dct sinewin" binkaudio_dct_decoder_select="mdct rdft dct sinewin"
binkaudio_rdft_decoder_select="mdct rdft sinewin" binkaudio_rdft_decoder_select="mdct rdft sinewin"
cavs_decoder_select="dsputil golomb h264chroma videodsp" cavs_decoder_select="dsputil golomb h264chroma qpeldsp videodsp"
cllc_decoder_select="dsputil" cllc_decoder_select="dsputil"
comfortnoise_encoder_select="lpc" comfortnoise_encoder_select="lpc"
cook_decoder_select="dsputil mdct sinewin" cook_decoder_select="dsputil mdct sinewin"
...@@ -2054,7 +2055,7 @@ g2m_decoder_select="dsputil zlib" ...@@ -2054,7 +2055,7 @@ g2m_decoder_select="dsputil zlib"
g729_decoder_select="dsputil" g729_decoder_select="dsputil"
h261_decoder_select="error_resilience mpegvideo" h261_decoder_select="error_resilience mpegvideo"
h261_encoder_select="aandcttables mpegvideoenc" h261_encoder_select="aandcttables mpegvideoenc"
h263_decoder_select="error_resilience h263_parser h263dsp mpegvideo" h263_decoder_select="error_resilience h263_parser h263dsp mpegvideo qpeldsp"
h263_encoder_select="aandcttables h263dsp mpegvideoenc" h263_encoder_select="aandcttables h263dsp mpegvideoenc"
h263i_decoder_select="h263_decoder" h263i_decoder_select="h263_decoder"
h263p_encoder_select="h263_encoder" h263p_encoder_select="h263_encoder"
...@@ -2106,7 +2107,7 @@ msmpeg4v2_decoder_select="h263_decoder" ...@@ -2106,7 +2107,7 @@ msmpeg4v2_decoder_select="h263_decoder"
msmpeg4v2_encoder_select="h263_encoder" msmpeg4v2_encoder_select="h263_encoder"
msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_decoder_select="h263_decoder"
msmpeg4v3_encoder_select="h263_encoder" msmpeg4v3_encoder_select="h263_encoder"
mss2_decoder_select="error_resilience vc1_decoder" mss2_decoder_select="error_resilience qpeldsp vc1_decoder"
mxpeg_decoder_select="mjpeg_decoder" mxpeg_decoder_select="mjpeg_decoder"
nellymoser_decoder_select="mdct sinewin" nellymoser_decoder_select="mdct sinewin"
nellymoser_encoder_select="audio_frame_queue mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin"
...@@ -2154,7 +2155,7 @@ twinvq_decoder_select="mdct lsp sinewin" ...@@ -2154,7 +2155,7 @@ twinvq_decoder_select="mdct lsp sinewin"
utvideo_decoder_select="dsputil" utvideo_decoder_select="dsputil"
utvideo_encoder_select="dsputil huffman huffyuvencdsp" utvideo_encoder_select="dsputil huffman huffyuvencdsp"
vble_decoder_select="huffyuvdsp" vble_decoder_select="huffyuvdsp"
vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel intrax8" vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel intrax8 qpeldsp"
vc1image_decoder_select="vc1_decoder" vc1image_decoder_select="vc1_decoder"
vorbis_decoder_select="mdct" vorbis_decoder_select="mdct"
vorbis_encoder_select="mdct" vorbis_encoder_select="mdct"
...@@ -2258,8 +2259,8 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" ...@@ -2258,8 +2259,8 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
# parsers # parsers
h264_parser_select="h264_decoder" h264_parser_select="h264_decoder"
hevc_parser_select="hevc_decoder" hevc_parser_select="hevc_decoder"
mpeg4video_parser_select="error_resilience h263dsp mpegvideo"
mpegvideo_parser_select="error_resilience mpegvideo" mpegvideo_parser_select="error_resilience mpegvideo"
mpeg4video_parser_select="error_resilience h263dsp mpegvideo qpeldsp"
vc1_parser_select="mpegvideo" vc1_parser_select="mpegvideo"
# external libraries # external libraries
......
...@@ -72,6 +72,7 @@ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o \ ...@@ -72,6 +72,7 @@ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o \
mpegutils.o mpegutils.o
OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \
motion_est.o ratecontrol.o motion_est.o ratecontrol.o
OBJS-$(CONFIG_QPELDSP) += qpeldsp.o
OBJS-$(CONFIG_RANGECODER) += rangecoder.o OBJS-$(CONFIG_RANGECODER) += rangecoder.o
RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o
OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes)
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "golomb.h" #include "golomb.h"
#include "h264chroma.h" #include "h264chroma.h"
#include "mathops.h" #include "mathops.h"
#include "qpeldsp.h"
#include "cavs.h" #include "cavs.h"
static const uint8_t alpha_tab[64] = { static const uint8_t alpha_tab[64] = {
......
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
#define AVCODEC_CAVSDSP_H #define AVCODEC_CAVSDSP_H
#include <stdint.h> #include <stdint.h>
#include "dsputil.h"
#include "avcodec.h"
#include "qpeldsp.h"
typedef struct CAVSDSPContext { typedef struct CAVSDSPContext {
qpel_mc_func put_cavs_qpel_pixels_tab[2][16]; qpel_mc_func put_cavs_qpel_pixels_tab[2][16];
......
This diff is collapsed.
...@@ -34,15 +34,6 @@ ...@@ -34,15 +34,6 @@
extern uint32_t ff_square_tab[512]; extern uint32_t ff_square_tab[512];
void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_put_pixels8_l2_8(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
int dst_stride, int src_stride1, int src_stride2,
int h);
void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
int dxx, int dxy, int dyx, int dyy, int shift, int r, int dxx, int dxy, int dyx, int dyy, int shift, int r,
int width, int height); int width, int height);
...@@ -64,33 +55,9 @@ void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, ...@@ -64,33 +55,9 @@ void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
* Block sizes for op_pixels_func are 8x4,8x8 16x8 16x16. * Block sizes for op_pixels_func are 8x4,8x8 16x8 16x16.
* h for op_pixels_func is limited to { width / 2, width }, * h for op_pixels_func is limited to { width / 2, width },
* but never larger than 16 and never smaller than 4. */ * but never larger than 16 and never smaller than 4. */
typedef void (*qpel_mc_func)(uint8_t *dst /* align width (8 or 16) */,
uint8_t *src /* align 1 */, ptrdiff_t stride);
typedef void (*op_fill_func)(uint8_t *block /* align width (8 or 16) */, typedef void (*op_fill_func)(uint8_t *block /* align width (8 or 16) */,
uint8_t value, int line_size, int h); uint8_t value, int line_size, int h);
#define DEF_OLD_QPEL(name) \
void ff_put_ ## name(uint8_t *dst /* align width (8 or 16) */, \
uint8_t *src /* align 1 */, ptrdiff_t stride); \
void ff_put_no_rnd_ ## name(uint8_t *dst /* align width (8 or 16) */, \
uint8_t *src /* align 1 */, ptrdiff_t stride); \
void ff_avg_ ## name(uint8_t *dst /* align width (8 or 16) */, \
uint8_t *src /* align 1 */, ptrdiff_t stride);
DEF_OLD_QPEL(qpel16_mc11_old_c)
DEF_OLD_QPEL(qpel16_mc31_old_c)
DEF_OLD_QPEL(qpel16_mc12_old_c)
DEF_OLD_QPEL(qpel16_mc32_old_c)
DEF_OLD_QPEL(qpel16_mc13_old_c)
DEF_OLD_QPEL(qpel16_mc33_old_c)
DEF_OLD_QPEL(qpel8_mc11_old_c)
DEF_OLD_QPEL(qpel8_mc31_old_c)
DEF_OLD_QPEL(qpel8_mc12_old_c)
DEF_OLD_QPEL(qpel8_mc32_old_c)
DEF_OLD_QPEL(qpel8_mc13_old_c)
DEF_OLD_QPEL(qpel8_mc33_old_c)
struct MpegEncContext; struct MpegEncContext;
/* Motion estimation: /* Motion estimation:
* h is limited to { width / 2, width, 2 * width }, * h is limited to { width / 2, width, 2 * width },
...@@ -176,10 +143,6 @@ typedef struct DSPContext { ...@@ -176,10 +143,6 @@ typedef struct DSPContext {
me_cmp_func ildct_cmp[6]; // only width 16 used me_cmp_func ildct_cmp[6]; // only width 16 used
me_cmp_func frame_skip_cmp[6]; // only width 8 used me_cmp_func frame_skip_cmp[6]; // only width 8 used
qpel_mc_func put_qpel_pixels_tab[2][16];
qpel_mc_func avg_qpel_pixels_tab[2][16];
qpel_mc_func put_no_rnd_qpel_pixels_tab[2][16];
me_cmp_func pix_abs[2][4]; me_cmp_func pix_abs[2][4];
void (*bswap_buf)(uint32_t *dst, const uint32_t *src, int w); void (*bswap_buf)(uint32_t *dst, const uint32_t *src, int w);
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "mpeg4video_parser.h" #include "mpeg4video_parser.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "msmpeg4.h" #include "msmpeg4.h"
#include "qpeldsp.h"
#include "vdpau_internal.h" #include "vdpau_internal.h"
#include "thread.h" #include "thread.h"
...@@ -124,6 +125,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) ...@@ -124,6 +125,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
return ret; return ret;
ff_h263dsp_init(&s->h263dsp); ff_h263dsp_init(&s->h263dsp);
ff_qpeldsp_init(&s->qdsp);
ff_h263_decode_init_vlc(); ff_h263_decode_init_vlc();
return 0; return 0;
...@@ -556,11 +558,11 @@ retry: ...@@ -556,11 +558,11 @@ retry:
} }
if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) { if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) {
s->me.qpel_put = s->dsp.put_qpel_pixels_tab; s->me.qpel_put = s->qdsp.put_qpel_pixels_tab;
s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab; s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab;
} else { } else {
s->me.qpel_put = s->dsp.put_no_rnd_qpel_pixels_tab; s->me.qpel_put = s->qdsp.put_no_rnd_qpel_pixels_tab;
s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab; s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab;
} }
if ((ret = ff_MPV_frame_start(s, avctx)) < 0) if ((ret = ff_MPV_frame_start(s, avctx)) < 0)
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "h264qpel.h" #include "h264qpel.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "parser.h" #include "parser.h"
#include "qpeldsp.h"
#include "rectangle.h" #include "rectangle.h"
#include "videodsp.h" #include "videodsp.h"
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "h264.h" #include "h264.h"
#include "qpeldsp.h"
#include "svq3.h" #include "svq3.h"
#include "thread.h" #include "thread.h"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#ifndef AVCODEC_H264QPEL_H #ifndef AVCODEC_H264QPEL_H
#define AVCODEC_H264QPEL_H #define AVCODEC_H264QPEL_H
#include "dsputil.h" #include "qpeldsp.h"
typedef struct H264QpelContext { typedef struct H264QpelContext {
qpel_mc_func put_h264_qpel_pixels_tab[4][16]; qpel_mc_func put_h264_qpel_pixels_tab[4][16];
......
...@@ -328,9 +328,11 @@ int ff_init_me(MpegEncContext *s){ ...@@ -328,9 +328,11 @@ int ff_init_me(MpegEncContext *s){
/*FIXME s->no_rounding b_type*/ /*FIXME s->no_rounding b_type*/
if(s->flags&CODEC_FLAG_QPEL){ if(s->flags&CODEC_FLAG_QPEL){
c->sub_motion_search= qpel_motion_search; c->sub_motion_search= qpel_motion_search;
c->qpel_avg= s->dsp.avg_qpel_pixels_tab; c->qpel_avg = s->qdsp.avg_qpel_pixels_tab;
if(s->no_rounding) c->qpel_put= s->dsp.put_no_rnd_qpel_pixels_tab; if (s->no_rounding)
else c->qpel_put= s->dsp.put_qpel_pixels_tab; c->qpel_put = s->qdsp.put_no_rnd_qpel_pixels_tab;
else
c->qpel_put = s->qdsp.put_qpel_pixels_tab;
}else{ }else{
if(c->avctx->me_sub_cmp&FF_CMP_CHROMA) if(c->avctx->me_sub_cmp&FF_CMP_CHROMA)
c->sub_motion_search= hpel_motion_search; c->sub_motion_search= hpel_motion_search;
...@@ -636,9 +638,9 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift) ...@@ -636,9 +638,9 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
dxy = ((my4 & 3) << 2) | (mx4 & 3); dxy = ((my4 & 3) << 2) | (mx4 & 3);
if(s->no_rounding) if(s->no_rounding)
s->dsp.put_no_rnd_qpel_pixels_tab[1][dxy](dest_y , ref , stride); s->qdsp.put_no_rnd_qpel_pixels_tab[1][dxy](dest_y, ref, stride);
else else
s->dsp.put_qpel_pixels_tab [1][dxy](dest_y , ref , stride); s->qdsp.put_qpel_pixels_tab[1][dxy](dest_y, ref, stride);
}else{ }else{
uint8_t *ref= c->ref[block][0] + (mx4>>1) + (my4>>1)*stride; uint8_t *ref= c->ref[block][0] + (mx4>>1) + (my4>>1)*stride;
dxy = ((my4 & 1) << 1) | (mx4 & 1); dxy = ((my4 & 1) << 1) | (mx4 & 1);
...@@ -1226,14 +1228,14 @@ static inline int check_bidir_mv(MpegEncContext * s, ...@@ -1226,14 +1228,14 @@ static inline int check_bidir_mv(MpegEncContext * s,
src_y = motion_fy >> 2; src_y = motion_fy >> 2;
ptr = ref_data[0] + (src_y * stride) + src_x; ptr = ref_data[0] + (src_y * stride) + src_x;
s->dsp.put_qpel_pixels_tab[0][dxy](dest_y , ptr , stride); s->qdsp.put_qpel_pixels_tab[0][dxy](dest_y, ptr, stride);
dxy = ((motion_by & 3) << 2) | (motion_bx & 3); dxy = ((motion_by & 3) << 2) | (motion_bx & 3);
src_x = motion_bx >> 2; src_x = motion_bx >> 2;
src_y = motion_by >> 2; src_y = motion_by >> 2;
ptr = ref2_data[0] + (src_y * stride) + src_x; ptr = ref2_data[0] + (src_y * stride) + src_x;
s->dsp.avg_qpel_pixels_tab[size][dxy](dest_y , ptr , stride); s->qdsp.avg_qpel_pixels_tab[size][dxy](dest_y, ptr, stride);
}else{ }else{
dxy = ((motion_fy & 1) << 1) | (motion_fx & 1); dxy = ((motion_fy & 1) << 1) | (motion_fx & 1);
src_x = motion_fx >> 1; src_x = motion_fx >> 1;
......
...@@ -2157,9 +2157,9 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) ...@@ -2157,9 +2157,9 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx)
s->workaround_bugs |= FF_BUG_DC_CLIP; s->workaround_bugs |= FF_BUG_DC_CLIP;
#define SET_QPEL_FUNC(postfix1, postfix2) \ #define SET_QPEL_FUNC(postfix1, postfix2) \
s->dsp.put_ ## postfix1 = ff_put_ ## postfix2; \ s->qdsp.put_ ## postfix1 = ff_put_ ## postfix2; \
s->dsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2; \ s->qdsp.put_no_rnd_ ## postfix1 = ff_put_no_rnd_ ## postfix2; \
s->dsp.avg_ ## postfix1 = ff_avg_ ## postfix2; s->qdsp.avg_ ## postfix1 = ff_avg_ ## postfix2;
if (ctx->lavc_build < 4653U) if (ctx->lavc_build < 4653U)
s->workaround_bugs |= FF_BUG_STD_QPEL; s->workaround_bugs |= FF_BUG_STD_QPEL;
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mjpegenc.h" #include "mjpegenc.h"
#include "msmpeg4.h" #include "msmpeg4.h"
#include "qpeldsp.h"
#include "thread.h" #include "thread.h"
#include <limits.h> #include <limits.h>
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "ratecontrol.h" #include "ratecontrol.h"
#include "parser.h" #include "parser.h"
#include "mpeg12data.h" #include "mpeg12data.h"
#include "qpeldsp.h"
#include "rl.h" #include "rl.h"
#include "thread.h" #include "thread.h"
#include "videodsp.h" #include "videodsp.h"
...@@ -356,6 +357,7 @@ typedef struct MpegEncContext { ...@@ -356,6 +357,7 @@ typedef struct MpegEncContext {
DSPContext dsp; ///< pointers for accelerated dsp functions DSPContext dsp; ///< pointers for accelerated dsp functions
H264ChromaContext h264chroma; H264ChromaContext h264chroma;
HpelDSPContext hdsp; HpelDSPContext hdsp;
QpelDSPContext qdsp;
VideoDSPContext vdsp; VideoDSPContext vdsp;
H263DSPContext h263dsp; H263DSPContext h263dsp;
int f_code; ///< forward MV resolution int f_code; ///< forward MV resolution
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "mpegutils.h" #include "mpegutils.h"
#include "mjpegenc.h" #include "mjpegenc.h"
#include "msmpeg4.h" #include "msmpeg4.h"
#include "qpeldsp.h"
#include "faandct.h" #include "faandct.h"
#include "thread.h" #include "thread.h"
#include "aandcttab.h" #include "aandcttab.h"
...@@ -803,6 +804,8 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx) ...@@ -803,6 +804,8 @@ av_cold int ff_MPV_encode_init(AVCodecContext *avctx)
if (ff_MPV_common_init(s) < 0) if (ff_MPV_common_init(s) < 0)
return -1; return -1;
ff_qpeldsp_init(&s->qdsp);
s->avctx->coded_frame = s->current_picture.f; s->avctx->coded_frame = s->current_picture.f;
if (s->msmpeg4_version) { if (s->msmpeg4_version) {
...@@ -2090,10 +2093,10 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, ...@@ -2090,10 +2093,10 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s,
if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) { if ((!s->no_rounding) || s->pict_type == AV_PICTURE_TYPE_B) {
op_pix = s->hdsp.put_pixels_tab; op_pix = s->hdsp.put_pixels_tab;
op_qpix = s->dsp.put_qpel_pixels_tab; op_qpix = s->qdsp.put_qpel_pixels_tab;
} else { } else {
op_pix = s->hdsp.put_no_rnd_pixels_tab; op_pix = s->hdsp.put_no_rnd_pixels_tab;
op_qpix = s->dsp.put_no_rnd_qpel_pixels_tab; op_qpix = s->qdsp.put_no_rnd_qpel_pixels_tab;
} }
if (s->mv_dir & MV_DIR_FORWARD) { if (s->mv_dir & MV_DIR_FORWARD) {
...@@ -2101,7 +2104,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, ...@@ -2101,7 +2104,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s,
s->last_picture.f->data, s->last_picture.f->data,
op_pix, op_qpix); op_pix, op_qpix);
op_pix = s->hdsp.avg_pixels_tab; op_pix = s->hdsp.avg_pixels_tab;
op_qpix = s->dsp.avg_qpel_pixels_tab; op_qpix = s->qdsp.avg_qpel_pixels_tab;
} }
if (s->mv_dir & MV_DIR_BACKWARD) { if (s->mv_dir & MV_DIR_BACKWARD) {
ff_MPV_motion(s, dest_y, dest_cb, dest_cr, 1, ff_MPV_motion(s, dest_y, dest_cb, dest_cr, 1,
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mjpegenc.h" #include "mjpegenc.h"
#include "msmpeg4.h" #include "msmpeg4.h"
#include "qpeldsp.h"
#include <limits.h> #include <limits.h>
static void gmc1_motion(MpegEncContext *s, static void gmc1_motion(MpegEncContext *s,
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "error_resilience.h" #include "error_resilience.h"
#include "internal.h" #include "internal.h"
#include "msmpeg4data.h" #include "msmpeg4data.h"
#include "qpeldsp.h"
#include "vc1.h" #include "vc1.h"
#include "mss12.h" #include "mss12.h"
#include "mss2dsp.h" #include "mss2dsp.h"
...@@ -37,6 +38,7 @@ typedef struct MSS2Context { ...@@ -37,6 +38,7 @@ typedef struct MSS2Context {
AVFrame *last_pic; AVFrame *last_pic;
MSS12Context c; MSS12Context c;
MSS2DSPContext dsp; MSS2DSPContext dsp;
QpelDSPContext qdsp;
SliceContext sc[2]; SliceContext sc[2];
} MSS2Context; } MSS2Context;
...@@ -786,8 +788,8 @@ static av_cold int wmv9_init(AVCodecContext *avctx) ...@@ -786,8 +788,8 @@ static av_cold int wmv9_init(AVCodecContext *avctx)
return ret; return ret;
/* error concealment */ /* error concealment */
v->s.me.qpel_put = v->s.dsp.put_qpel_pixels_tab; v->s.me.qpel_put = v->s.qdsp.put_qpel_pixels_tab;
v->s.me.qpel_avg = v->s.dsp.avg_qpel_pixels_tab; v->s.me.qpel_avg = v->s.qdsp.avg_qpel_pixels_tab;
return 0; return 0;
} }
...@@ -827,6 +829,7 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) ...@@ -827,6 +829,7 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx)
return ret; return ret;
} }
ff_mss2dsp_init(&ctx->dsp); ff_mss2dsp_init(&ctx->dsp);
ff_qpeldsp_init(&ctx->qdsp);
avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555 avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555
: AV_PIX_FMT_RGB24; : AV_PIX_FMT_RGB24;
......
/* /*
* DSP utils * quarterpel DSP function templates
* Copyright (c) 2000, 2001 Fabrice Bellard
* Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
*
* gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
...@@ -24,7 +20,7 @@ ...@@ -24,7 +20,7 @@
/** /**
* @file * @file
* DSP utils * quarterpel DSP function templates
*/ */
#define PIXOP2(OPNAME, OP) \ #define PIXOP2(OPNAME, OP) \
......
This diff is collapsed.
/*
* quarterpel DSP functions
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* quarterpel DSP functions
*/
#ifndef AVCODEC_QPELDSP_H
#define AVCODEC_QPELDSP_H
#include <stddef.h>
#include <stdint.h>
void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
void ff_put_pixels8_l2_8(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
int dst_stride, int src_stride1, int src_stride2,
int h);
#define DEF_OLD_QPEL(name) \
void ff_put_ ## name(uint8_t *dst /* align width (8 or 16) */, \
uint8_t *src /* align 1 */, ptrdiff_t stride); \
void ff_put_no_rnd_ ## name(uint8_t *dst /* align width (8 or 16) */, \
uint8_t *src /* align 1 */, ptrdiff_t stride); \
void ff_avg_ ## name(uint8_t *dst /* align width (8 or 16) */, \
uint8_t *src /* align 1 */, ptrdiff_t stride);
DEF_OLD_QPEL(qpel16_mc11_old_c)
DEF_OLD_QPEL(qpel16_mc31_old_c)
DEF_OLD_QPEL(qpel16_mc12_old_c)
DEF_OLD_QPEL(qpel16_mc32_old_c)
DEF_OLD_QPEL(qpel16_mc13_old_c)
DEF_OLD_QPEL(qpel16_mc33_old_c)
DEF_OLD_QPEL(qpel8_mc11_old_c)
DEF_OLD_QPEL(qpel8_mc31_old_c)
DEF_OLD_QPEL(qpel8_mc12_old_c)
DEF_OLD_QPEL(qpel8_mc32_old_c)
DEF_OLD_QPEL(qpel8_mc13_old_c)
DEF_OLD_QPEL(qpel8_mc33_old_c)
typedef void (*qpel_mc_func)(uint8_t *dst /* align width (8 or 16) */,
uint8_t *src /* align 1 */, ptrdiff_t stride);
/**
* quarterpel DSP context
*/
typedef struct QpelDSPContext {
qpel_mc_func put_qpel_pixels_tab[2][16];
qpel_mc_func avg_qpel_pixels_tab[2][16];
qpel_mc_func put_no_rnd_qpel_pixels_tab[2][16];
} QpelDSPContext;
void ff_qpeldsp_init(QpelDSPContext *c);
void ff_qpeldsp_init_x86(QpelDSPContext *c);
#endif /* AVCODEC_QPELDSP_H */
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "golomb.h" #include "golomb.h"
#include "internal.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
#include "qpeldsp.h"
#include "rectangle.h" #include "rectangle.h"
#include "thread.h" #include "thread.h"
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#ifndef AVCODEC_RV34DSP_H #ifndef AVCODEC_RV34DSP_H
#define AVCODEC_RV34DSP_H #define AVCODEC_RV34DSP_H
#include "dsputil.h"
#include "h264chroma.h" #include "h264chroma.h"
#include "qpeldsp.h"
typedef void (*rv40_weight_func)(uint8_t *dst/*align width (8 or 16)*/, typedef void (*rv40_weight_func)(uint8_t *dst/*align width (8 or 16)*/,
uint8_t *src1/*align width (8 or 16)*/, uint8_t *src1/*align width (8 or 16)*/,
......
...@@ -411,11 +411,11 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){ ...@@ -411,11 +411,11 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
ff_h264qpel_init(&s->h264qpel, 8); ff_h264qpel_init(&s->h264qpel, 8);
#define mcf(dx,dy)\ #define mcf(dx,dy)\
s->dsp.put_qpel_pixels_tab [0][dy+dx/4]=\ s->qdsp.put_qpel_pixels_tab [0][dy+dx/4]=\
s->dsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\ s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\
s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\ s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\
s->dsp.put_qpel_pixels_tab [1][dy+dx/4]=\ s->qdsp.put_qpel_pixels_tab [1][dy+dx/4]=\
s->dsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\ s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\
s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4]; s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4];
mcf( 0, 0) mcf( 0, 0)
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "dsputil.h" #include "dsputil.h"
#include "hpeldsp.h" #include "hpeldsp.h"
#include "qpeldsp.h"
#include "snow_dwt.h" #include "snow_dwt.h"
#include "rangecoder.h" #include "rangecoder.h"
...@@ -111,6 +112,7 @@ typedef struct SnowContext{ ...@@ -111,6 +112,7 @@ typedef struct SnowContext{
RangeCoder c; RangeCoder c;
DSPContext dsp; DSPContext dsp;
HpelDSPContext hdsp; HpelDSPContext hdsp;
QpelDSPContext qdsp;
VideoDSPContext vdsp; VideoDSPContext vdsp;
H264QpelContext h264qpel; H264QpelContext h264qpel;
SnowDWTContext dwt; SnowDWTContext dwt;
......
...@@ -1641,6 +1641,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, ...@@ -1641,6 +1641,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->lambda2= s->m.lambda2= (s->m.lambda*s->m.lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT; s->lambda2= s->m.lambda2= (s->m.lambda*s->m.lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT;
s->m.dsp= s->dsp; //move s->m.dsp= s->dsp; //move
s->m.qdsp= s->qdsp; //move
s->m.hdsp = s->hdsp; s->m.hdsp = s->hdsp;
ff_init_me(&s->m); ff_init_me(&s->m);
s->hdsp = s->m.hdsp; s->hdsp = s->m.hdsp;
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "mpegvideo.h" #include "mpegvideo.h"
#include "h263.h" #include "h263.h"
#include "h264chroma.h" #include "h264chroma.h"
#include "qpeldsp.h"
#include "vc1.h" #include "vc1.h"
#include "vc1data.h" #include "vc1data.h"
#include "vc1acdata.h" #include "vc1acdata.h"
...@@ -5624,6 +5625,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) ...@@ -5624,6 +5625,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
ff_vc1_decode_end(avctx); ff_vc1_decode_end(avctx);
ff_h264chroma_init(&v->h264chroma, 8); ff_h264chroma_init(&v->h264chroma, 8);
ff_qpeldsp_init(&s->qdsp);
if (avctx->codec_id == AV_CODEC_ID_WMV3 || avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) { if (avctx->codec_id == AV_CODEC_ID_WMV3 || avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) {
int count = 0; int count = 0;
...@@ -6032,8 +6034,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, ...@@ -6032,8 +6034,8 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
s->current_picture_ptr->f->repeat_pict = v->rptfrm * 2; s->current_picture_ptr->f->repeat_pict = v->rptfrm * 2;
} }
s->me.qpel_put = s->dsp.put_qpel_pixels_tab; s->me.qpel_put = s->qdsp.put_qpel_pixels_tab;
s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab; s->me.qpel_avg = s->qdsp.avg_qpel_pixels_tab;
if ((CONFIG_VC1_VDPAU_DECODER) if ((CONFIG_VC1_VDPAU_DECODER)
&&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) { &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) {
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "dsputil.h"
#include "h264chroma.h" #include "h264chroma.h"
#include "qpeldsp.h"
#include "rnd_avg.h" #include "rnd_avg.h"
#include "vc1dsp.h" #include "vc1dsp.h"
#include "startcode.h" #include "startcode.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include "dsputil.h" #include "qpeldsp.h"
typedef struct WMV2DSPContext { typedef struct WMV2DSPContext {
void (*idct_add)(uint8_t *dest, int line_size, int16_t *block); void (*idct_add)(uint8_t *dest, int line_size, int16_t *block);
......
...@@ -24,6 +24,7 @@ OBJS-$(CONFIG_LPC) += x86/lpc.o ...@@ -24,6 +24,7 @@ OBJS-$(CONFIG_LPC) += x86/lpc.o
OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodsp.o OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodsp.o
OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o
OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o
OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp_init.o
OBJS-$(CONFIG_VIDEODSP) += x86/videodsp_init.o OBJS-$(CONFIG_VIDEODSP) += x86/videodsp_init.o
OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
...@@ -71,10 +72,7 @@ YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o ...@@ -71,10 +72,7 @@ YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o
YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\
x86/dwt_yasm.o x86/dwt_yasm.o
YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \ YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o
x86/fpel.o \
x86/mpeg4qpel.o \
x86/qpel.o
YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o
YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o
YASM-OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp.o YASM-OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp.o
...@@ -100,6 +98,9 @@ YASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \ ...@@ -100,6 +98,9 @@ YASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \
YASM-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp.o YASM-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp.o
YASM-OBJS-$(CONFIG_LLVIDDSP) += x86/lossless_videodsp.o YASM-OBJS-$(CONFIG_LLVIDDSP) += x86/lossless_videodsp.o
YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o
YASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \
x86/fpel.o \
x86/qpel.o
YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o
YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment