[FFmpeg-cvslog] Merge commit '2eb97af66af90ca3978229da151f0b8b3a5d9370'
Clément Bœsch
git at videolan.org
Mon Mar 20 20:07:52 EET 2017
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 19:04:12 2017 +0100| [c50b2164a6cd68b32df0cfacf63ceb6665326373] | committer: Clément Bœsch
Merge commit '2eb97af66af90ca3978229da151f0b8b3a5d9370'
* commit '2eb97af66af90ca3978229da151f0b8b3a5d9370':
checkasm: add a test for blockdsp
Merged-by: Clément Bœsch <u at pkh.me>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c50b2164a6cd68b32df0cfacf63ceb6665326373
---
tests/checkasm/Makefile | 1 +
tests/checkasm/blockdsp.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++
tests/checkasm/checkasm.c | 3 +++
tests/checkasm/checkasm.h | 1 +
4 files changed, 73 insertions(+)
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index f6b3806..06b22f3 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -1,5 +1,6 @@
# libavcodec tests
# subsystems
+AVCODECOBJS-$(CONFIG_BLOCKDSP) += blockdsp.o
AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
AVCODECOBJS-$(CONFIG_FLACDSP) += flacdsp.o
AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o
diff --git a/tests/checkasm/blockdsp.c b/tests/checkasm/blockdsp.c
new file mode 100644
index 0000000..153699b
--- /dev/null
+++ b/tests/checkasm/blockdsp.c
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2015 Henrik Gramner
+ *
+ * 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 "checkasm.h"
+
+#include "libavcodec/blockdsp.h"
+
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define randomize_buffers(size) \
+ do { \
+ int i; \
+ for (i = 0; i < size; i++) { \
+ uint16_t r = rnd(); \
+ AV_WN16A(buf0 + i, r); \
+ AV_WN16A(buf1 + i, r); \
+ } \
+ } while (0)
+
+#define check_clear(func, size) \
+do { \
+ if (check_func(h.func, "blockdsp." #func)) { \
+ declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *block); \
+ randomize_buffers(size); \
+ call_ref(buf0); \
+ call_new(buf1); \
+ if (memcmp(buf0, buf1, sizeof(*buf0) * size)) \
+ fail(); \
+ bench_new(buf0); \
+ } \
+} while (0)
+
+void checkasm_check_blockdsp(void)
+{
+ LOCAL_ALIGNED_16(uint16_t, buf0, [6 * 8 * 8]);
+ LOCAL_ALIGNED_16(uint16_t, buf1, [6 * 8 * 8]);
+
+ AVCodecContext avctx = { 0 };
+ BlockDSPContext h;
+
+ ff_blockdsp_init(&h, &avctx);
+
+ check_clear(clear_block, 8 * 8);
+ check_clear(clear_blocks, 8 * 8 * 6);
+
+ report("blockdsp");
+}
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index efbce32..abaaec7 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -68,6 +68,9 @@ static const struct {
#if CONFIG_ALAC_DECODER
{ "alacdsp", checkasm_check_alacdsp },
#endif
+ #if CONFIG_BLOCKDSP
+ { "blockdsp", checkasm_check_blockdsp },
+ #endif
#if CONFIG_BSWAPDSP
{ "bswapdsp", checkasm_check_bswapdsp },
#endif
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index a3db2a9..6a5c514 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -33,6 +33,7 @@
void checkasm_check_alacdsp(void);
void checkasm_check_blend(void);
+void checkasm_check_blockdsp(void);
void checkasm_check_bswapdsp(void);
void checkasm_check_colorspace(void);
void checkasm_check_flacdsp(void);
======================================================================
diff --cc tests/checkasm/Makefile
index f6b3806,7862633..06b22f3
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@@ -1,7 -1,7 +1,8 @@@
# libavcodec tests
# subsystems
+ AVCODECOBJS-$(CONFIG_BLOCKDSP) += blockdsp.o
AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
+AVCODECOBJS-$(CONFIG_FLACDSP) += flacdsp.o
AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o
AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o
AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o
diff --cc tests/checkasm/blockdsp.c
index 0000000,6b4bc80..153699b
mode 000000,100644..100644
--- a/tests/checkasm/blockdsp.c
+++ b/tests/checkasm/blockdsp.c
@@@ -1,0 -1,68 +1,68 @@@
+ /*
+ * Copyright (c) 2015 Henrik Gramner
+ *
- * 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 "checkasm.h"
+
+ #include "libavcodec/blockdsp.h"
+
+ #include "libavutil/common.h"
+ #include "libavutil/internal.h"
+ #include "libavutil/intreadwrite.h"
+
+ #define randomize_buffers(size) \
+ do { \
+ int i; \
+ for (i = 0; i < size; i++) { \
+ uint16_t r = rnd(); \
+ AV_WN16A(buf0 + i, r); \
+ AV_WN16A(buf1 + i, r); \
+ } \
+ } while (0)
+
+ #define check_clear(func, size) \
+ do { \
+ if (check_func(h.func, "blockdsp." #func)) { \
+ declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *block); \
+ randomize_buffers(size); \
+ call_ref(buf0); \
+ call_new(buf1); \
+ if (memcmp(buf0, buf1, sizeof(*buf0) * size)) \
+ fail(); \
+ bench_new(buf0); \
+ } \
+ } while (0)
+
+ void checkasm_check_blockdsp(void)
+ {
+ LOCAL_ALIGNED_16(uint16_t, buf0, [6 * 8 * 8]);
+ LOCAL_ALIGNED_16(uint16_t, buf1, [6 * 8 * 8]);
+
+ AVCodecContext avctx = { 0 };
+ BlockDSPContext h;
+
+ ff_blockdsp_init(&h, &avctx);
+
+ check_clear(clear_block, 8 * 8);
+ check_clear(clear_blocks, 8 * 8 * 6);
+
+ report("blockdsp");
+ }
diff --cc tests/checkasm/checkasm.c
index efbce32,525284a..abaaec7
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@@ -64,60 -64,40 +64,63 @@@ static const struct
const char *name;
void (*func)(void);
} tests[] = {
-#if CONFIG_BLOCKDSP
- { "blockdsp", checkasm_check_blockdsp },
+#if CONFIG_AVCODEC
+ #if CONFIG_ALAC_DECODER
+ { "alacdsp", checkasm_check_alacdsp },
+ #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_idct", checkasm_check_hevc_idct },
+ #endif
+ #if CONFIG_JPEG2000_DECODER
+ { "jpeg2000dsp", checkasm_check_jpeg2000dsp },
+ #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_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_mc", checkasm_check_hevc_mc },
- { "hevc_idct", checkasm_check_hevc_idct },
-#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 a3db2a9,c1141aa..6a5c514
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@@ -31,11 -31,9 +31,12 @@@
#include "libavutil/lfg.h"
#include "libavutil/timer.h"
+void checkasm_check_alacdsp(void);
+void checkasm_check_blend(void);
+ void checkasm_check_blockdsp(void);
void checkasm_check_bswapdsp(void);
-void checkasm_check_dcadsp(void);
+void checkasm_check_colorspace(void);
+void checkasm_check_flacdsp(void);
void checkasm_check_fmtconvert(void);
void checkasm_check_h264dsp(void);
void checkasm_check_h264pred(void);
More information about the ffmpeg-cvslog
mailing list