Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'

Browse Source 
* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
  dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/28/head^2
Michael Niedermayer 12 years ago
parent f900fd5d31 baf35bb4bc
commit 1e7a92f219
8 changed files with 30 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libavcodec/alpha/dsputil_alpha.c
  2. 8
      libavcodec/arm/dsputil_init_neon.c
  3. 2
      libavcodec/dsputil.c
  4. 2
      libavcodec/dsputil.h
  5. 8
      libavcodec/sh4/dsputil_align.c
  6. 8
      libavcodec/sparc/dsputil_vis.c
  7. 2
      libavcodec/vc1dec.c
  8. 22
      libavcodec/x86/dsputil_mmx.c

8
libavcodec/alpha/dsputil_alpha.c
Unescape View File

@ -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;

8
libavcodec/arm/dsputil_init_neon.c
Unescape View File

@ -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;

2
libavcodec/dsputil.c
Unescape View File

@ -2885,7 +2885,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

2
libavcodec/dsputil.h
Unescape View File

@ -305,7 +305,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.

8
libavcodec/sh4/dsputil_align.c
Unescape View File

@ -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

8
libavcodec/sparc/dsputil_vis.c
Unescape View File

@ -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;
}
}
}

2
libavcodec/vc1dec.c
Unescape View File

@ -1967,7 +1967,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;

22
libavcodec/x86/dsputil_mmx.c
Unescape View File

@ -2017,10 +2017,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) \
@ -2053,13 +2053,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);
}
#if ARCH_X86_32 || !HAVE_YASM

Write Preview
Loading…
Cancel
Save