From d2db0f3bbdc81aae2c316751daf1d53b42a3e6a0 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Mon, 16 Sep 2002 21:49:34 +0000 Subject: - sync ffmpeg to cvs (sorry Mike it still doesn't decode your teststream -- something must be broken at ffmpeg, also happens with mplayer) - added priority sorted lists, now autoprobing should work again. - fixed infinite loop in plugin loader. obs: latest ffmpeg contains ppc optimizations, someone will have to enable these though. CVS patchset: 2676 CVS date: 2002/09/16 21:49:34 --- src/libffmpeg/libavcodec/alpha/dsputil_alpha.c | 93 ++++++++++++++++++-------- 1 file changed, 64 insertions(+), 29 deletions(-) (limited to 'src/libffmpeg/libavcodec/alpha/dsputil_alpha.c') diff --git a/src/libffmpeg/libavcodec/alpha/dsputil_alpha.c b/src/libffmpeg/libavcodec/alpha/dsputil_alpha.c index 7ed015521..fef86fe64 100644 --- a/src/libffmpeg/libavcodec/alpha/dsputil_alpha.c +++ b/src/libffmpeg/libavcodec/alpha/dsputil_alpha.c @@ -224,16 +224,24 @@ static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4) } while (--h); \ } while (0) -#define MAKE_OP(OPNAME, SUFF, OPKIND, STORE) \ -static void OPNAME ## _pixels ## SUFF ## _axp \ - (uint8_t *restrict block, const uint8_t *restrict pixels, \ - int line_size, int h) \ -{ \ - if ((size_t) pixels & 0x7) { \ - OPKIND(uldq, STORE); \ - } else { \ - OPKIND(ldq, STORE); \ - } \ +#define MAKE_OP(OPNAME, SUFF, OPKIND, STORE) \ +static void OPNAME ## _pixels ## SUFF ## _axp \ + (uint8_t *restrict block, const uint8_t *restrict pixels, \ + int line_size, int h) \ +{ \ + if ((size_t) pixels & 0x7) { \ + OPKIND(uldq, STORE); \ + } else { \ + OPKIND(ldq, STORE); \ + } \ +} \ + \ +static void OPNAME ## _pixels16 ## SUFF ## _axp \ + (uint8_t *restrict block, const uint8_t *restrict pixels, \ + int line_size, int h) \ +{ \ + OPNAME ## _pixels ## SUFF ## _axp(block, pixels, line_size, h); \ + OPNAME ## _pixels ## SUFF ## _axp(block + 8, pixels + 8, line_size, h); \ } #define PIXOP(OPNAME, STORE) \ @@ -268,27 +276,54 @@ PIXOP(put_no_rnd, STORE); #define STORE(l, b) stq(AVG2(l, ldq(b)), b); PIXOP(avg_no_rnd, STORE); +void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels, + int line_size, int h) +{ + put_pixels_axp_asm(block, pixels, line_size, h); + put_pixels_axp_asm(block + 8, pixels + 8, line_size, h); +} + void dsputil_init_alpha(void) { - put_pixels_tab[0] = put_pixels_axp_asm; - put_pixels_tab[1] = put_pixels_x2_axp; - put_pixels_tab[2] = put_pixels_y2_axp; - put_pixels_tab[3] = put_pixels_xy2_axp; - - put_no_rnd_pixels_tab[0] = put_pixels_axp_asm; - put_no_rnd_pixels_tab[1] = put_no_rnd_pixels_x2_axp; - put_no_rnd_pixels_tab[2] = put_no_rnd_pixels_y2_axp; - put_no_rnd_pixels_tab[3] = put_no_rnd_pixels_xy2_axp; - - avg_pixels_tab[0] = avg_pixels_axp; - avg_pixels_tab[1] = avg_pixels_x2_axp; - avg_pixels_tab[2] = avg_pixels_y2_axp; - avg_pixels_tab[3] = avg_pixels_xy2_axp; - - avg_no_rnd_pixels_tab[0] = avg_no_rnd_pixels_axp; - avg_no_rnd_pixels_tab[1] = avg_no_rnd_pixels_x2_axp; - avg_no_rnd_pixels_tab[2] = avg_no_rnd_pixels_y2_axp; - avg_no_rnd_pixels_tab[3] = avg_no_rnd_pixels_xy2_axp; + put_pixels_tab[0][0] = put_pixels16_axp_asm; + put_pixels_tab[0][1] = put_pixels16_x2_axp; + put_pixels_tab[0][2] = put_pixels16_y2_axp; + put_pixels_tab[0][3] = put_pixels16_xy2_axp; + + put_no_rnd_pixels_tab[0][0] = put_pixels16_axp_asm; + put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_axp; + put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_axp; + put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_axp; + + avg_pixels_tab[0][0] = avg_pixels16_axp; + avg_pixels_tab[0][1] = avg_pixels16_x2_axp; + avg_pixels_tab[0][2] = avg_pixels16_y2_axp; + avg_pixels_tab[0][3] = avg_pixels16_xy2_axp; + + avg_no_rnd_pixels_tab[0][0] = avg_no_rnd_pixels16_axp; + avg_no_rnd_pixels_tab[0][1] = avg_no_rnd_pixels16_x2_axp; + avg_no_rnd_pixels_tab[0][2] = avg_no_rnd_pixels16_y2_axp; + avg_no_rnd_pixels_tab[0][3] = avg_no_rnd_pixels16_xy2_axp; + + put_pixels_tab[1][0] = put_pixels_axp_asm; + put_pixels_tab[1][1] = put_pixels_x2_axp; + put_pixels_tab[1][2] = put_pixels_y2_axp; + put_pixels_tab[1][3] = put_pixels_xy2_axp; + + put_no_rnd_pixels_tab[1][0] = put_pixels_axp_asm; + put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels_x2_axp; + put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels_y2_axp; + put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels_xy2_axp; + + avg_pixels_tab[1][0] = avg_pixels_axp; + avg_pixels_tab[1][1] = avg_pixels_x2_axp; + avg_pixels_tab[1][2] = avg_pixels_y2_axp; + avg_pixels_tab[1][3] = avg_pixels_xy2_axp; + + avg_no_rnd_pixels_tab[1][0] = avg_no_rnd_pixels_axp; + avg_no_rnd_pixels_tab[1][1] = avg_no_rnd_pixels_x2_axp; + avg_no_rnd_pixels_tab[1][2] = avg_no_rnd_pixels_y2_axp; + avg_no_rnd_pixels_tab[1][3] = avg_no_rnd_pixels_xy2_axp; clear_blocks = clear_blocks_axp; -- cgit v1.2.3