diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-02-11 17:04:27 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 02:14:16 +0100 |
| commit | 7ff1a4b10f2d7f9a4ae1c72e1259b4ed7d13e316 (patch) | |
| tree | dafa300b66ea1b51f466f2531b15c1a3c5ca5b1c /libavcodec/dsputil_template.c | |
| parent | 5260edee7e5bd975837696c8c8c1a80eb2fbd7c1 (diff) | |
| download | ffmpeg-7ff1a4b10f2d7f9a4ae1c72e1259b4ed7d13e316.tar.gz | |
Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil.
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil_template.c')
| -rw-r--r-- | libavcodec/dsputil_template.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/libavcodec/dsputil_template.c b/libavcodec/dsputil_template.c index e174e5ff6e..8517ded4ee 100644 --- a/libavcodec/dsputil_template.c +++ b/libavcodec/dsputil_template.c @@ -89,48 +89,6 @@ static void FUNCC(get_pixels ## suffix)(int16_t *av_restrict _block, \ } \ } \ \ -static void FUNCC(add_pixels8 ## suffix)(uint8_t *av_restrict _pixels, \ - int16_t *_block, \ - int line_size) \ -{ \ - int i; \ - pixel *av_restrict pixels = (pixel *av_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 *av_restrict _pixels, \ - int16_t *_block, \ - int line_size) \ -{ \ - int i; \ - pixel *av_restrict pixels = (pixel *av_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); \ |