From ee20354b29eb570c31238d24d0cea50ab272f8fa Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 29 Sep 2015 18:34:28 -0700 Subject: [PATCH] pixblockdsp: Use AV_COPY128U for get_pixels_16_c Before: 15543 decicycles in get_pixels, 4193214 runs, 1090 skips After: 5713 decicycles in get_pixels, 8387564 runs, 1044 skips --- libavcodec/pixblockdsp.c | 37 ++++++++++++++++++++++++---- libavcodec/pixblockdsp_template.c | 40 ------------------------------- 2 files changed, 32 insertions(+), 45 deletions(-) delete mode 100644 libavcodec/pixblockdsp_template.c diff --git a/libavcodec/pixblockdsp.c b/libavcodec/pixblockdsp.c index 322e1dd1110..f0883d3d084 100644 --- a/libavcodec/pixblockdsp.c +++ b/libavcodec/pixblockdsp.c @@ -20,15 +20,42 @@ #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 *av_restrict block, const uint8_t *s1, const uint8_t *s2, int stride) diff --git a/libavcodec/pixblockdsp_template.c b/libavcodec/pixblockdsp_template.c deleted file mode 100644 index d1e91022a70..00000000000 --- a/libavcodec/pixblockdsp_template.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * 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. - * - * 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 FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "bit_depth_template.c" - -static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels, - ptrdiff_t line_size) -{ - const pixel *pixels = (const pixel *) _pixels; - int i; - - /* 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 / sizeof(pixel); - block += 8; - } -} -- 2.39.5