[FFmpeg-cvslog] Merge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'
Clément Bœsch
git at videolan.org
Fri Mar 24 13:40:22 EET 2017
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri Mar 24 12:37:09 2017 +0100| [3d4039f964e4814070e0f813d8e56d397bd70436] | committer: Clément Bœsch
Merge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'
* commit 'ed48a9d8143d2575a4458589cebde69ec326afd8':
checkasm: Add a test for HEVC add_residual
Merged-by: Clément Bœsch <u at pkh.me>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d4039f964e4814070e0f813d8e56d397bd70436
---
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(-)
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 94a1974..6c75388 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -17,7 +17,7 @@ AVCODECOBJS-$(CONFIG_ALAC_DECODER) += alacdsp.o
AVCODECOBJS-$(CONFIG_DCA_DECODER) += synth_filter.o
AVCODECOBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dsp.o
AVCODECOBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o
-AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_idct.o
+AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_idct.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 165bb00..e070c8d 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -96,6 +96,7 @@ static const struct {
{ "h264qpel", checkasm_check_h264qpel },
#endif
#if CONFIG_HEVC_DECODER
+ { "hevc_add_res", checkasm_check_hevc_add_res },
{ "hevc_idct", checkasm_check_hevc_idct },
#endif
#if CONFIG_JPEG2000_DECODER
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 0823666..f1d1f71 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -42,6 +42,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_jpeg2000dsp(void);
void checkasm_check_llviddsp(void);
diff --git a/tests/checkasm/hevc_add_res.c b/tests/checkasm/hevc_add_res.c
new file mode 100644
index 0000000..d2b5266
--- /dev/null
+++ b/tests/checkasm/hevc_add_res.c
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016 Alexandra Hájková
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <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 *res, 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");
+}
======================================================================
diff --cc tests/checkasm/Makefile
index 94a1974,dbd7393..6c75388
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@@ -8,16 -7,12 +8,16 @@@ AVCODECOBJS-$(CONFIG_FMTCONVERT
AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o
AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o
AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o
+AVCODECOBJS-$(CONFIG_LLVIDDSP) += llviddsp.o
AVCODECOBJS-$(CONFIG_VP8DSP) += vp8dsp.o
+AVCODECOBJS-$(CONFIG_VIDEODSP) += videodsp.o
# decoders/encoders
-AVCODECOBJS-$(CONFIG_DCA_DECODER) += dcadsp.o synth_filter.o
-AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_idct.o hevc_mc.o
+AVCODECOBJS-$(CONFIG_ALAC_DECODER) += alacdsp.o
+AVCODECOBJS-$(CONFIG_DCA_DECODER) += synth_filter.o
+AVCODECOBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dsp.o
+AVCODECOBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o
- AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_idct.o
++AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_idct.o
AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o
AVCODECOBJS-$(CONFIG_VP9_DECODER) += vp9dsp.o
diff --cc tests/checkasm/checkasm.c
index 165bb00,5f0d8fd..e070c8d
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@@ -64,69 -64,47 +64,70 @@@ static const struct
const char *name;
void (*func)(void);
} tests[] = {
-#if CONFIG_AUDIODSP
- { "audiodsp", checkasm_check_audiodsp },
+#if CONFIG_AVCODEC
+ #if CONFIG_ALAC_DECODER
+ { "alacdsp", checkasm_check_alacdsp },
+ #endif
+ #if CONFIG_AUDIODSP
+ { "audiodsp", checkasm_check_audiodsp },
+ #endif
+ #if CONFIG_BLOCKDSP
+ { "blockdsp", checkasm_check_blockdsp },
+ #endif
+ #if CONFIG_BSWAPDSP
+ { "bswapdsp", checkasm_check_bswapdsp },
+ #endif
+ #if CONFIG_DCA_DECODER
+ { "synth_filter", checkasm_check_synth_filter },
+ #endif
+ #if CONFIG_FLACDSP
+ { "flacdsp", checkasm_check_flacdsp },
+ #endif
+ #if CONFIG_FMTCONVERT
+ { "fmtconvert", checkasm_check_fmtconvert },
+ #endif
+ #if CONFIG_H264DSP
+ { "h264dsp", checkasm_check_h264dsp },
+ #endif
+ #if CONFIG_H264PRED
+ { "h264pred", checkasm_check_h264pred },
+ #endif
+ #if CONFIG_H264QPEL
+ { "h264qpel", checkasm_check_h264qpel },
+ #endif
+ #if CONFIG_HEVC_DECODER
++ { "hevc_add_res", checkasm_check_hevc_add_res },
+ { "hevc_idct", checkasm_check_hevc_idct },
+ #endif
+ #if CONFIG_JPEG2000_DECODER
+ { "jpeg2000dsp", checkasm_check_jpeg2000dsp },
+ #endif
+ #if CONFIG_HUFFYUVDSP
+ { "llviddsp", checkasm_check_llviddsp },
+ #endif
+ #if CONFIG_PIXBLOCKDSP
+ { "pixblockdsp", checkasm_check_pixblockdsp },
+ #endif
+ #if CONFIG_V210_ENCODER
+ { "v210enc", checkasm_check_v210enc },
+ #endif
+ #if CONFIG_VP8DSP
+ { "vp8dsp", checkasm_check_vp8dsp },
+ #endif
+ #if CONFIG_VP9_DECODER
+ { "vp9dsp", checkasm_check_vp9dsp },
+ #endif
+ #if CONFIG_VIDEODSP
+ { "videodsp", checkasm_check_videodsp },
+ #endif
#endif
-#if CONFIG_BLOCKDSP
- { "blockdsp", checkasm_check_blockdsp },
-#endif
-#if CONFIG_BSWAPDSP
- { "bswapdsp", checkasm_check_bswapdsp },
-#endif
-#if CONFIG_DCA_DECODER
- { "dcadsp", checkasm_check_dcadsp },
- { "synth_filter", checkasm_check_synth_filter },
-#endif
-#if CONFIG_FMTCONVERT
- { "fmtconvert", checkasm_check_fmtconvert },
-#endif
-#if CONFIG_H264DSP
- { "h264dsp", checkasm_check_h264dsp },
-#endif
-#if CONFIG_H264PRED
- { "h264pred", checkasm_check_h264pred },
-#endif
-#if CONFIG_H264QPEL
- { "h264qpel", checkasm_check_h264qpel },
-#endif
-#if CONFIG_HEVC_DECODER
- { "hevc_add_res", checkasm_check_hevc_add_res },
- { "hevc_idct", checkasm_check_hevc_idct },
- { "hevc_mc", checkasm_check_hevc_mc },
-#endif
-#if CONFIG_HUFFYUVDSP
- { "huffyuvdsp", checkasm_check_huffyuvdsp },
-#endif
-#if CONFIG_V210_ENCODER
- { "v210enc", checkasm_check_v210enc },
-#endif
-#if CONFIG_VP8DSP
- { "vp8dsp", checkasm_check_vp8dsp },
-#endif
-#if CONFIG_VP9_DECODER
- { "vp9dsp", checkasm_check_vp9dsp },
+#if CONFIG_AVFILTER
+ #if CONFIG_BLEND_FILTER
+ { "vf_blend", checkasm_check_blend },
+ #endif
+ #if CONFIG_COLORSPACE_FILTER
+ { "vf_colorspace", checkasm_check_colorspace },
+ #endif
#endif
{ NULL }
};
diff --cc tests/checkasm/checkasm.h
index 0823666,462c908..f1d1f71
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@@ -42,10 -39,10 +42,11 @@@ 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);
+void checkasm_check_jpeg2000dsp(void);
+void checkasm_check_llviddsp(void);
+void checkasm_check_pixblockdsp(void);
void checkasm_check_synth_filter(void);
void checkasm_check_v210enc(void);
void checkasm_check_vp8dsp(void);
diff --cc tests/checkasm/hevc_add_res.c
index 0000000,2cd97ea..d2b5266
mode 000000,100644..100644
--- a/tests/checkasm/hevc_add_res.c
+++ b/tests/checkasm/hevc_add_res.c
@@@ -1,0 -1,85 +1,85 @@@
+ /*
+ * Copyright (c) 2016 Alexandra Hájková
+ *
- * This file is part of Libav.
++ * This file is part of FFmpeg.
+ *
- * Libav is free software; you can redistribute it and/or modify
++ * FFmpeg 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,
++ * 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 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.,
++ * with FFmpeg; 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 *res, 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");
+ }
More information about the ffmpeg-cvslog
mailing list