diff options
Diffstat (limited to 'libavcodec/pixblockdsp.c')
| -rw-r--r-- | libavcodec/pixblockdsp.c | 57 |
1 files changed, 46 insertions, 11 deletions
diff --git a/libavcodec/pixblockdsp.c b/libavcodec/pixblockdsp.c index 71423f9cfc..f0883d3d08 100644 --- a/libavcodec/pixblockdsp.c +++ b/libavcodec/pixblockdsp.c @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -20,17 +20,44 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "pixblockdsp.h" -#define BIT_DEPTH 16 -#include "pixblockdsp_template.c" -#undef BIT_DEPTH +static void get_pixels_16_c(int16_t *av_restrict block, const uint8_t *pixels, + ptrdiff_t line_size) +{ + AV_COPY128U(block + 0 * 8, pixels + 0 * line_size); + AV_COPY128U(block + 1 * 8, pixels + 1 * line_size); + AV_COPY128U(block + 2 * 8, pixels + 2 * line_size); + AV_COPY128U(block + 3 * 8, pixels + 3 * line_size); + AV_COPY128U(block + 4 * 8, pixels + 4 * line_size); + AV_COPY128U(block + 5 * 8, pixels + 5 * line_size); + AV_COPY128U(block + 6 * 8, pixels + 6 * line_size); + AV_COPY128U(block + 7 * 8, pixels + 7 * line_size); +} + +static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels, + ptrdiff_t line_size) +{ + int i; -#define BIT_DEPTH 8 -#include "pixblockdsp_template.c" + /* read the pixels */ + for (i = 0; i < 8; i++) { + block[0] = pixels[0]; + block[1] = pixels[1]; + block[2] = pixels[2]; + block[3] = pixels[3]; + block[4] = pixels[4]; + block[5] = pixels[5]; + block[6] = pixels[6]; + block[7] = pixels[7]; + pixels += line_size; + block += 8; + } +} -static void diff_pixels_c(int16_t *restrict block, const uint8_t *s1, +static void diff_pixels_c(int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, int stride) { int i; @@ -60,17 +87,25 @@ av_cold void ff_pixblockdsp_init(PixblockDSPContext *c, AVCodecContext *avctx) switch (avctx->bits_per_raw_sample) { case 9: case 10: + case 12: + case 14: c->get_pixels = get_pixels_16_c; break; default: - c->get_pixels = get_pixels_8_c; + if (avctx->bits_per_raw_sample<=8 || avctx->codec_type != AVMEDIA_TYPE_VIDEO) { + c->get_pixels = get_pixels_8_c; + } break; } + if (ARCH_ALPHA) + ff_pixblockdsp_init_alpha(c, avctx, high_bit_depth); if (ARCH_ARM) ff_pixblockdsp_init_arm(c, avctx, high_bit_depth); if (ARCH_PPC) ff_pixblockdsp_init_ppc(c, avctx, high_bit_depth); if (ARCH_X86) ff_pixblockdsp_init_x86(c, avctx, high_bit_depth); + if (ARCH_MIPS) + ff_pixblockdsp_init_mips(c, avctx, high_bit_depth); } |