From patchwork Wed Apr 3 13:19:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [03/13] dsputil: Make square put/avg_pixels functions local to h264qpel X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 36636 Message-Id: <1364995179-98359-3-git-send-email-martin@martin.st> To: libav-devel@libav.org Date: Wed, 3 Apr 2013 16:19:29 +0300 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= List-Id: libav development From: "Ronald S. Bultje" Put a copy of the 8bit functions only in dsputil, where they are used for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps also try to share specifically the 8bit functions from h264qpel between it and the others, but that will be slightly more complicated. H264qpel already had these functions, so we can simply remove the duplicates. --- libavcodec/dsputil.c | 15 ++++++++++++++- libavcodec/dsputil.h | 18 ++++-------------- libavcodec/dsputil_template.c | 19 ++----------------- libavcodec/h264qpel_template.c | 17 ----------------- 4 files changed, 20 insertions(+), 49 deletions(-) diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 10d775c..49f0610 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -1281,12 +1281,25 @@ QPEL_MC(0, avg_ , _ , op_avg) #undef op_put #undef op_put_no_rnd +void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { + put_pixels8_8_c(dst, src, stride, 8); +} +void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { + avg_pixels8_8_c(dst, src, stride, 8); +} +void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { + put_pixels16_8_c(dst, src, stride, 16); +} +void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { + avg_pixels16_8_c(dst, src, stride, 16); +} + #define put_qpel8_mc00_c ff_put_pixels8x8_c #define avg_qpel8_mc00_c ff_avg_pixels8x8_c #define put_qpel16_mc00_c ff_put_pixels16x16_c #define avg_qpel16_mc00_c ff_avg_pixels16x16_c #define put_no_rnd_qpel8_mc00_c ff_put_pixels8x8_c -#define put_no_rnd_qpel16_mc00_c ff_put_pixels16x16_8_c +#define put_no_rnd_qpel16_mc00_c ff_put_pixels16x16_c static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h){ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index ce4469d..aa34488 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -49,20 +49,10 @@ extern const uint8_t ff_zigzag248_direct[64]; extern uint32_t ff_squareTbl[512]; extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP]; -#define PUTAVG_PIXELS(depth)\ -void ff_put_pixels8x8_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);\ -void ff_avg_pixels8x8_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);\ -void ff_put_pixels16x16_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride);\ -void ff_avg_pixels16x16_ ## depth ## _c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); - -PUTAVG_PIXELS( 8) -PUTAVG_PIXELS( 9) -PUTAVG_PIXELS(10) - -#define ff_put_pixels8x8_c ff_put_pixels8x8_8_c -#define ff_avg_pixels8x8_c ff_avg_pixels8x8_8_c -#define ff_put_pixels16x16_c ff_put_pixels16x16_8_c -#define ff_avg_pixels16x16_c ff_avg_pixels16x16_8_c +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); /* RV40 functions */ void ff_put_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 619404c..d232d51 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -107,7 +107,9 @@ DCTELEM_FUNCS(int16_t, _16) DCTELEM_FUNCS(dctcoef, _32) #endif +#if BIT_DEPTH == 8 #include "hpel_template.c" +#endif #define PIXOP2(OPNAME, OP) \ static inline void FUNC(OPNAME ## _no_rnd_pixels8_l2)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int dst_stride, \ @@ -420,20 +422,3 @@ PIXOP2(put, op_put) #endif #undef op_avg #undef op_put - -void FUNCC(ff_put_pixels8x8)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(put_pixels8)(dst, src, stride, 8); -} -void FUNCC(ff_avg_pixels8x8)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(avg_pixels8)(dst, src, stride, 8); -} -void FUNCC(ff_put_pixels16x16)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(put_pixels16)(dst, src, stride, 16); -} -void FUNCC(ff_avg_pixels16x16)(uint8_t *dst, uint8_t *src, ptrdiff_t stride) -{ - FUNCC(avg_pixels16)(dst, src, stride, 16); -} diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c index 4732b29..027edf5 100644 --- a/libavcodec/h264qpel_template.c +++ b/libavcodec/h264qpel_template.c @@ -547,20 +547,3 @@ H264_MC(avg_, 16) #undef op_put #undef op2_avg #undef op2_put - -#if BIT_DEPTH == 8 -# define put_h264_qpel8_mc00_8_c ff_put_pixels8x8_8_c -# define avg_h264_qpel8_mc00_8_c ff_avg_pixels8x8_8_c -# define put_h264_qpel16_mc00_8_c ff_put_pixels16x16_8_c -# define avg_h264_qpel16_mc00_8_c ff_avg_pixels16x16_8_c -#elif BIT_DEPTH == 9 -# define put_h264_qpel8_mc00_9_c ff_put_pixels8x8_9_c -# define avg_h264_qpel8_mc00_9_c ff_avg_pixels8x8_9_c -# define put_h264_qpel16_mc00_9_c ff_put_pixels16x16_9_c -# define avg_h264_qpel16_mc00_9_c ff_avg_pixels16x16_9_c -#elif BIT_DEPTH == 10 -# define put_h264_qpel8_mc00_10_c ff_put_pixels8x8_10_c -# define avg_h264_qpel8_mc00_10_c ff_avg_pixels8x8_10_c -# define put_h264_qpel16_mc00_10_c ff_put_pixels16x16_10_c -# define avg_h264_qpel16_mc00_10_c ff_avg_pixels16x16_10_c -#endif