From 2ed008204d5467be03a0a3af1e293b2f7038d0a0 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 11 Feb 2013 17:04:27 -0800 Subject: h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These functions are mostly H264-specific (the only other user I can spot is bink), and this allows us to special-case some functionality for H264. Also remove the 16-bit-coeff with >8bpp versions (unused) and merge the duplicate 32-bit-coeff for >8bpp (identical). Signed-off-by: Martin Storsjö --- libavcodec/dsputil_template.c | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'libavcodec/dsputil_template.c') diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index 5244e20b84..ec7f9305ec 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -89,48 +89,6 @@ static void FUNCC(get_pixels ## suffix)(int16_t *restrict _block, \ } \ } \ \ -static void FUNCC(add_pixels8 ## suffix)(uint8_t *restrict _pixels, \ - int16_t *_block, \ - int line_size) \ -{ \ - int i; \ - pixel *restrict pixels = (pixel *restrict)_pixels; \ - dctcoef *block = (dctcoef*)_block; \ - line_size /= sizeof(pixel); \ - \ - for(i=0;i<8;i++) { \ - pixels[0] += block[0]; \ - pixels[1] += block[1]; \ - pixels[2] += block[2]; \ - pixels[3] += block[3]; \ - pixels[4] += block[4]; \ - pixels[5] += block[5]; \ - pixels[6] += block[6]; \ - pixels[7] += block[7]; \ - pixels += line_size; \ - block += 8; \ - } \ -} \ - \ -static void FUNCC(add_pixels4 ## suffix)(uint8_t *restrict _pixels, \ - int16_t *_block, \ - int line_size) \ -{ \ - int i; \ - pixel *restrict pixels = (pixel *restrict)_pixels; \ - dctcoef *block = (dctcoef*)_block; \ - line_size /= sizeof(pixel); \ - \ - for(i=0;i<4;i++) { \ - pixels[0] += block[0]; \ - pixels[1] += block[1]; \ - pixels[2] += block[2]; \ - pixels[3] += block[3]; \ - pixels += line_size; \ - block += 4; \ - } \ -} \ - \ static void FUNCC(clear_block ## suffix)(int16_t *block) \ { \ memset(block, 0, sizeof(dctcoef)*64); \ -- cgit v1.2.3