From baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 22 Jan 2013 11:27:57 -0800 Subject: [PATCH] dsputil: remove one array dimension from avg_no_rnd_pixels_tab. --- libavcodec/alpha/dsputil_alpha.c | 8 ++++---- libavcodec/arm/dsputil_init_neon.c | 8 ++++---- libavcodec/dsputil.c | 2 +- libavcodec/dsputil.h | 2 +- libavcodec/sh4/dsputil_align.c | 8 ++++---- libavcodec/sparc/dsputil_vis.c | 8 ++++---- libavcodec/vc1dec.c | 2 +- libavcodec/x86/dsputil_mmx.c | 22 +++++++++++----------- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c index 5e9196db46..696167471e 100644 --- a/libavcodec/alpha/dsputil_alpha.c +++ b/libavcodec/alpha/dsputil_alpha.c @@ -288,10 +288,10 @@ void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx) c->avg_pixels_tab[0][2] = avg_pixels16_y2_axp; c->avg_pixels_tab[0][3] = avg_pixels16_xy2_axp; - c->avg_no_rnd_pixels_tab[0][0] = avg_no_rnd_pixels16_axp; - c->avg_no_rnd_pixels_tab[0][1] = avg_no_rnd_pixels16_x2_axp; - c->avg_no_rnd_pixels_tab[0][2] = avg_no_rnd_pixels16_y2_axp; - c->avg_no_rnd_pixels_tab[0][3] = avg_no_rnd_pixels16_xy2_axp; + c->avg_no_rnd_pixels_tab[0] = avg_no_rnd_pixels16_axp; + c->avg_no_rnd_pixels_tab[1] = avg_no_rnd_pixels16_x2_axp; + c->avg_no_rnd_pixels_tab[2] = avg_no_rnd_pixels16_y2_axp; + c->avg_no_rnd_pixels_tab[3] = avg_no_rnd_pixels16_xy2_axp; c->put_pixels_tab[1][0] = put_pixels_axp_asm; c->put_pixels_tab[1][1] = put_pixels_x2_axp; diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index dee55e6091..4cd8f7d38e 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -196,10 +196,10 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) c->avg_pixels_tab[1][2] = ff_avg_pixels8_y2_neon; c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_neon; - c->avg_no_rnd_pixels_tab[0][0] = ff_avg_pixels16_neon; - c->avg_no_rnd_pixels_tab[0][1] = ff_avg_pixels16_x2_no_rnd_neon; - c->avg_no_rnd_pixels_tab[0][2] = ff_avg_pixels16_y2_no_rnd_neon; - c->avg_no_rnd_pixels_tab[0][3] = ff_avg_pixels16_xy2_no_rnd_neon; + c->avg_no_rnd_pixels_tab[0] = ff_avg_pixels16_neon; + c->avg_no_rnd_pixels_tab[1] = ff_avg_pixels16_x2_no_rnd_neon; + c->avg_no_rnd_pixels_tab[2] = ff_avg_pixels16_y2_no_rnd_neon; + c->avg_no_rnd_pixels_tab[3] = ff_avg_pixels16_xy2_no_rnd_neon; } c->add_pixels_clamped = ff_add_pixels_clamped_neon; diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index d98015dfbc..a049683e9e 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2705,7 +2705,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) hpel_funcs(avg, [1], 8); hpel_funcs(avg, [2], 4); hpel_funcs(avg, [3], 2); - hpel_funcs(avg_no_rnd,[0], 16); + hpel_funcs(avg_no_rnd,, 16); #undef FUNC #undef FUNCC diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f69196143c..96ee5887fc 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -288,7 +288,7 @@ typedef struct DSPContext { * @param line_size number of bytes in a horizontal line of block * @param h height */ - op_pixels_func avg_no_rnd_pixels_tab[1][4]; + op_pixels_func avg_no_rnd_pixels_tab[4]; /** * Thirdpel motion compensation with rounding (a+b+1)>>1. diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index a37c9ba0f1..9058e4f4ba 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -358,10 +358,10 @@ void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx) c->avg_pixels_tab[1][2] = avg_rnd_pixels8_y; c->avg_pixels_tab[1][3] = avg_rnd_pixels8_xy; - c->avg_no_rnd_pixels_tab[0][0] = avg_no_rnd_pixels16_o; - c->avg_no_rnd_pixels_tab[0][1] = avg_no_rnd_pixels16_x; - c->avg_no_rnd_pixels_tab[0][2] = avg_no_rnd_pixels16_y; - c->avg_no_rnd_pixels_tab[0][3] = avg_no_rnd_pixels16_xy; + c->avg_no_rnd_pixels_tab[0] = avg_no_rnd_pixels16_o; + c->avg_no_rnd_pixels_tab[1] = avg_no_rnd_pixels16_x; + c->avg_no_rnd_pixels_tab[2] = avg_no_rnd_pixels16_y; + c->avg_no_rnd_pixels_tab[3] = avg_no_rnd_pixels16_xy; } #ifdef QPEL diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index db2a6ae6ee..0822a5816b 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -3540,10 +3540,10 @@ void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx) c->put_no_rnd_pixels_tab[1][2] = MC_put_no_round_y_8_vis; c->put_no_rnd_pixels_tab[1][3] = MC_put_no_round_xy_8_vis; - c->avg_no_rnd_pixels_tab[0][0] = MC_avg_no_round_o_16_vis; - c->avg_no_rnd_pixels_tab[0][1] = MC_avg_no_round_x_16_vis; - c->avg_no_rnd_pixels_tab[0][2] = MC_avg_no_round_y_16_vis; - c->avg_no_rnd_pixels_tab[0][3] = MC_avg_no_round_xy_16_vis; + c->avg_no_rnd_pixels_tab[0] = MC_avg_no_round_o_16_vis; + c->avg_no_rnd_pixels_tab[1] = MC_avg_no_round_x_16_vis; + c->avg_no_rnd_pixels_tab[2] = MC_avg_no_round_y_16_vis; + c->avg_no_rnd_pixels_tab[3] = MC_avg_no_round_xy_16_vis; } } } diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6248125b79..a74e537f5a 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1949,7 +1949,7 @@ static void vc1_interp_mc(VC1Context *v) if (!v->rnd) dsp->avg_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); else - dsp->avg_no_rnd_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); + dsp->avg_no_rnd_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, 16); } if (s->flags & CODEC_FLAG_GRAY) return; diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index e4686212d1..2521b9f1cc 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1876,10 +1876,10 @@ void ff_vector_clip_int32_sse4 (int32_t *dst, const int32_t *src, #define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \ do { \ - c->PFX ## _pixels_tab[IDX][0] = PFX ## _pixels ## SIZE ## _ ## CPU; \ - c->PFX ## _pixels_tab[IDX][1] = PFX ## _pixels ## SIZE ## _x2_ ## CPU; \ - c->PFX ## _pixels_tab[IDX][2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \ - c->PFX ## _pixels_tab[IDX][3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \ + c->PFX ## _pixels_tab IDX [0] = PFX ## _pixels ## SIZE ## _ ## CPU; \ + c->PFX ## _pixels_tab IDX [1] = PFX ## _pixels ## SIZE ## _x2_ ## CPU; \ + c->PFX ## _pixels_tab IDX [2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \ + c->PFX ## _pixels_tab IDX [3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \ } while (0) #define H264_QPEL_FUNCS(x, y, CPU) \ @@ -1912,13 +1912,13 @@ static void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, int mm_flags) c->clear_blocks = clear_blocks_mmx; c->draw_edges = draw_edges_mmx; - SET_HPEL_FUNCS(put, 0, 16, mmx); - SET_HPEL_FUNCS(put_no_rnd, 0, 16, mmx); - SET_HPEL_FUNCS(avg, 0, 16, mmx); - SET_HPEL_FUNCS(avg_no_rnd, 0, 16, mmx); - SET_HPEL_FUNCS(put, 1, 8, mmx); - SET_HPEL_FUNCS(put_no_rnd, 1, 8, mmx); - SET_HPEL_FUNCS(avg, 1, 8, mmx); + SET_HPEL_FUNCS(put, [0], 16, mmx); + SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx); + SET_HPEL_FUNCS(avg, [0], 16, mmx); + SET_HPEL_FUNCS(avg_no_rnd, , 16, mmx); + SET_HPEL_FUNCS(put, [1], 8, mmx); + SET_HPEL_FUNCS(put_no_rnd, [1], 8, mmx); + SET_HPEL_FUNCS(avg, [1], 8, mmx); switch (avctx->idct_algo) { case FF_IDCT_AUTO: