---
Applied all Henrik's and Diego's review comments:
fixed stride, and size sizes, consistent naming
tests/checkasm/Makefile | 2 +-
tests/checkasm/checkasm.c | 1 +
tests/checkasm/checkasm.h | 1 +
tests/checkasm/hevc_add_res.c | 85 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 88 insertions(+), 1 deletion(-)
create mode 100644 tests/checkasm/hevc_add_res.c
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 22cf3db..2250f65 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -12,7 +12,7 @@ AVCODECOBJS-$(CONFIG_VP8DSP) += vp8dsp.o
# decoders/encoders
AVCODECOBJS-$(CONFIG_DCA_DECODER) += dcadsp.o synth_filter.o
-AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_mc.o hevc_idct.o
+AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_mc.o hevc_idct.o hevc_add_res.o
AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o
AVCODECOBJS-$(CONFIG_VP9_DECODER) += vp9dsp.o
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 040c4eb..623bbce 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -90,6 +90,7 @@ static const struct {
{ "h264qpel", checkasm_check_h264qpel },
#endif
#if CONFIG_HEVC_DECODER
+ { "hevc_add_res", checkasm_check_hevc_add_res },
{ "hevc_mc", checkasm_check_hevc_mc },
{ "hevc_idct", checkasm_check_hevc_idct },
#endif
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 75aa457..462c908 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -39,6 +39,7 @@ void checkasm_check_fmtconvert(void);
void checkasm_check_h264dsp(void);
void checkasm_check_h264pred(void);
void checkasm_check_h264qpel(void);
+void checkasm_check_hevc_add_res(void);
void checkasm_check_hevc_idct(void);
void checkasm_check_hevc_mc(void);
void checkasm_check_huffyuvdsp(void);
diff --git a/tests/checkasm/hevc_add_res.c b/tests/checkasm/hevc_add_res.c
new file mode 100644
index 0000000..639e25e
--- /dev/null
+++ b/tests/checkasm/hevc_add_res.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016 Alexandra Hájková
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Libav 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <string.h>
+
+#include "libavutil/intreadwrite.h"
+
+#include "libavcodec/hevcdsp.h"
+
+#include "checkasm.h"
+
+#define randomize_buffers(buf, size) \
+ do { \
+ int j; \
+ for (j = 0; j < size; j++) { \
+ int16_t r = rnd(); \
+ AV_WN16A(buf + j, r >> 3); \
+ } \
+ } while (0)
+
+#define randomize_buffers2(buf, size) \
+ do { \
+ int j; \
+ for (j = 0; j < size; j++) \
+ AV_WN16A(buf + j * 2, rnd() & 0x3FF); \
+ } while (0)
+
+static void check_add_res(HEVCDSPContext h, int bit_depth)
+{
+ int i;
+ LOCAL_ALIGNED(32, int16_t, res0, [32 * 32]);
+ LOCAL_ALIGNED(32, int16_t, res1, [32 * 32]);
+ LOCAL_ALIGNED(32, uint8_t, dst0, [32 * 32 * 2]);
+ LOCAL_ALIGNED(32, uint8_t, dst1, [32 * 32 * 2]);
+
+ for (i = 2; i <= 5; i++) {
+ int block_size = 1 << i;
+ int size = block_size * block_size;
+ ptrdiff_t stride = block_size << (bit_depth > 8);
+ declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, int16_t
*coeffs, ptrdiff_t stride);
+
+ randomize_buffers(res0, size);
+ randomize_buffers2(dst0, size);
+ memcpy(res1, res0, sizeof(*res0) * size);
+ memcpy(dst1, dst0, size);
+
+ if (check_func(h.add_residual[i - 2], "add_res_%dx%d_%d", block_size,
block_size, bit_depth)) {
+ call_ref(dst0, res0, stride);
+ call_new(dst1, res1, stride);
+ if (memcmp(dst0, dst1, size))
+ fail();
+ bench_new(dst1, res1, stride);
+ }
+ }
+}
+
+void checkasm_check_hevc_add_res(void)
+{
+ int bit_depth;
+
+ for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
+ HEVCDSPContext h;
+
+ ff_hevc_dsp_init(&h, bit_depth);
+ check_add_res(h, bit_depth);
+ }
+ report("add_residual");
+}
--
2.1.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
