Hi,
On Sun, Jul 17, 2011 at 4:43 AM, Diego Biurrun <[email protected]> wrote:
> ---
> libavcodec/dsputil.c | 32 --------------------------------
> libavcodec/x86/dsputil_mmx.c | 39 ---------------------------------------
> 2 files changed, 0 insertions(+), 71 deletions(-)
>
> diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
> index 8bb7dc1..6cbbf3d 100644
> --- a/libavcodec/dsputil.c
> +++ b/libavcodec/dsputil.c
> @@ -175,16 +175,6 @@ static int pix_norm1_c(uint8_t * pix, int line_size)
> s = 0;
> for (i = 0; i < 16; i++) {
> for (j = 0; j < 16; j += 8) {
> -#if 0
> - s += sq[pix[0]];
> - s += sq[pix[1]];
> - s += sq[pix[2]];
> - s += sq[pix[3]];
> - s += sq[pix[4]];
> - s += sq[pix[5]];
> - s += sq[pix[6]];
> - s += sq[pix[7]];
> -#else
> #if LONG_MAX > 2147483647
> register uint64_t x=*(uint64_t*)pix;
> s += sq[x&0xff];
> @@ -207,7 +197,6 @@ static int pix_norm1_c(uint8_t * pix, int line_size)
> s += sq[(x>>16)&0xff];
> s += sq[(x>>24)&0xff];
> #endif
> -#endif
This actually helps for documenting the completely and unnecessarily
obfuscated C code...
> @@ -819,27 +808,6 @@ static inline void avg_tpel_pixels_mc22_c(uint8_t *dst,
> const uint8_t *src, int
> dst += stride;
> }
> }
> -#if 0
> -#define TPEL_WIDTH(width)\
> -static void put_tpel_pixels ## width ## _mc00_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc00_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc10_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc10_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc20_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc20_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc01_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc01_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc11_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc11_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc21_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc21_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc02_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc02_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc12_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc12_c(dst, src, stride, width, height);}\
> -static void put_tpel_pixels ## width ## _mc22_c(uint8_t *dst, const uint8_t
> *src, int stride, int height){\
> - void put_tpel_pixels_mc22_c(dst, src, stride, width, height);}
> -#endif
>
> #define QPEL_MC(r, OPNAME, RND, OP) \
> static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int
> dstStride, int srcStride, int h){\
OK.
> diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
> index 1ffb1b7..047218f 100644
> --- a/libavcodec/x86/dsputil_mmx.c
> +++ b/libavcodec/x86/dsputil_mmx.c
> @@ -1665,10 +1665,6 @@ QPEL_2TAP(put_, 8, 3dnow)
> QPEL_2TAP(avg_, 8, 3dnow)
>
>
> -#if 0
> -static void just_return(void) { return; }
> -#endif
> -
> #if HAVE_YASM
> typedef void emu_edge_core_func (uint8_t *buf, const uint8_t *src,
> x86_reg linesize, x86_reg start_y,
> @@ -2951,39 +2947,4 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext
> *avctx)
>
> if (CONFIG_ENCODERS)
> dsputilenc_init_mmx(c, avctx);
> -
> -#if 0
> - // for speed testing
> - get_pixels = just_return;
> - put_pixels_clamped = just_return;
> - add_pixels_clamped = just_return;
> -
> - pix_abs16x16 = just_return;
> - pix_abs16x16_x2 = just_return;
> - pix_abs16x16_y2 = just_return;
> - pix_abs16x16_xy2 = just_return;
> -
> - put_pixels_tab[0] = just_return;
> - put_pixels_tab[1] = just_return;
> - put_pixels_tab[2] = just_return;
> - put_pixels_tab[3] = just_return;
> -
> - put_no_rnd_pixels_tab[0] = just_return;
> - put_no_rnd_pixels_tab[1] = just_return;
> - put_no_rnd_pixels_tab[2] = just_return;
> - put_no_rnd_pixels_tab[3] = just_return;
> -
> - avg_pixels_tab[0] = just_return;
> - avg_pixels_tab[1] = just_return;
> - avg_pixels_tab[2] = just_return;
> - avg_pixels_tab[3] = just_return;
> -
> - avg_no_rnd_pixels_tab[0] = just_return;
> - avg_no_rnd_pixels_tab[1] = just_return;
> - avg_no_rnd_pixels_tab[2] = just_return;
> - avg_no_rnd_pixels_tab[3] = just_return;
> -
> - //av_fdct = just_return;
> - //ff_idct = just_return;
> -#endif
> }
OK.
Ronald
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
