summaryrefslogtreecommitdiffstats
path: root/tests/checkasm
diff options
context:
space:
mode:
Diffstat (limited to 'tests/checkasm')
-rw-r--r--tests/checkasm/Makefile21
-rw-r--r--tests/checkasm/aarch64/checkasm.S6
-rw-r--r--tests/checkasm/alacdsp.c119
-rw-r--r--tests/checkasm/arm/checkasm.S6
-rw-r--r--tests/checkasm/audiodsp.c8
-rw-r--r--tests/checkasm/blockdsp.c8
-rw-r--r--tests/checkasm/bswapdsp.c8
-rw-r--r--tests/checkasm/checkasm.c115
-rw-r--r--tests/checkasm/checkasm.h19
-rw-r--r--tests/checkasm/dcadsp.c92
-rw-r--r--tests/checkasm/flacdsp.c90
-rw-r--r--tests/checkasm/fmtconvert.c8
-rw-r--r--tests/checkasm/h264dsp.c8
-rw-r--r--tests/checkasm/h264pred.c8
-rw-r--r--tests/checkasm/h264qpel.c8
-rw-r--r--tests/checkasm/hevc_idct.c8
-rw-r--r--tests/checkasm/hevc_mc.c328
-rw-r--r--tests/checkasm/jpeg2000dsp.c71
-rw-r--r--tests/checkasm/llviddsp.c (renamed from tests/checkasm/huffyuvdsp.c)20
-rw-r--r--tests/checkasm/pixblockdsp.c107
-rw-r--r--tests/checkasm/synth_filter.c8
-rw-r--r--tests/checkasm/v210enc.c8
-rw-r--r--tests/checkasm/vf_blend.c130
-rw-r--r--tests/checkasm/vf_colorspace.c314
-rw-r--r--tests/checkasm/videodsp.c89
-rw-r--r--tests/checkasm/vp8dsp.c8
-rw-r--r--tests/checkasm/vp9dsp.c609
-rw-r--r--tests/checkasm/x86/checkasm.asm6
28 files changed, 1559 insertions, 671 deletions
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 22cf3db..94a1974 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -3,21 +3,32 @@
AVCODECOBJS-$(CONFIG_AUDIODSP) += audiodsp.o
AVCODECOBJS-$(CONFIG_BLOCKDSP) += blockdsp.o
AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o
+AVCODECOBJS-$(CONFIG_FLACDSP) += flacdsp.o
AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o
-AVCODECOBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o
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_mc.o hevc_idct.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_V210_ENCODER) += v210enc.o
AVCODECOBJS-$(CONFIG_VP9_DECODER) += vp9dsp.o
CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes)
+# libavfilter tests
+AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
+AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o
+
+CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
+
CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o
CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o
@@ -32,6 +43,8 @@ CHECKASMDIRS := $(sort $(dir $(CHECKASMOBJS)))
$(CHECKASMOBJS): | $(CHECKASMDIRS)
OBJDIRS += $(CHECKASMDIRS)
+tests/checkasm/checkasm.o: CFLAGS += -Umain
+
CHECKASM := tests/checkasm/checkasm$(EXESUF)
$(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
@@ -39,7 +52,7 @@ $(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
checkasm: $(CHECKASM)
-clean:: checkasmclean
+testclean:: checkasmclean
checkasmclean:
$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%)
diff --git a/tests/checkasm/aarch64/checkasm.S b/tests/checkasm/aarch64/checkasm.S
index bc5ed9e..53a2a47 100644
--- a/tests/checkasm/aarch64/checkasm.S
+++ b/tests/checkasm/aarch64/checkasm.S
@@ -3,14 +3,14 @@
* Copyright (c) 2015 Martin Storsjo
* Copyright (c) 2015 Janne Grunau
*
- * 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.
diff --git a/tests/checkasm/alacdsp.c b/tests/checkasm/alacdsp.c
new file mode 100644
index 0000000..cbf03f8
--- /dev/null
+++ b/tests/checkasm/alacdsp.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * 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/alacdsp.h"
+#include "libavcodec/mathops.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+
+#define BUF_SIZE 256
+#define MAX_CHANNELS 2
+
+#define randomize_buffers() \
+ do { \
+ int i; \
+ for (i = 0; i < BUF_SIZE*MAX_CHANNELS; i++) { \
+ int32_t r = sign_extend(rnd(), 24); \
+ ref_buf[i] = r; \
+ new_buf[i] = r; \
+ } \
+ } while (0)
+
+static void check_decorrelate_stereo(void)
+{
+ LOCAL_ALIGNED_16(int32_t, ref_buf, [BUF_SIZE*MAX_CHANNELS]);
+ LOCAL_ALIGNED_16(int32_t, new_buf, [BUF_SIZE*MAX_CHANNELS]);
+ int32_t *ref[2] = { &ref_buf[BUF_SIZE*0], &ref_buf[BUF_SIZE*1] };
+ int32_t *new[2] = { &new_buf[BUF_SIZE*0], &new_buf[BUF_SIZE*1] };
+ ALACDSPContext c;
+
+ ff_alacdsp_init(&c);
+ if (check_func(c.decorrelate_stereo, "alac_decorrelate_stereo")) {
+ int len = (rnd() & 0xFF) + 1;
+ int shift = rnd() & 0x1F;
+ int weight = rnd() & 0xFF;
+ declare_func(void, int32_t *buf[2], int len, int shift, int weight);
+
+ randomize_buffers();
+ call_ref(ref, len, shift, weight);
+ call_new(new, len, shift, weight);
+ if (memcmp(ref[0], new[0], len * sizeof(int32_t)) ||
+ memcmp(ref[1], new[1], len * sizeof(int32_t)))
+ fail();
+ bench_new(new, BUF_SIZE, shift, weight);
+ }
+
+ report("decorrelate_stereo");
+}
+
+#undef randomize_buffers
+#define randomize_buffers() \
+ do { \
+ int i, j; \
+ for (i = 0; i < BUF_SIZE; i++) { \
+ for (j = 0; j < ch; j++) { \
+ int32_t r = sign_extend(rnd(), 24); \
+ ref[j][i] = r; \
+ new[j][i] = r; \
+ r = rnd() & 0xFF; \
+ ref_ebb[j][i] = r; \
+ new_ebb[j][i] = r; \
+ } \
+ } \
+ } while (0)
+
+static void check_append_extra_bits(void)
+{
+ LOCAL_ALIGNED_16(int32_t, ref_buf, [BUF_SIZE*MAX_CHANNELS*2]);
+ LOCAL_ALIGNED_16(int32_t, new_buf, [BUF_SIZE*MAX_CHANNELS*2]);
+ int32_t *ref[2] = { &ref_buf[BUF_SIZE*0], &ref_buf[BUF_SIZE*1] };
+ int32_t *new[2] = { &new_buf[BUF_SIZE*0], &new_buf[BUF_SIZE*1] };
+ int32_t *ref_ebb[2] = { &ref_buf[BUF_SIZE*2], &ref_buf[BUF_SIZE*3] };
+ int32_t *new_ebb[2] = { &new_buf[BUF_SIZE*2], &new_buf[BUF_SIZE*3] };
+ ALACDSPContext c;
+ static const char * const channels[2] = { "mono", "stereo" };
+ int ch;
+
+ ff_alacdsp_init(&c);
+ for (ch = 1; ch <= 2; ch++) {
+ if (check_func(c.append_extra_bits[ch-1], "alac_append_extra_bits_%s", channels[ch-1])) {
+ int len = (rnd() & 0xFF) + 1;
+ declare_func(void, int32_t *buf[2], int32_t *ebb[2], int ebits, int ch, int len);
+
+ randomize_buffers();
+ call_ref(ref, ref_ebb, 8, ch, len);
+ call_new(new, new_ebb, 8, ch, len);
+ if ( memcmp(ref[0], new[0], len * sizeof(int32_t)) ||
+ (ch == 2 && memcmp(ref[1], new[1], len * sizeof(int32_t))))
+ fail();
+ bench_new(new, new_ebb, 8, ch, BUF_SIZE);
+ }
+ }
+
+ report("append_extra_bits");
+}
+
+void checkasm_check_alacdsp(void)
+{
+ check_decorrelate_stereo();
+ check_append_extra_bits();
+}
diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S
index 237252f..2051b29 100644
--- a/tests/checkasm/arm/checkasm.S
+++ b/tests/checkasm/arm/checkasm.S
@@ -3,14 +3,14 @@
* Copyright (c) 2015 Martin Storsjo
* Copyright (c) 2015 Janne Grunau
*
- * 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.
diff --git a/tests/checkasm/audiodsp.c b/tests/checkasm/audiodsp.c
index 40fa384..7c4e16e 100644
--- a/tests/checkasm/audiodsp.c
+++ b/tests/checkasm/audiodsp.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 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.
*/
diff --git a/tests/checkasm/blockdsp.c b/tests/checkasm/blockdsp.c
index 6b4bc80..153699b 100644
--- a/tests/checkasm/blockdsp.c
+++ b/tests/checkasm/blockdsp.c
@@ -1,20 +1,20 @@
/*
* 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.
*/
diff --git a/tests/checkasm/bswapdsp.c b/tests/checkasm/bswapdsp.c
index 829ebaa..5f75550 100644
--- a/tests/checkasm/bswapdsp.c
+++ b/tests/checkasm/bswapdsp.c
@@ -1,20 +1,20 @@
/*
* 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.
*/
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 040c4eb..165bb00 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -3,20 +3,20 @@
* Copyright (c) 2015 Henrik Gramner
* Copyright (c) 2008 Loren Merritt
*
- * 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.
*/
@@ -64,46 +64,69 @@ 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_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_mc", checkasm_check_hevc_mc },
- { "hevc_idct", checkasm_check_hevc_idct },
-#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 }
};
@@ -140,6 +163,7 @@ static const struct {
{ "SSSE3", "ssse3", AV_CPU_FLAG_SSSE3|AV_CPU_FLAG_ATOM },
{ "SSE4.1", "sse4", AV_CPU_FLAG_SSE4 },
{ "SSE4.2", "sse42", AV_CPU_FLAG_SSE42 },
+ { "AES-NI", "aesni", AV_CPU_FLAG_AESNI },
{ "AVX", "avx", AV_CPU_FLAG_AVX },
{ "XOP", "xop", AV_CPU_FLAG_XOP },
{ "FMA3", "fma3", AV_CPU_FLAG_FMA3 },
@@ -461,8 +485,9 @@ static void check_cpu_flag(const char *name, int flag)
int old_cpu_flag = state.cpu_flag;
flag |= old_cpu_flag;
- av_set_cpu_flags_mask(flag);
- state.cpu_flag = av_get_cpu_flags();
+ av_force_cpu_flags(-1);
+ state.cpu_flag = flag & av_get_cpu_flags();
+ av_force_cpu_flags(state.cpu_flag);
if (!flag || state.cpu_flag != old_cpu_flag) {
int i;
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 75aa457..0823666 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -3,20 +3,20 @@
* Copyright (c) 2015 Henrik Gramner
* Copyright (c) 2008 Loren Merritt
*
- * 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.
*/
@@ -31,21 +31,26 @@
#include "libavutil/lfg.h"
#include "libavutil/timer.h"
+void checkasm_check_alacdsp(void);
void checkasm_check_audiodsp(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);
void checkasm_check_h264qpel(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);
void checkasm_check_vp9dsp(void);
+void checkasm_check_videodsp(void);
void *checkasm_check_func(void *func, const char *name, ...) av_printf_format(2, 3);
int checkasm_bench_func(void);
diff --git a/tests/checkasm/dcadsp.c b/tests/checkasm/dcadsp.c
deleted file mode 100644
index 7251362..0000000
--- a/tests/checkasm/dcadsp.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2015 Janne Grunau
- *
- * 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 <math.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "libavutil/internal.h"
-#include "libavutil/intfloat.h"
-#include "libavcodec/dca.h"
-#include "libavcodec/dcadsp.h"
-#include "libavcodec/dcadata.h"
-
-#include "checkasm.h"
-
-#define randomize_lfe_fir(size) \
- do { \
- int i; \
- for (i = 0; i < size; i++) { \
- float f = (float)rnd() / (UINT_MAX >> 1) - 1.0f; \
- in[i] = f; \
- } \
- for (i = 0; i < 256; i++) { \
- float f = (float)rnd() / (UINT_MAX >> 1) - 1.0f; \
- coeffs[i] = f; \
- } \
- } while (0)
-
-#define check_lfe_fir(decifactor, eps) \
- do { \
- LOCAL_ALIGNED_16(float, in, [256 / decifactor]); \
- LOCAL_ALIGNED_16(float, out0, [decifactor * 2]); \
- LOCAL_ALIGNED_16(float, out1, [decifactor * 2]); \
- LOCAL_ALIGNED_16(float, coeffs, [256]); \
- int i; \
- const float * in_ptr = in + (256 / decifactor) - 1; \
- declare_func(void, float *out, const float *in, const float *coeffs); \
- /* repeat the test several times */ \
- for (i = 0; i < 32; i++) { \
- int j; \
- memset(out0, 0, sizeof(*out0) * 2 * decifactor); \
- memset(out1, 0xFF, sizeof(*out1) * 2 * decifactor); \
- randomize_lfe_fir(256 / decifactor); \
- call_ref(out0, in_ptr, coeffs); \
- call_new(out1, in_ptr, coeffs); \
- for (j = 0; j < 2 * decifactor; j++) { \
- if (!float_near_abs_eps(out0[j], out1[j], eps)) { \
- if (0) { \
- union av_intfloat32 x, y; x.f = out0[j]; y.f = out1[j]; \
- fprintf(stderr, "%3d: %11g (0x%08x); %11g (0x%08x)\n", \
- j, x.f, x.i, y.f, y.i); \
- } \
- fail(); \
- break; \
- } \
- } \
- bench_new(out1, in_ptr, coeffs); \
- } \
- } while (0)
-
-void checkasm_check_dcadsp(void)
-{
- DCADSPContext c;
-
- ff_dcadsp_init(&c);
-
- /* values are limited to {-8, 8} so absolute epsilon is good enough */
- if (check_func(c.lfe_fir[0], "dca_lfe_fir0"))
- check_lfe_fir(32, 1.0e-6f);
-
- if (check_func(c.lfe_fir[1], "dca_lfe_fir1"))
- check_lfe_fir(64, 1.0e-6f);
-
- report("dcadsp");
-}
diff --git a/tests/checkasm/flacdsp.c b/tests/checkasm/flacdsp.c
new file mode 100644
index 0000000..dccb54d
--- /dev/null
+++ b/tests/checkasm/flacdsp.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * 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/flacdsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define BUF_SIZE 256
+#define MAX_CHANNELS 8
+
+#define randomize_buffers() \
+ do { \
+ int i, j; \
+ for (i = 0; i < BUF_SIZE; i += 4) { \
+ for (j = 0; j < channels; j++) { \
+ uint32_t r = rnd() & (1 << (bits - 2)) - 1; \
+ AV_WN32A(ref_src[j] + i, r); \
+ AV_WN32A(new_src[j] + i, r); \
+ } \
+ } \
+ } while (0)
+
+static void check_decorrelate(uint8_t **ref_dst, uint8_t **ref_src, uint8_t **new_dst, uint8_t **new_src,
+ int channels, int bits) {
+ declare_func(void, uint8_t **out, int32_t **in, int channels, int len, int shift);
+
+ randomize_buffers();
+ call_ref(ref_dst, (int32_t **)ref_src, channels, BUF_SIZE / sizeof(int32_t), 8);
+ call_new(new_dst, (int32_t **)new_src, channels, BUF_SIZE / sizeof(int32_t), 8);
+ if (memcmp(*ref_dst, *new_dst, bits == 16 ? BUF_SIZE * (channels/2) : BUF_SIZE * channels) ||
+ memcmp(*ref_src, *new_src, BUF_SIZE * channels))
+ fail();
+ bench_new(new_dst, (int32_t **)new_src, channels, BUF_SIZE / sizeof(int32_t), 8);
+}
+
+void checkasm_check_flacdsp(void)
+{
+ LOCAL_ALIGNED_16(uint8_t, ref_dst, [BUF_SIZE*MAX_CHANNELS]);
+ LOCAL_ALIGNED_16(uint8_t, ref_buf, [BUF_SIZE*MAX_CHANNELS]);
+ LOCAL_ALIGNED_16(uint8_t, new_dst, [BUF_SIZE*MAX_CHANNELS]);
+ LOCAL_ALIGNED_16(uint8_t, new_buf, [BUF_SIZE*MAX_CHANNELS]);
+ uint8_t *ref_src[] = { &ref_buf[BUF_SIZE*0], &ref_buf[BUF_SIZE*1], &ref_buf[BUF_SIZE*2], &ref_buf[BUF_SIZE*3],
+ &ref_buf[BUF_SIZE*4], &ref_buf[BUF_SIZE*5], &ref_buf[BUF_SIZE*6], &ref_buf[BUF_SIZE*7] };
+ uint8_t *new_src[] = { &new_buf[BUF_SIZE*0], &new_buf[BUF_SIZE*1], &new_buf[BUF_SIZE*2], &new_buf[BUF_SIZE*3],
+ &new_buf[BUF_SIZE*4], &new_buf[BUF_SIZE*5], &new_buf[BUF_SIZE*6], &new_buf[BUF_SIZE*7] };
+ static const char * const names[3] = { "ls", "rs", "ms" };
+ static const struct {
+ enum AVSampleFormat fmt;
+ int bits;
+ } fmts[] = {
+ { AV_SAMPLE_FMT_S16, 16 },
+ { AV_SAMPLE_FMT_S32, 32 },
+ };
+ FLACDSPContext h;
+ int i, j;
+
+ for (i = 0; i < 2; i++) {
+ ff_flacdsp_init(&h, fmts[i].fmt, 2, 0);
+ for (j = 0; j < 3; j++)
+ if (check_func(h.decorrelate[j], "flac_decorrelate_%s_%d", names[j], fmts[i].bits))
+ check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, 2, fmts[i].bits);
+ for (j = 2; j <= MAX_CHANNELS; j += 2) {
+ ff_flacdsp_init(&h, fmts[i].fmt, j, 0);
+ if (check_func(h.decorrelate[0], "flac_decorrelate_indep%d_%d", j, fmts[i].bits))
+ check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, j, fmts[i].bits);
+ }
+ }
+
+ report("decorrelate");
+}
diff --git a/tests/checkasm/fmtconvert.c b/tests/checkasm/fmtconvert.c
index 1a843b0..50ad3ca 100644
--- a/tests/checkasm/fmtconvert.c
+++ b/tests/checkasm/fmtconvert.c
@@ -1,20 +1,20 @@
/*
* Copyright (c) 2015 Janne Grunau
*
- * 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.
*/
diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c
index c9ddd52..9454237 100644
--- a/tests/checkasm/h264dsp.c
+++ b/tests/checkasm/h264dsp.c
@@ -1,20 +1,20 @@
/*
* Copyright (c) 2016 Martin Storsjo
*
- * 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.
*/
diff --git a/tests/checkasm/h264pred.c b/tests/checkasm/h264pred.c
index 4994947..59dcb2f 100644
--- a/tests/checkasm/h264pred.c
+++ b/tests/checkasm/h264pred.c
@@ -1,20 +1,20 @@
/*
* 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.
*/
diff --git a/tests/checkasm/h264qpel.c b/tests/checkasm/h264qpel.c
index d92f223..ba069f1 100644
--- a/tests/checkasm/h264qpel.c
+++ b/tests/checkasm/h264qpel.c
@@ -1,20 +1,20 @@
/*
* 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.
*/
diff --git a/tests/checkasm/hevc_idct.c b/tests/checkasm/hevc_idct.c
index dd4dc0d..eea7121 100644
--- a/tests/checkasm/hevc_idct.c
+++ b/tests/checkasm/hevc_idct.c
@@ -1,20 +1,20 @@
/*
* 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.
*/
diff --git a/tests/checkasm/hevc_mc.c b/tests/checkasm/hevc_mc.c
deleted file mode 100644
index 70f35ce..0000000
--- a/tests/checkasm/hevc_mc.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) 2015 Anton Khirnov
- *
- * 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 "checkasm.h"
-
-#include "libavcodec/avcodec.h"
-#include "libavcodec/hevcdsp.h"
-
-#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
-
-// max PU size + interpolation stencil
-#define BUF_SIZE (FFALIGN(64 + 7, 16) * (64 + 7) * 2)
-
-#define PIXEL_SIZE(depth) ((depth + 7) / 8)
-
-#define randomize_buffers(buf, size, depth) \
- do { \
- uint32_t mask = pixel_mask[depth - 8]; \
- int i; \
- for (i = 0; i < size; i += 4) { \
- uint32_t r = rnd() & mask; \
- AV_WN32A(buf + i, r); \
- } \
- } while (0)
-
-static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
-
-static const int pred_heights[][7] = {
- [2] = { 8, 4, 2, 0 },
- [4] = { 16, 8, 4, 2, 0 },
- [6] = { 8, 0 },
- [8] = { 32, 16, 8, 4, 2, 0 },
- [12] = { 16, 0 },
- [16] = { 64, 32, 16, 12, 8, 4, 0 },
- [24] = { 32, 0 },
- [32] = { 64, 32, 24, 16, 8, 0 },
- [48] = { 64, 0 },
- [64] = { 64, 48, 32, 16, 0 },
-};
-
-static const int pred_widths[] = { 4, 8, 12, 16, 24, 32, 48, 64 };
-
-static const char *interp_names[2][2] = { { "pixels", "h" }, { "v", "hv" } };
-
-#define UNWEIGHTED_PRED(dst0, dst1, src0, width, bit_depth) \
-do { \
- int i; \
- for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) { \
- int height = pred_heights[width][i]; \
- if (!height) \
- break; \
- call_ref(dst0, dststride, src0, srcstride, height); \
- call_new(dst1, dststride, src0, srcstride, height); \
- if (memcmp(dst0, dst1, dststride * height)) \
- fail(); \
- bench_new(dst1, dststride, src0, srcstride, height); \
- } \
-} while (0)
-
-#define UNWEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth) \
-do { \
- int i; \
- for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) { \
- int height = pred_heights[width][i]; \
- if (!height) \
- break; \
- call_ref(dst0, dststride, src0, src1, srcstride, height); \
- call_new(dst1, dststride, src0, src1, srcstride, height); \
- if (memcmp(dst0, dst1, dststride * height)) \
- fail(); \
- bench_new(dst1, dststride, src0, src1, srcstride, height); \
- } \
-} while (0)
-
-static void check_unweighted_pred(HEVCDSPContext *h, uint8_t *dst0, uint8_t *dst1,
- int16_t *src0, int16_t *src1, int bit_depth)
-{
- int i;
-
- randomize_buffers(src0, BUF_SIZE, 8);
- randomize_buffers(src1, BUF_SIZE, 8);
-
- memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
- memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
- for (i = 0; i < FF_ARRAY_ELEMS(pred_widths); i++) {
- const int width = pred_widths[i];
- const ptrdiff_t srcstride = FFALIGN(width, 16) * sizeof(*src0);
- const ptrdiff_t dststride = FFALIGN(width, 16) * PIXEL_SIZE(bit_depth);
-
- {
- declare_func(void, uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride, int height);
- if (check_func(h->put_unweighted_pred[i], "put_unweighted_pred_%d_%d", width, bit_depth))
- UNWEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
- if (check_func(h->put_unweighted_pred_chroma[i], "put_unweighted_pred_%d_%d", width / 2, bit_depth))
- UNWEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
- }
- {
- declare_func(void, uint8_t *dst, ptrdiff_t dststride,
- int16_t *src0, int16_t *src1, ptrdiff_t srcstride, int height);
- if (check_func(h->put_unweighted_pred_avg[i], "put_unweighted_pred_avg_%d_%d", width, bit_depth))
- UNWEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
- if (check_func(h->put_unweighted_pred_avg_chroma[i], "put_unweighted_pred_avg_%d_%d", width / 2, bit_depth))
- UNWEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
- }
- }
-}
-
-#define WEIGHTED_PRED(dst0, dst1, src0, width, bit_depth) \
-do { \
- int i; \
- for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) { \
- int height = pred_heights[width][i]; \
- if (!height) \
- break; \
- call_ref(denom, weight0, offset0, dst0, dststride, src0, srcstride, height); \
- call_new(denom, weight0, offset0, dst1, dststride, src0, srcstride, height); \
- if (memcmp(dst0, dst1, dststride * height)) \
- fail(); \
- bench_new(denom, weight0, offset0, dst1, dststride, src0, srcstride, height); \
- } \
-} while (0)
-
-#define WEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth) \
-do { \
- int i; \
- for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) { \
- int height = pred_heights[width][i]; \
- if (!height) \
- break; \
- call_ref(denom, weight0, weight1, offset0, offset1, dst0, dststride, src0, src1, srcstride, height); \
- call_new(denom, weight0, weight1, offset0, offset1, dst1, dststride, src0, src1, srcstride, height); \
- if (memcmp(dst0, dst1, dststride * height)) \
- fail(); \
- bench_new(denom, weight0, weight1, offset0, offset1, dst1, dststride, src0, src1, srcstride, height); \
- } \
-} while (0)
-
-static void check_weighted_pred(HEVCDSPContext *h, uint8_t *dst0, uint8_t *dst1,
- int16_t *src0, int16_t *src1, int bit_depth)
-{
- uint8_t denom;
- int16_t weight0, weight1, offset0, offset1;
- int i;
-
- randomize_buffers(src0, BUF_SIZE, 8);
- randomize_buffers(src1, BUF_SIZE, 8);
-
- denom = rnd() & 7;
- weight0 = denom + ((rnd() & 255) - 128);
- weight1 = denom + ((rnd() & 255) - 128);
- offset0 = (rnd() & 255) - 128;
- offset1 = (rnd() & 255) - 128;
-
- memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
- memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
- for (i = 0; i < FF_ARRAY_ELEMS(pred_widths); i++) {
- const int width = pred_widths[i];
- const ptrdiff_t srcstride = FFALIGN(width, 16) * sizeof(*src0);
- const ptrdiff_t dststride = FFALIGN(width, 16) * PIXEL_SIZE(bit_depth);
-
- {
- declare_func(void, uint8_t denom, int16_t weight, int16_t offset,
- uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride, int height);
- if (check_func(h->weighted_pred[i], "weighted_pred_%d_%d", width, bit_depth))
- WEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
- if (check_func(h->weighted_pred_chroma[i], "weighted_pred_%d_%d", width / 2, bit_depth))
- WEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
- }
- {
- declare_func(void, uint8_t denom, int16_t weight0, int16_t weight1, int16_t offset0, int16_t offset1,
- uint8_t *dst, ptrdiff_t dststride, int16_t *src0, int16_t *src1, ptrdiff_t srcstride, int height);
- if (check_func(h->weighted_pred_avg[i], "weighted_pred_avg_%d_%d", width, bit_depth))
- WEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
- if (check_func(h->weighted_pred_avg_chroma[i], "weighted_pred_avg_%d_%d", width / 2, bit_depth))
- WEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
- }
- }
-}
-
-static void check_epel(HEVCDSPContext *h, int16_t *dst0, int16_t *dst1,
- uint8_t *src, int16_t *mcbuffer, int bit_depth)
-{
- int i, j, k, l, mx, my;
-
- declare_func(void, int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride,
- int height, int mx, int my, int16_t *mcbuffer);
-
- randomize_buffers(src, BUF_SIZE, bit_depth);
-
- memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
- memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
- for (i = 0; i < 2; i++) {
- for (j = 0; j < 2; j++) {
- for (k = 0; k < FF_ARRAY_ELEMS(h->put_hevc_epel[i][j]); k++) {
- int width = pred_widths[k] / 2;
- ptrdiff_t dststride = FFALIGN(width, 16) * sizeof(*dst0);
- ptrdiff_t srcstride = FFALIGN(width + 3, 8) * PIXEL_SIZE(bit_depth);
-
- if (!check_func(h->put_hevc_epel[i][j][k], "epel_%s_%d_%d", interp_names[i][j], width, bit_depth))
- continue;
-
- for (l = 0; l < FF_ARRAY_ELEMS(pred_heights[0]); l++) {
- int height = pred_heights[width][l];
-
- if (!height)
- continue;
-
- for (my = i; my < (i ? 8 : 1); my++)
- for (mx = j; mx < (j ? 8 : 1); mx++) {
- call_ref(dst0, dststride, src + srcstride + PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
- call_new(dst1, dststride, src + srcstride + PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-
- if (memcmp(dst0, dst1, dststride * height * sizeof(*dst0)))
- fail();
-
- bench_new(dst1, dststride, src + srcstride + PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
- }
- }
- }
- }
- }
-}
-
-static void check_qpel(HEVCDSPContext *h, int16_t *dst0, int16_t *dst1,
- uint8_t *src, int16_t *mcbuffer, int bit_depth)
-{
- int i, j, k, l, mx, my;
-
- declare_func(void, int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride,
- int height, int mx, int my, int16_t *mcbuffer);
-
- randomize_buffers(src, BUF_SIZE, bit_depth);
-
- memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
- memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
- for (i = 0; i < 2; i++) {
- for (j = 0; j < 2; j++) {
- for (k = 0; k < FF_ARRAY_ELEMS(h->put_hevc_qpel[i][j]); k++) {
- int width = pred_widths[k];
- ptrdiff_t dststride = FFALIGN(width, 16) * sizeof(*dst0);
- ptrdiff_t srcstride = FFALIGN(width + 7, 8) * PIXEL_SIZE(bit_depth);
-
- if (!check_func(h->put_hevc_qpel[i][j][k], "qpel_%s_%d_%d", interp_names[i][j], width, bit_depth))
- continue;
-
- for (l = 0; l < FF_ARRAY_ELEMS(pred_heights[0]); l++) {
- int height = pred_heights[width][l];
-
- if (!height)
- continue;
-
- for (my = i; my < (i ? 2 : 1); my++)
- for (mx = j; mx < (j ? 2 : 1); mx++) {
- call_ref(dst0, dststride, src + 3 * srcstride + 3 * PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
- call_new(dst1, dststride, src + 3 * srcstride + 3 * PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-
- if (memcmp(dst0, dst1, dststride * height * sizeof(*dst0)))
- fail();
-
- bench_new(dst1, dststride, src + 3 * srcstride + 3 * PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
- }
- }
- }
- }
- }
-}
-
-void checkasm_check_hevc_mc(void)
-{
- DECLARE_ALIGNED(16, uint8_t, buf8_0)[BUF_SIZE];
- DECLARE_ALIGNED(16, uint8_t, buf8_1)[BUF_SIZE];
-
- DECLARE_ALIGNED(16, int16_t, buf16_0)[BUF_SIZE];
- DECLARE_ALIGNED(16, int16_t, buf16_1)[BUF_SIZE];
-
- DECLARE_ALIGNED(16, int16_t, mcbuffer)[BUF_SIZE];
-
- HEVCDSPContext h;
- int bit_depth;
-
- for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
- ff_hevc_dsp_init(&h, bit_depth);
- check_qpel(&h, buf16_0, buf16_1, buf8_0, mcbuffer, bit_depth);
- }
- report("qpel");
-
- for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
- ff_hevc_dsp_init(&h, bit_depth);
- check_epel(&h, buf16_0, buf16_1, buf8_0, mcbuffer, bit_depth);
- }
- report("epel");
-
- for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
- ff_hevc_dsp_init(&h, bit_depth);
- check_unweighted_pred(&h, buf8_0, buf8_1, buf16_0, buf16_1, bit_depth);
- }
- report("unweighted_pred");
-
- for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
- ff_hevc_dsp_init(&h, bit_depth);
- check_weighted_pred(&h, buf8_0, buf8_1, buf16_0, buf16_1, bit_depth);
- }
- report("weighted_pred");
-}
diff --git a/tests/checkasm/jpeg2000dsp.c b/tests/checkasm/jpeg2000dsp.c
new file mode 100644
index 0000000..48559df
--- /dev/null
+++ b/tests/checkasm/jpeg2000dsp.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * 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 "checkasm.h"
+#include "libavcodec/jpeg2000dsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define BUF_SIZE 512
+
+#define randomize_buffers() \
+ do { \
+ int i; \
+ for (i = 0; i < BUF_SIZE; i += 4) { \
+ uint32_t r = rnd(); \
+ AV_WN32A(ref0 + i, r); \
+ AV_WN32A(new0 + i, r); \
+ r = rnd(); \
+ AV_WN32A(ref1 + i, r); \
+ AV_WN32A(new1 + i, r); \
+ r = rnd(); \
+ AV_WN32A(ref2 + i, r); \
+ AV_WN32A(new2 + i, r); \
+ } \
+ } while (0)
+
+static void check_mct(uint8_t *ref0, uint8_t *ref1, uint8_t *ref2,
+ uint8_t *new0, uint8_t *new1, uint8_t *new2) {
+ declare_func(void, void *src0, void *src1, void *src2, int csize);
+
+ randomize_buffers();
+ call_ref(ref0, ref1, ref2, BUF_SIZE / sizeof(int32_t));
+ call_new(new0, new1, new2, BUF_SIZE / sizeof(int32_t));
+ if (memcmp(ref0, new0, BUF_SIZE) || memcmp(ref1, new1, BUF_SIZE) ||
+ memcmp(ref2, new2, BUF_SIZE))
+ fail();
+ bench_new(new0, new1, new2, BUF_SIZE / sizeof(int32_t));
+}
+
+void checkasm_check_jpeg2000dsp(void)
+{
+ LOCAL_ALIGNED_32(uint8_t, ref, [BUF_SIZE*3]);
+ LOCAL_ALIGNED_32(uint8_t, new, [BUF_SIZE*3]);
+ Jpeg2000DSPContext h;
+
+ ff_jpeg2000dsp_init(&h);
+
+ if (check_func(h.mct_decode[FF_DWT53], "jpeg2000_rct_int"))
+ check_mct(&ref[BUF_SIZE*0], &ref[BUF_SIZE*1], &ref[BUF_SIZE*2],
+ &new[BUF_SIZE*0], &new[BUF_SIZE*1], &new[BUF_SIZE*2]);
+
+ report("mct_decode");
+}
diff --git a/tests/checkasm/huffyuvdsp.c b/tests/checkasm/llviddsp.c
index 59e0f6a..b1f3b83 100644
--- a/tests/checkasm/huffyuvdsp.c
+++ b/tests/checkasm/llviddsp.c
@@ -1,20 +1,20 @@
/*
* 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.
*/
@@ -24,7 +24,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
-#include "libavcodec/huffyuvdsp.h"
+#include "libavcodec/lossless_videodsp.h"
#include "checkasm.h"
@@ -35,13 +35,13 @@
buf[j] = rnd() & 0xFF; \
} while (0)
-static void check_add_bytes(HuffYUVDSPContext c, int width)
+static void check_add_bytes(LLVidDSPContext c, int width)
{
uint8_t *src0 = av_mallocz(width);
uint8_t *src1 = av_mallocz(width);
uint8_t *dst0 = av_mallocz(width);
uint8_t *dst1 = av_mallocz(width);
- declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, int w);
+ declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t w);
if (!src0 || !src1 || !dst0 || !dst1)
fail();
@@ -63,12 +63,12 @@ static void check_add_bytes(HuffYUVDSPContext c, int width)
av_free(dst1);
}
-void checkasm_check_huffyuvdsp(void)
+void checkasm_check_llviddsp(void)
{
- HuffYUVDSPContext c;
+ LLVidDSPContext c;
int width = 16 * av_clip(rnd(), 16, 128);
- ff_huffyuvdsp_init(&c);
+ ff_llviddsp_init(&c);
check_add_bytes(c, width);
diff --git a/tests/checkasm/pixblockdsp.c b/tests/checkasm/pixblockdsp.c
new file mode 100644
index 0000000..e14b0a9
--- /dev/null
+++ b/tests/checkasm/pixblockdsp.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2015 Tiancheng "Timothy" Gu
+ *
+ * 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/pixblockdsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define BUF_UNITS 8
+#define BUF_SIZE (BUF_UNITS * 128 + 8 * BUF_UNITS)
+
+#define randomize_buffers() \
+ do { \
+ int i; \
+ for (i = 0; i < BUF_SIZE; i += 4) { \
+ uint32_t r = rnd(); \
+ AV_WN32A(src10 + i, r); \
+ AV_WN32A(src11 + i, r); \
+ r = rnd(); \
+ AV_WN32A(src20 + i, r); \
+ AV_WN32A(src21 + i, r); \
+ r = rnd(); \
+ AV_WN32A(dst0_ + i, r); \
+ AV_WN32A(dst1_ + i, r); \
+ } \
+ } while (0)
+
+#define check_get_pixels(type) \
+ do { \
+ int i; \
+ declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *block, const uint8_t *pixels, ptrdiff_t line_size); \
+ \
+ for (i = 0; i < BUF_UNITS; i++) { \
+ int src_offset = i * 64 * sizeof(type) + 8 * i; /* Test various alignments */ \
+ int dst_offset = i * 64; /* dst must be aligned */ \
+ randomize_buffers(); \
+ call_ref(dst0 + dst_offset, src10 + src_offset, 8); \
+ call_new(dst1 + dst_offset, src11 + src_offset, 8); \
+ if (memcmp(src10, src11, BUF_SIZE)|| memcmp(dst0, dst1, BUF_SIZE)) \
+ fail(); \
+ bench_new(dst1 + dst_offset, src11 + src_offset, 8); \
+ } \
+ } while (0)
+
+#define check_diff_pixels(type) \
+ do { \
+ int i; \
+ declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); \
+ \
+ for (i = 0; i < BUF_UNITS; i++) { \
+ int src_offset = i * 64 * sizeof(type) + 8 * i; /* Test various alignments */ \
+ int dst_offset = i * 64; /* dst must be aligned */ \
+ randomize_buffers(); \
+ call_ref(dst0 + dst_offset, src10 + src_offset, src20 + src_offset, 8); \
+ call_new(dst1 + dst_offset, src11 + src_offset, src21 + src_offset, 8); \
+ if (memcmp(src10, src11, BUF_SIZE) || memcmp(src20, src21, BUF_SIZE) || memcmp(dst0, dst1, BUF_SIZE)) \
+ fail(); \
+ bench_new(dst1 + dst_offset, src11 + src_offset, src21 + src_offset, 8); \
+ } \
+ } while (0)
+
+void checkasm_check_pixblockdsp(void)
+{
+ LOCAL_ALIGNED_16(uint8_t, src10, [BUF_SIZE]);
+ LOCAL_ALIGNED_16(uint8_t, src11, [BUF_SIZE]);
+ LOCAL_ALIGNED_16(uint8_t, src20, [BUF_SIZE]);
+ LOCAL_ALIGNED_16(uint8_t, src21, [BUF_SIZE]);
+ LOCAL_ALIGNED_16(uint8_t, dst0_, [BUF_SIZE]);
+ LOCAL_ALIGNED_16(uint8_t, dst1_, [BUF_SIZE]);
+ uint16_t *dst0 = (uint16_t *)dst0_;
+ uint16_t *dst1 = (uint16_t *)dst1_;
+ PixblockDSPContext h;
+ AVCodecContext avctx = {
+ .bits_per_raw_sample = 8,
+ };
+
+ ff_pixblockdsp_init(&h, &avctx);
+
+ if (check_func(h.get_pixels, "get_pixels"))
+ check_get_pixels(uint8_t);
+
+ report("get_pixels");
+
+ if (check_func(h.diff_pixels, "diff_pixels"))
+ check_diff_pixels(uint8_t);
+
+ report("diff_pixels");
+}
diff --git a/tests/checkasm/synth_filter.c b/tests/checkasm/synth_filter.c
index 157400b..87e32eb 100644
--- a/tests/checkasm/synth_filter.c
+++ b/tests/checkasm/synth_filter.c
@@ -1,20 +1,20 @@
/*
* Copyright (c) 2015 Janne Grunau
*
- * 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.
*/
diff --git a/tests/checkasm/v210enc.c b/tests/checkasm/v210enc.c
index 4f5f6ba..ed36776 100644
--- a/tests/checkasm/v210enc.c
+++ b/tests/checkasm/v210enc.c
@@ -1,20 +1,20 @@
/*
* 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.
*/
diff --git a/tests/checkasm/vf_blend.c b/tests/checkasm/vf_blend.c
new file mode 100644
index 0000000..aa568c0
--- /dev/null
+++ b/tests/checkasm/vf_blend.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2016 Tiancheng "Timothy" Gu
+ *
+ * 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 "libavfilter/blend.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define WIDTH 256
+#define HEIGHT 256
+#define BUF_UNITS 3
+#define SIZE_PER_UNIT (WIDTH * HEIGHT)
+#define BUF_SIZE (BUF_UNITS * SIZE_PER_UNIT)
+
+#define randomize_buffers() \
+ do { \
+ int i, j; \
+ for (i = 0; i < HEIGHT; i++) { \
+ for (j = 0; j < WIDTH; j++) { \
+ top1[i * WIDTH + j] = \
+ top2[i * WIDTH + j] = i; \
+ bot1[i * WIDTH + j] = \
+ bot2[i * WIDTH + j] = j; \
+ } \
+ } \
+ for (i = 0; i < SIZE_PER_UNIT; i += 4) { \
+ uint32_t r = rnd(); \
+ AV_WN32A(dst1 + i, r); \
+ AV_WN32A(dst2 + i, r); \
+ } \
+ for (; i < BUF_SIZE; i += 4) { \
+ uint32_t r = rnd(); \
+ AV_WN32A(top1 + i, r); \
+ AV_WN32A(top2 + i, r); \
+ r = rnd(); \
+ AV_WN32A(bot1 + i, r); \
+ AV_WN32A(bot2 + i, r); \
+ r = rnd(); \
+ AV_WN32A(dst1 + i, r); \
+ AV_WN32A(dst2 + i, r); \
+ } \
+ } while (0)
+
+#define check_blend_func() \
+ do { \
+ int i; \
+ declare_func(void, const uint8_t *top, ptrdiff_t top_linesize, \
+ const uint8_t *bottom, ptrdiff_t bottom_linesize, \
+ uint8_t *dst, ptrdiff_t dst_linesize, \
+ ptrdiff_t width, ptrdiff_t height, \
+ struct FilterParams *param, double *values); \
+ \
+ for (i = 0; i < BUF_UNITS - 1; i++) { \
+ int src_offset = i * SIZE_PER_UNIT + i; /* Test various alignments */ \
+ int dst_offset = i * SIZE_PER_UNIT; /* dst must be aligned */ \
+ randomize_buffers(); \
+ call_ref(top1 + src_offset, WIDTH, bot1 + src_offset, WIDTH, \
+ dst1 + dst_offset, WIDTH, WIDTH, HEIGHT, &param, NULL); \
+ call_new(top2 + src_offset, WIDTH, bot2 + src_offset, WIDTH, \
+ dst2 + dst_offset, WIDTH, WIDTH, HEIGHT, &param, NULL); \
+ if (memcmp(top1, top2, BUF_SIZE) || memcmp(bot1, bot2, BUF_SIZE) || memcmp(dst1, dst2, BUF_SIZE)) \
+ fail(); \
+ } \
+ bench_new(top2, WIDTH / 4, bot2, WIDTH / 4, dst2, WIDTH / 4, \
+ WIDTH / 4, HEIGHT / 4, &param, NULL); \
+ } while (0)
+
+void checkasm_check_blend(void)
+{
+ uint8_t *top1 = av_malloc(BUF_SIZE);
+ uint8_t *top2 = av_malloc(BUF_SIZE);
+ uint8_t *bot1 = av_malloc(BUF_SIZE);
+ uint8_t *bot2 = av_malloc(BUF_SIZE);
+ uint8_t *dst1 = av_malloc(BUF_SIZE);
+ uint8_t *dst2 = av_malloc(BUF_SIZE);
+ FilterParams param = {
+ .opacity = 1.0,
+ };
+
+#define check_and_report(name, val) \
+ param.mode = val; \
+ ff_blend_init(&param, 0); \
+ if (check_func(param.blend, #name)) \
+ check_blend_func();
+
+ check_and_report(addition, BLEND_ADDITION)
+ check_and_report(addition128, BLEND_ADDITION128)
+ check_and_report(and, BLEND_AND)
+ check_and_report(average, BLEND_AVERAGE)
+ check_and_report(darken, BLEND_DARKEN)
+ check_and_report(difference128, BLEND_DIFFERENCE128)
+ check_and_report(hardmix, BLEND_HARDMIX)
+ check_and_report(lighten, BLEND_LIGHTEN)
+ check_and_report(multiply, BLEND_MULTIPLY)
+ check_and_report(or, BLEND_OR)
+ check_and_report(phoenix, BLEND_PHOENIX)
+ check_and_report(screen, BLEND_SCREEN)
+ check_and_report(subtract, BLEND_SUBTRACT)
+ check_and_report(xor, BLEND_XOR)
+ check_and_report(difference, BLEND_DIFFERENCE)
+ check_and_report(negation, BLEND_NEGATION)
+
+ report("8bit");
+
+ av_freep(&top1);
+ av_freep(&top2);
+ av_freep(&bot1);
+ av_freep(&bot2);
+ av_freep(&dst1);
+ av_freep(&dst2);
+}
diff --git a/tests/checkasm/vf_colorspace.c b/tests/checkasm/vf_colorspace.c
new file mode 100644
index 0000000..10b7b83
--- /dev/null
+++ b/tests/checkasm/vf_colorspace.c
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2016 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * 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 <string.h>
+#include "checkasm.h"
+#include "libavfilter/colorspacedsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define W 64
+#define H 64
+
+#define randomize_buffers() \
+ do { \
+ unsigned mask = bpp_mask[idepth]; \
+ int n, m; \
+ int bpp = 1 + (!!idepth); \
+ int buf_size = W * H * bpp; \
+ for (m = 0; m < 3; m++) { \
+ int ss = m ? ss_w + ss_h : 0; \
+ int plane_sz = buf_size >> ss; \
+ for (n = 0; n < plane_sz; n += 4) { \
+ unsigned r = rnd() & mask; \
+ AV_WN32A(&src[m][n], r); \
+ } \
+ } \
+ } while (0)
+
+static const char *format_string[] = {
+ "444", "422", "420"
+};
+
+static const unsigned bpp_mask[] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
+
+static void check_yuv2yuv(void)
+{
+ declare_func(void, uint8_t *dst[3], ptrdiff_t dst_stride[3],
+ uint8_t *src[3], ptrdiff_t src_stride[3],
+ int w, int h, const int16_t coeff[3][3][8],
+ const int16_t off[2][8]);
+ ColorSpaceDSPContext dsp;
+ int idepth, odepth, fmt, n;
+ LOCAL_ALIGNED_32(uint8_t, src_y, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, src_u, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, src_v, [W * H * 2]);
+ uint8_t *src[3] = { src_y, src_u, src_v };
+ LOCAL_ALIGNED_32(uint8_t, dst0_y, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_u, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_v, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_y, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_u, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_v, [W * H * 2]);
+ uint8_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+ LOCAL_ALIGNED_32(int16_t, offset_buf, [16]);
+ LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+ int16_t (*offset)[8] = (int16_t(*)[8]) offset_buf;
+ int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+
+ ff_colorspacedsp_init(&dsp);
+ for (n = 0; n < 8; n++) {
+ offset[0][n] = offset[1][n] = 16;
+
+ coeff[0][0][n] = (1 << 14) + (1 << 7) + 1;
+ coeff[0][1][n] = (1 << 7) - 1;
+ coeff[0][2][n] = -(1 << 8);
+ coeff[1][0][n] = coeff[2][0][n] = 0;
+ coeff[1][1][n] = (1 << 14) + (1 << 7);
+ coeff[1][2][n] = -(1 << 7);
+ coeff[2][2][n] = (1 << 14) - (1 << 6);
+ coeff[2][1][n] = 1 << 6;
+ }
+ for (idepth = 0; idepth < 3; idepth++) {
+ for (odepth = 0; odepth < 3; odepth++) {
+ for (fmt = 0; fmt < 3; fmt++) {
+ if (check_func(dsp.yuv2yuv[idepth][odepth][fmt],
+ "ff_colorspacedsp_yuv2yuv_%sp%dto%d",
+ format_string[fmt],
+ idepth * 2 + 8, odepth * 2 + 8)) {
+ int ss_w = !!fmt, ss_h = fmt == 2;
+ int y_src_stride = W << !!idepth, y_dst_stride = W << !!odepth;
+ int uv_src_stride = y_src_stride >> ss_w, uv_dst_stride = y_dst_stride >> ss_w;
+
+ randomize_buffers();
+ call_ref(dst0, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+ src, (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+ W, H, coeff, offset);
+ call_new(dst1, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+ src, (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+ W, H, coeff, offset);
+ if (memcmp(dst0[0], dst1[0], y_dst_stride * H) ||
+ memcmp(dst0[1], dst1[1], uv_dst_stride * H >> ss_h) ||
+ memcmp(dst0[2], dst1[2], uv_dst_stride * H >> ss_h)) {
+ fail();
+ }
+ }
+ }
+ }
+ }
+
+ report("yuv2yuv");
+}
+
+static void check_yuv2rgb(void)
+{
+ declare_func(void, int16_t *dst[3], ptrdiff_t dst_stride,
+ uint8_t *src[3], ptrdiff_t src_stride[3],
+ int w, int h, const int16_t coeff[3][3][8],
+ const int16_t off[8]);
+ ColorSpaceDSPContext dsp;
+ int idepth, fmt, n;
+ LOCAL_ALIGNED_32(uint8_t, src_y, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, src_u, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, src_v, [W * H * 2]);
+ uint8_t *src[3] = { src_y, src_u, src_v };
+ LOCAL_ALIGNED_32(int16_t, dst0_y, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst0_u, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst0_v, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst1_y, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst1_u, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst1_v, [W * H]);
+ int16_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+ LOCAL_ALIGNED_32(int16_t, offset, [8]);
+ LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+ int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+
+ ff_colorspacedsp_init(&dsp);
+ for (n = 0; n < 8; n++) {
+ offset[n] = 16;
+
+ coeff[0][0][n] = coeff[1][0][n] = coeff[2][0][n] = (1 << 14) | 1;
+ coeff[0][1][n] = coeff[2][2][n] = 0;
+ coeff[0][2][n] = 1 << 13;
+ coeff[1][1][n] = -(1 << 12);
+ coeff[1][2][n] = 1 << 12;
+ coeff[2][1][n] = 1 << 11;
+ }
+ for (idepth = 0; idepth < 3; idepth++) {
+ for (fmt = 0; fmt < 3; fmt++) {
+ if (check_func(dsp.yuv2rgb[idepth][fmt],
+ "ff_colorspacedsp_yuv2rgb_%sp%d",
+ format_string[fmt], idepth * 2 + 8)) {
+ int ss_w = !!fmt, ss_h = fmt == 2;
+ int y_src_stride = W << !!idepth;
+ int uv_src_stride = y_src_stride >> ss_w;
+
+ randomize_buffers();
+ call_ref(dst0, W, src,
+ (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+ W, H, coeff, offset);
+ call_new(dst1, W, src,
+ (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+ W, H, coeff, offset);
+ if (memcmp(dst0[0], dst1[0], W * H * sizeof(int16_t)) ||
+ memcmp(dst0[1], dst1[1], W * H * sizeof(int16_t)) ||
+ memcmp(dst0[2], dst1[2], W * H * sizeof(int16_t))) {
+ fail();
+ }
+ }
+ }
+ }
+
+ report("yuv2rgb");
+}
+
+#undef randomize_buffers
+#define randomize_buffers() \
+ do { \
+ int y, x, p; \
+ for (p = 0; p < 3; p++) { \
+ for (y = 0; y < H; y++) { \
+ for (x = 0; x < W; x++) { \
+ int r = rnd() & 0x7fff; \
+ r -= (32768 - 28672) >> 1; \
+ src[p][y * W + x] = r; \
+ } \
+ } \
+ } \
+ } while (0)
+
+static void check_rgb2yuv(void)
+{
+ declare_func(void, uint8_t *dst[3], ptrdiff_t dst_stride[3],
+ int16_t *src[3], ptrdiff_t src_stride,
+ int w, int h, const int16_t coeff[3][3][8],
+ const int16_t off[8]);
+ ColorSpaceDSPContext dsp;
+ int odepth, fmt, n;
+ LOCAL_ALIGNED_32(int16_t, src_y, [W * H * 2]);
+ LOCAL_ALIGNED_32(int16_t, src_u, [W * H * 2]);
+ LOCAL_ALIGNED_32(int16_t, src_v, [W * H * 2]);
+ int16_t *src[3] = { src_y, src_u, src_v };
+ LOCAL_ALIGNED_32(uint8_t, dst0_y, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_u, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0_v, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_y, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_u, [W * H * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1_v, [W * H * 2]);
+ uint8_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+ LOCAL_ALIGNED_32(int16_t, offset, [8]);
+ LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+ int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+
+ ff_colorspacedsp_init(&dsp);
+ for (n = 0; n < 8; n++) {
+ offset[n] = 16;
+
+ // these somewhat resemble bt601/smpte170m coefficients
+ coeff[0][0][n] = lrint(0.3 * (1 << 14));
+ coeff[0][1][n] = lrint(0.6 * (1 << 14));
+ coeff[0][2][n] = lrint(0.1 * (1 << 14));
+ coeff[1][0][n] = lrint(-0.15 * (1 << 14));
+ coeff[1][1][n] = lrint(-0.35 * (1 << 14));
+ coeff[1][2][n] = lrint(0.5 * (1 << 14));
+ coeff[2][0][n] = lrint(0.5 * (1 << 14));
+ coeff[2][1][n] = lrint(-0.42 * (1 << 14));
+ coeff[2][2][n] = lrint(-0.08 * (1 << 14));
+ }
+ for (odepth = 0; odepth < 3; odepth++) {
+ for (fmt = 0; fmt < 3; fmt++) {
+ if (check_func(dsp.rgb2yuv[odepth][fmt],
+ "ff_colorspacedsp_rgb2yuv_%sp%d",
+ format_string[fmt], odepth * 2 + 8)) {
+ int ss_w = !!fmt, ss_h = fmt == 2;
+ int y_dst_stride = W << !!odepth;
+ int uv_dst_stride = y_dst_stride >> ss_w;
+
+ randomize_buffers();
+ call_ref(dst0, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+ src, W, W, H, coeff, offset);
+ call_new(dst1, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+ src, W, W, H, coeff, offset);
+ if (memcmp(dst0[0], dst1[0], H * y_dst_stride) ||
+ memcmp(dst0[1], dst1[1], H * uv_dst_stride >> ss_h) ||
+ memcmp(dst0[2], dst1[2], H * uv_dst_stride >> ss_h)) {
+ fail();
+ }
+ }
+ }
+ }
+
+ report("rgb2yuv");
+}
+
+static void check_multiply3x3(void)
+{
+ declare_func(void, int16_t *data[3], ptrdiff_t stride,
+ int w, int h, const int16_t coeff[3][3][8]);
+ ColorSpaceDSPContext dsp;
+ LOCAL_ALIGNED_32(int16_t, dst0_y, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst0_u, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst0_v, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst1_y, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst1_u, [W * H]);
+ LOCAL_ALIGNED_32(int16_t, dst1_v, [W * H]);
+ int16_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+ int16_t **src = dst0;
+ LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+ int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+ int n;
+
+ ff_colorspacedsp_init(&dsp);
+ for (n = 0; n < 8; n++) {
+ coeff[0][0][n] = lrint(0.85 * (1 << 14));
+ coeff[0][1][n] = lrint(0.10 * (1 << 14));
+ coeff[0][2][n] = lrint(0.05 * (1 << 14));
+ coeff[1][0][n] = lrint(-0.1 * (1 << 14));
+ coeff[1][1][n] = lrint(0.95 * (1 << 14));
+ coeff[1][2][n] = lrint(0.15 * (1 << 14));
+ coeff[2][0][n] = lrint(-0.2 * (1 << 14));
+ coeff[2][1][n] = lrint(0.30 * (1 << 14));
+ coeff[2][2][n] = lrint(0.90 * (1 << 14));
+ }
+ if (check_func(dsp.multiply3x3, "ff_colorspacedsp_multiply3x3")) {
+ randomize_buffers();
+ memcpy(dst1_y, dst0_y, W * H * sizeof(*dst1_y));
+ memcpy(dst1_u, dst0_u, W * H * sizeof(*dst1_u));
+ memcpy(dst1_v, dst0_v, W * H * sizeof(*dst1_v));
+ call_ref(dst0, W, W, H, coeff);
+ call_new(dst1, W, W, H, coeff);
+ if (memcmp(dst0[0], dst1[0], H * W * sizeof(*dst0_y)) ||
+ memcmp(dst0[1], dst1[1], H * W * sizeof(*dst0_u)) ||
+ memcmp(dst0[2], dst1[2], H * W * sizeof(*dst0_v))) {
+ fail();
+ }
+ }
+
+ report("multiply3x3");
+}
+
+void checkasm_check_colorspace(void)
+{
+ check_yuv2yuv();
+ check_yuv2rgb();
+ check_rgb2yuv();
+ check_multiply3x3();
+}
diff --git a/tests/checkasm/videodsp.c b/tests/checkasm/videodsp.c
new file mode 100644
index 0000000..0a4424a
--- /dev/null
+++ b/tests/checkasm/videodsp.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * 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/videodsp.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define randomize_buffers(w, h) \
+ do { \
+ int i; \
+ for (i = 0; i < w * h * sizeof(*src0); i += 4) \
+ AV_WN32A(((uint8_t *) src0) + i, rnd()); \
+ } while (0)
+
+#define iter_1d(type, fix, fix_val, var, var_start, var_end) \
+ for (fix = fix_val, var = var_start; var <= var_end; var++) { \
+ call_ref((type *) dst0, (const type *) (src0 + y * pw + x), \
+ bw * sizeof(type), pw * sizeof(type), \
+ bw, bh, x, y, pw, ph); \
+ call_new((type *) dst1, (const type *) (src1 + y * pw + x), \
+ bw * sizeof(type), pw * sizeof(type), \
+ bw, bh, x, y, pw, ph); \
+ if (memcmp(dst0, dst1, bw * bh * sizeof(type))) \
+ fail(); \
+ bench_new((type *) dst1, (const type *) (src1 + y * pw + x),\
+ bw * sizeof(type), pw * sizeof(type), \
+ bw, bh, x, y, pw, ph); \
+ }
+
+#define check_emu_edge_size(type, src_w, src_h, dst_w, dst_h) \
+ do { \
+ LOCAL_ALIGNED_16(type, src0, [src_w * src_h]); \
+ LOCAL_ALIGNED_16(type, src1, [src_w * src_h]); \
+ int bw = dst_w, bh = dst_h; \
+ int pw = src_w, ph = src_h; \
+ int y, x; \
+ randomize_buffers(src_w, src_h); \
+ memcpy(src1, src0, pw * ph * sizeof(type)); \
+ iter_1d(type, y, 0 - src_h, x, 0 - src_w, src_w - 0); \
+ iter_1d(type, x, src_w - 0, y, 0 - src_h, src_h - 0); \
+ iter_1d(type, y, src_h - 0, x, 0 - src_w, src_w - 0); \
+ iter_1d(type, x, 0 - src_w, y, 0 - src_h, src_h - 0); \
+ } while (0)
+
+#define check_emu_edge(type) \
+ do { \
+ LOCAL_ALIGNED_16(type, dst0, [64 * 64]); \
+ LOCAL_ALIGNED_16(type, dst1, [64 * 64]); \
+ declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, \
+ void, type *dst, const type *src, \
+ ptrdiff_t dst_linesize, \
+ ptrdiff_t src_linesize, \
+ int block_w, int block_h, \
+ int src_x, int src_y, \
+ int src_w, int src_h); \
+ check_emu_edge_size(type, 16, 1, 64, 64); \
+ check_emu_edge_size(type, 16, 16, 64, 64); \
+ check_emu_edge_size(type, 64, 64, 64, 64); \
+ } while (0)
+
+void checkasm_check_videodsp(void)
+{
+ VideoDSPContext vdsp;
+
+ ff_videodsp_init(&vdsp, 8);
+ if (check_func(vdsp.emulated_edge_mc, "emulated_edge_mc_8"))
+ check_emu_edge(uint8_t);
+
+ report("emulated_edge_mc");
+}
diff --git a/tests/checkasm/vp8dsp.c b/tests/checkasm/vp8dsp.c
index 40e4061..d93f730 100644
--- a/tests/checkasm/vp8dsp.c
+++ b/tests/checkasm/vp8dsp.c
@@ -1,20 +1,20 @@
/*
* Copyright (c) 2016 Martin Storsjo
*
- * 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.
*/
diff --git a/tests/checkasm/vp9dsp.c b/tests/checkasm/vp9dsp.c
index f0d9372..4817309 100644
--- a/tests/checkasm/vp9dsp.c
+++ b/tests/checkasm/vp9dsp.c
@@ -1,56 +1,399 @@
/*
* Copyright (c) 2015 Ronald S. Bultje <rsbultje@gmail.com>
*
- * 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 <math.h>
#include <string.h>
-
+#include "checkasm.h"
+#include "libavcodec/vp9data.h"
+#include "libavcodec/vp9dsp.h"
#include "libavutil/common.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
-#include "libavcodec/vp9.h"
+static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
+#define SIZEOF_PIXEL ((bit_depth + 7) / 8)
-#include "checkasm.h"
+#define randomize_buffers() \
+ do { \
+ uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \
+ int k; \
+ for (k = -4; k < SIZEOF_PIXEL * FFMAX(8, size); k += 4) { \
+ uint32_t r = rnd() & mask; \
+ AV_WN32A(a + k, r); \
+ } \
+ for (k = 0; k < size * SIZEOF_PIXEL; k += 4) { \
+ uint32_t r = rnd() & mask; \
+ AV_WN32A(l + k, r); \
+ } \
+ } while (0)
-static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
+static void check_ipred(void)
+{
+ LOCAL_ALIGNED_32(uint8_t, a_buf, [64 * 2]);
+ uint8_t *a = &a_buf[32 * 2];
+ LOCAL_ALIGNED_32(uint8_t, l, [32 * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0, [32 * 32 * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1, [32 * 32 * 2]);
+ VP9DSPContext dsp;
+ int tx, mode, bit_depth;
+ declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t stride,
+ const uint8_t *left, const uint8_t *top);
+ static const char *const mode_names[N_INTRA_PRED_MODES] = {
+ [VERT_PRED] = "vert",
+ [HOR_PRED] = "hor",
+ [DC_PRED] = "dc",
+ [DIAG_DOWN_LEFT_PRED] = "diag_downleft",
+ [DIAG_DOWN_RIGHT_PRED] = "diag_downright",
+ [VERT_RIGHT_PRED] = "vert_right",
+ [HOR_DOWN_PRED] = "hor_down",
+ [VERT_LEFT_PRED] = "vert_left",
+ [HOR_UP_PRED] = "hor_up",
+ [TM_VP8_PRED] = "tm",
+ [LEFT_DC_PRED] = "dc_left",
+ [TOP_DC_PRED] = "dc_top",
+ [DC_128_PRED] = "dc_128",
+ [DC_127_PRED] = "dc_127",
+ [DC_129_PRED] = "dc_129",
+ };
+
+ for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+ ff_vp9dsp_init(&dsp, bit_depth, 0);
+ for (tx = 0; tx < 4; tx++) {
+ int size = 4 << tx;
+
+ for (mode = 0; mode < N_INTRA_PRED_MODES; mode++) {
+ if (check_func(dsp.intra_pred[tx][mode], "vp9_%s_%dx%d_%dbpp",
+ mode_names[mode], size, size, bit_depth)) {
+ randomize_buffers();
+ call_ref(dst0, size * SIZEOF_PIXEL, l, a);
+ call_new(dst1, size * SIZEOF_PIXEL, l, a);
+ if (memcmp(dst0, dst1, size * size * SIZEOF_PIXEL))
+ fail();
+ bench_new(dst1, size * SIZEOF_PIXEL,l, a);
+ }
+ }
+ }
+ }
+ report("ipred");
+}
+
+#undef randomize_buffers
+
+#define randomize_buffers() \
+ do { \
+ uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \
+ for (y = 0; y < sz; y++) { \
+ for (x = 0; x < sz * SIZEOF_PIXEL; x += 4) { \
+ uint32_t r = rnd() & mask; \
+ AV_WN32A(dst + y * sz * SIZEOF_PIXEL + x, r); \
+ AV_WN32A(src + y * sz * SIZEOF_PIXEL + x, rnd() & mask); \
+ } \
+ for (x = 0; x < sz; x++) { \
+ if (bit_depth == 8) { \
+ coef[y * sz + x] = src[y * sz + x] - dst[y * sz + x]; \
+ } else { \
+ ((int32_t *) coef)[y * sz + x] = \
+ ((uint16_t *) src)[y * sz + x] - \
+ ((uint16_t *) dst)[y * sz + x]; \
+ } \
+ } \
+ } \
+ } while(0)
+
+// wht function copied from libvpx
+static void fwht_1d(double *out, const double *in, int sz)
+{
+ double t0 = in[0] + in[1];
+ double t3 = in[3] - in[2];
+ double t4 = trunc((t0 - t3) * 0.5);
+ double t1 = t4 - in[1];
+ double t2 = t4 - in[2];
+
+ out[0] = t0 - t2;
+ out[1] = t2;
+ out[2] = t3 + t1;
+ out[3] = t1;
+}
+
+// standard DCT-II
+static void fdct_1d(double *out, const double *in, int sz)
+{
+ int k, n;
+
+ for (k = 0; k < sz; k++) {
+ out[k] = 0.0;
+ for (n = 0; n < sz; n++)
+ out[k] += in[n] * cos(M_PI * (2 * n + 1) * k / (sz * 2.0));
+ }
+ out[0] *= M_SQRT1_2;
+}
+
+// see "Towards jointly optimal spatial prediction and adaptive transform in
+// video/image coding", by J. Han, A. Saxena, and K. Rose
+// IEEE Proc. ICASSP, pp. 726-729, Mar. 2010.
+static void fadst4_1d(double *out, const double *in, int sz)
+{
+ int k, n;
+
+ for (k = 0; k < sz; k++) {
+ out[k] = 0.0;
+ for (n = 0; n < sz; n++)
+ out[k] += in[n] * sin(M_PI * (n + 1) * (2 * k + 1) / (sz * 2.0 + 1.0));
+ }
+}
+
+// see "A Butterfly Structured Design of The Hybrid Transform Coding Scheme",
+// by Jingning Han, Yaowu Xu, and Debargha Mukherjee
+// http://static.googleusercontent.com/media/research.google.com/en//pubs/archive/41418.pdf
+static void fadst_1d(double *out, const double *in, int sz)
+{
+ int k, n;
+
+ for (k = 0; k < sz; k++) {
+ out[k] = 0.0;
+ for (n = 0; n < sz; n++)
+ out[k] += in[n] * sin(M_PI * (2 * n + 1) * (2 * k + 1) / (sz * 4.0));
+ }
+}
+
+typedef void (*ftx1d_fn)(double *out, const double *in, int sz);
+static void ftx_2d(double *out, const double *in, enum TxfmMode tx,
+ enum TxfmType txtp, int sz)
+{
+ static const double scaling_factors[5][4] = {
+ { 4.0, 16.0 * M_SQRT1_2 / 3.0, 16.0 * M_SQRT1_2 / 3.0, 32.0 / 9.0 },
+ { 2.0, 2.0, 2.0, 2.0 },
+ { 1.0, 1.0, 1.0, 1.0 },
+ { 0.25 },
+ { 4.0 }
+ };
+ static const ftx1d_fn ftx1d_tbl[5][4][2] = {
+ {
+ { fdct_1d, fdct_1d },
+ { fadst4_1d, fdct_1d },
+ { fdct_1d, fadst4_1d },
+ { fadst4_1d, fadst4_1d },
+ }, {
+ { fdct_1d, fdct_1d },
+ { fadst_1d, fdct_1d },
+ { fdct_1d, fadst_1d },
+ { fadst_1d, fadst_1d },
+ }, {
+ { fdct_1d, fdct_1d },
+ { fadst_1d, fdct_1d },
+ { fdct_1d, fadst_1d },
+ { fadst_1d, fadst_1d },
+ }, {
+ { fdct_1d, fdct_1d },
+ }, {
+ { fwht_1d, fwht_1d },
+ },
+ };
+ double temp[1024];
+ double scaling_factor = scaling_factors[tx][txtp];
+ int i, j;
+
+ // cols
+ for (i = 0; i < sz; ++i) {
+ double temp_out[32];
+
+ ftx1d_tbl[tx][txtp][0](temp_out, &in[i * sz], sz);
+ // scale and transpose
+ for (j = 0; j < sz; ++j)
+ temp[j * sz + i] = temp_out[j] * scaling_factor;
+ }
+
+ // rows
+ for (i = 0; i < sz; i++)
+ ftx1d_tbl[tx][txtp][1](&out[i * sz], &temp[i * sz], sz);
+}
+
+static void ftx(int16_t *buf, enum TxfmMode tx,
+ enum TxfmType txtp, int sz, int bit_depth)
+{
+ double ind[1024], outd[1024];
+ int n;
+
+ emms_c();
+ for (n = 0; n < sz * sz; n++) {
+ if (bit_depth == 8)
+ ind[n] = buf[n];
+ else
+ ind[n] = ((int32_t *) buf)[n];
+ }
+ ftx_2d(outd, ind, tx, txtp, sz);
+ for (n = 0; n < sz * sz; n++) {
+ if (bit_depth == 8)
+ buf[n] = lrint(outd[n]);
+ else
+ ((int32_t *) buf)[n] = lrint(outd[n]);
+ }
+}
+
+static int copy_subcoefs(int16_t *out, const int16_t *in, enum TxfmMode tx,
+ enum TxfmType txtp, int sz, int sub, int bit_depth)
+{
+ // copy the topleft coefficients such that the return value (being the
+ // coefficient scantable index for the eob token) guarantees that only
+ // the topleft $sub out of $sz (where $sz >= $sub) coefficients in both
+ // dimensions are non-zero. This leads to braching to specific optimized
+ // simd versions (e.g. dc-only) so that we get full asm coverage in this
+ // test
+
+ int n;
+ const int16_t *scan = vp9_scans[tx][txtp];
+ int eob;
+
+ for (n = 0; n < sz * sz; n++) {
+ int rc = scan[n], rcx = rc % sz, rcy = rc / sz;
+
+ // find eob for this sub-idct
+ if (rcx >= sub || rcy >= sub)
+ break;
+
+ // copy coef
+ if (bit_depth == 8) {
+ out[rc] = in[rc];
+ } else {
+ AV_COPY32(&out[rc * 2], &in[rc * 2]);
+ }
+ }
-#define BIT_DEPTH 8
-#define SIZEOF_PIXEL ((BIT_DEPTH + 7) / 8)
+ eob = n;
+
+ for (; n < sz * sz; n++) {
+ int rc = scan[n];
+
+ // zero
+ if (bit_depth == 8) {
+ out[rc] = 0;
+ } else {
+ AV_ZERO32(&out[rc * 2]);
+ }
+ }
+
+ return eob;
+}
+
+static int iszero(const int16_t *c, int sz)
+{
+ int n;
+
+ for (n = 0; n < sz / sizeof(int16_t); n += 2)
+ if (AV_RN32A(&c[n]))
+ return 0;
+
+ return 1;
+}
+
+#define SIZEOF_COEF (2 * ((bit_depth + 7) / 8))
+
+static void check_itxfm(void)
+{
+ LOCAL_ALIGNED_32(uint8_t, src, [32 * 32 * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst, [32 * 32 * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0, [32 * 32 * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1, [32 * 32 * 2]);
+ LOCAL_ALIGNED_32(int16_t, coef, [32 * 32 * 2]);
+ LOCAL_ALIGNED_32(int16_t, subcoef0, [32 * 32 * 2]);
+ LOCAL_ALIGNED_32(int16_t, subcoef1, [32 * 32 * 2]);
+ declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+ VP9DSPContext dsp;
+ int y, x, tx, txtp, bit_depth, sub;
+ static const char *const txtp_types[N_TXFM_TYPES] = {
+ [DCT_DCT] = "dct_dct", [DCT_ADST] = "adst_dct",
+ [ADST_DCT] = "dct_adst", [ADST_ADST] = "adst_adst"
+ };
+
+ for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+ ff_vp9dsp_init(&dsp, bit_depth, 0);
+
+ for (tx = TX_4X4; tx <= N_TXFM_SIZES /* 4 = lossless */; tx++) {
+ int sz = 4 << (tx & 3);
+ int n_txtps = tx < TX_32X32 ? N_TXFM_TYPES : 1;
+
+ for (txtp = 0; txtp < n_txtps; txtp++) {
+ // skip testing sub-IDCTs for WHT or ADST since they don't
+ // implement it in any of the SIMD functions. If they do,
+ // consider changing this to ensure we have complete test
+ // coverage. Test sub=1 for dc-only, then 2, 4, 8, 12, etc,
+ // since the arm version can distinguish them at that level.
+ for (sub = (txtp == 0 && tx < 4) ? 1 : sz; sub <= sz;
+ sub < 4 ? (sub <<= 1) : (sub += 4)) {
+ if (check_func(dsp.itxfm_add[tx][txtp],
+ "vp9_inv_%s_%dx%d_sub%d_add_%d",
+ tx == 4 ? "wht_wht" : txtp_types[txtp],
+ sz, sz, sub, bit_depth)) {
+ int eob;
+
+ randomize_buffers();
+ ftx(coef, tx, txtp, sz, bit_depth);
+
+ if (sub < sz) {
+ eob = copy_subcoefs(subcoef0, coef, tx, txtp,
+ sz, sub, bit_depth);
+ } else {
+ eob = sz * sz;
+ memcpy(subcoef0, coef, sz * sz * SIZEOF_COEF);
+ }
+
+ memcpy(dst0, dst, sz * sz * SIZEOF_PIXEL);
+ memcpy(dst1, dst, sz * sz * SIZEOF_PIXEL);
+ memcpy(subcoef1, subcoef0, sz * sz * SIZEOF_COEF);
+ call_ref(dst0, sz * SIZEOF_PIXEL, subcoef0, eob);
+ call_new(dst1, sz * SIZEOF_PIXEL, subcoef1, eob);
+ if (memcmp(dst0, dst1, sz * sz * SIZEOF_PIXEL) ||
+ !iszero(subcoef0, sz * sz * SIZEOF_COEF) ||
+ !iszero(subcoef1, sz * sz * SIZEOF_COEF))
+ fail();
+
+ bench_new(dst, sz * SIZEOF_PIXEL, coef, eob);
+ }
+ }
+ }
+ }
+ }
+ report("itxfm");
+}
+
+#undef randomize_buffers
#define setpx(a,b,c) \
do { \
if (SIZEOF_PIXEL == 1) { \
buf0[(a) + (b) * jstride] = av_clip_uint8(c); \
} else { \
- ((uint16_t *)buf0)[(a) + (b) * jstride] = av_clip_uintp2(c, BIT_DEPTH); \
+ ((uint16_t *)buf0)[(a) + (b) * jstride] = av_clip_uintp2(c, bit_depth); \
} \
} while (0)
-#define setdx(a,b,c,d) setpx(a,b,c-(d)+(rnd()%((d)*2+1)))
-#define setsx(a,b,c,d) setdx(a,b,c,(d) << (BIT_DEPTH - 8))
+// c can be an assignment and must not be put under ()
+#define setdx(a,b,c,d) setpx(a,b,c-(d)+(rnd()%((d)*2+1)))
+#define setsx(a,b,c,d) setdx(a,b,c,(d) << (bit_depth - 8))
static void randomize_loopfilter_buffers(int bidx, int lineoff, int str,
- int bit_depth, int dir,
- const int *E, const int *F,
- const int *H, const int *I,
+ int bit_depth, int dir, const int *E,
+ const int *F, const int *H, const int *I,
uint8_t *buf0, uint8_t *buf1)
{
- uint32_t mask = (1 << BIT_DEPTH) - 1;
+ uint32_t mask = (1 << bit_depth) - 1;
int off = dir ? lineoff : lineoff * 16;
int istride = dir ? 1 : 16;
int jstride = dir ? str : 1;
@@ -100,84 +443,83 @@ static void randomize_loopfilter_buffers(int bidx, int lineoff, int str,
}
}
}
-
-#define randomize_buffers(bidx, lineoff, str) \
- randomize_loopfilter_buffers(bidx, lineoff, str, BIT_DEPTH, dir, \
- E, F, H, I, buf0, buf1)
+#define randomize_buffers(bidx, lineoff, str) \
+ randomize_loopfilter_buffers(bidx, lineoff, str, bit_depth, dir, \
+ E, F, H, I, buf0, buf1)
static void check_loopfilter(void)
{
LOCAL_ALIGNED_32(uint8_t, base0, [32 + 16 * 16 * 2]);
LOCAL_ALIGNED_32(uint8_t, base1, [32 + 16 * 16 * 2]);
VP9DSPContext dsp;
- int dir, wd, wd2;
+ int dir, wd, wd2, bit_depth;
static const char *const dir_name[2] = { "h", "v" };
static const int E[2] = { 20, 28 }, I[2] = { 10, 16 };
- static const int H[2] = { 7, 11 }, F[2] = { 1, 1 };
- declare_func(void, uint8_t *dst, ptrdiff_t stride, int E, int I, int H);
-
- ff_vp9dsp_init(&dsp);
-
- for (dir = 0; dir < 2; dir++) {
- uint8_t *buf0, *buf1;
- int midoff = (dir ? 8 * 8 : 8) * SIZEOF_PIXEL;
- int midoff_aligned = (dir ? 8 * 8 : 16) * SIZEOF_PIXEL;
-
- buf0 = base0 + midoff_aligned;
- buf1 = base1 + midoff_aligned;
-
- for (wd = 0; wd < 3; wd++) {
- // 4/8/16wd_8px
- if (check_func(dsp.loop_filter_8[wd][dir],
- "vp9_loop_filter_%s_%d_8",
- dir_name[dir], 4 << wd)) {
- randomize_buffers(0, 0, 8);
- memcpy(buf1 - midoff, buf0 - midoff,
- 16 * 8 * SIZEOF_PIXEL);
- call_ref(buf0, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
- call_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
- if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 8 * SIZEOF_PIXEL))
- fail();
- bench_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
- }
- }
+ static const int H[2] = { 7, 11 }, F[2] = { 1, 1 };
+ declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t stride, int E, int I, int H);
- midoff = (dir ? 16 * 8 : 8) * SIZEOF_PIXEL;
- midoff_aligned = (dir ? 16 * 8 : 16) * SIZEOF_PIXEL;
-
- buf0 = base0 + midoff_aligned;
- buf1 = base1 + midoff_aligned;
-
- // 16wd_16px loopfilter
- if (check_func(dsp.loop_filter_16[dir],
- "vp9_loop_filter_%s_16_16",
- dir_name[dir])) {
- randomize_buffers(0, 0, 16);
- randomize_buffers(0, 8, 16);
- memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
- call_ref(buf0, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
- call_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
- if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
- fail();
- bench_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
- }
+ for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+ ff_vp9dsp_init(&dsp, bit_depth, 0);
- for (wd = 0; wd < 2; wd++) {
- for (wd2 = 0; wd2 < 2; wd2++) {
- // mix2 loopfilter
- if (check_func(dsp.loop_filter_mix2[wd][wd2][dir],
- "vp9_loop_filter_mix2_%s_%d%d_16",
- dir_name[dir], 4 << wd, 4 << wd2)) {
- randomize_buffers(0, 0, 16);
- randomize_buffers(1, 8, 16);
- memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
-#define M(a) ((a[1] << 8) | a[0])
- call_ref(buf0, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
- call_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
- if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
+ for (dir = 0; dir < 2; dir++) {
+ int midoff = (dir ? 8 * 8 : 8) * SIZEOF_PIXEL;
+ int midoff_aligned = (dir ? 8 * 8 : 16) * SIZEOF_PIXEL;
+ uint8_t *buf0 = base0 + midoff_aligned;
+ uint8_t *buf1 = base1 + midoff_aligned;
+
+ for (wd = 0; wd < 3; wd++) {
+ // 4/8/16wd_8px
+ if (check_func(dsp.loop_filter_8[wd][dir],
+ "vp9_loop_filter_%s_%d_8_%dbpp",
+ dir_name[dir], 4 << wd, bit_depth)) {
+ randomize_buffers(0, 0, 8);
+ memcpy(buf1 - midoff, buf0 - midoff,
+ 16 * 8 * SIZEOF_PIXEL);
+ call_ref(buf0, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
+ call_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
+ if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 8 * SIZEOF_PIXEL))
fail();
- bench_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
+ bench_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
+ }
+ }
+
+ midoff = (dir ? 16 * 8 : 8) * SIZEOF_PIXEL;
+ midoff_aligned = (dir ? 16 * 8 : 16) * SIZEOF_PIXEL;
+
+ buf0 = base0 + midoff_aligned;
+ buf1 = base1 + midoff_aligned;
+
+ // 16wd_16px loopfilter
+ if (check_func(dsp.loop_filter_16[dir],
+ "vp9_loop_filter_%s_16_16_%dbpp",
+ dir_name[dir], bit_depth)) {
+ randomize_buffers(0, 0, 16);
+ randomize_buffers(0, 8, 16);
+ memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
+ call_ref(buf0, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
+ call_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
+ if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
+ fail();
+ bench_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
+ }
+
+ for (wd = 0; wd < 2; wd++) {
+ for (wd2 = 0; wd2 < 2; wd2++) {
+ // mix2 loopfilter
+ if (check_func(dsp.loop_filter_mix2[wd][wd2][dir],
+ "vp9_loop_filter_mix2_%s_%d%d_16_%dbpp",
+ dir_name[dir], 4 << wd, 4 << wd2, bit_depth)) {
+ randomize_buffers(0, 0, 16);
+ randomize_buffers(1, 8, 16);
+ memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
+#define M(a) (((a)[1] << 8) | (a)[0])
+ call_ref(buf0, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
+ call_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
+ if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
+ fail();
+ bench_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
#undef M
+ }
}
}
}
@@ -197,7 +539,7 @@ static void check_loopfilter(void)
#define randomize_buffers() \
do { \
- uint32_t mask = pixel_mask[(BIT_DEPTH - 8) >> 1]; \
+ uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \
int k; \
for (k = 0; k < SRC_BUF_SIZE; k += 4) { \
uint32_t r = rnd() & mask; \
@@ -214,62 +556,63 @@ static void check_loopfilter(void)
static void check_mc(void)
{
+ LOCAL_ALIGNED_32(uint8_t, buf, [72 * 72 * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst0, [64 * 64 * 2]);
+ LOCAL_ALIGNED_32(uint8_t, dst1, [64 * 64 * 2]);
+ VP9DSPContext dsp;
+ int op, hsize, bit_depth, filter, dx, dy;
+ declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dst_stride,
+ const uint8_t *ref, ptrdiff_t ref_stride,
+ int h, int mx, int my);
static const char *const filter_names[4] = {
"8tap_smooth", "8tap_regular", "8tap_sharp", "bilin"
};
static const char *const subpel_names[2][2] = { { "", "h" }, { "v", "hv" } };
static const char *const op_names[2] = { "put", "avg" };
-
- LOCAL_ALIGNED_32(uint8_t, buf, [72 * 72 * 2]);
- LOCAL_ALIGNED_32(uint8_t, dst0, [64 * 64 * 2]);
- LOCAL_ALIGNED_32(uint8_t, dst1, [64 * 64 * 2]);
char str[256];
- VP9DSPContext dsp;
- int op, hsize, filter, dx, dy;
-
- declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT,
- void, uint8_t *dst, const uint8_t *ref,
- ptrdiff_t dst_stride, ptrdiff_t ref_stride,
- int h, int mx, int my);
for (op = 0; op < 2; op++) {
- ff_vp9dsp_init(&dsp);
- for (hsize = 0; hsize < 5; hsize++) {
- int size = 64 >> hsize;
-
- for (filter = 0; filter < 4; filter++) {
- for (dx = 0; dx < 2; dx++) {
- for (dy = 0; dy < 2; dy++) {
- if (dx || dy) {
- snprintf(str, sizeof(str), "%s_%s_%d%s", op_names[op],
- filter_names[filter], size,
- subpel_names[dy][dx]);
- } else {
- snprintf(str, sizeof(str), "%s%d", op_names[op], size);
- }
- if (check_func(dsp.mc[hsize][filter][op][dx][dy],
- "vp9_%s", str)) {
- int mx = dx ? 1 + (rnd() % 14) : 0;
- int my = dy ? 1 + (rnd() % 14) : 0;
- randomize_buffers();
- call_ref(dst0, src,
- size * SIZEOF_PIXEL,
- SRC_BUF_STRIDE * SIZEOF_PIXEL,
- size, mx, my);
- call_new(dst1, src,
- size * SIZEOF_PIXEL,
- SRC_BUF_STRIDE * SIZEOF_PIXEL,
- size, mx, my);
- if (memcmp(dst0, dst1, DST_BUF_SIZE))
- fail();
-
- // SIMD implementations for each filter of subpel
- // functions are identical
- if (filter >= 1 && filter <= 2) continue;
-
- bench_new(dst1, src, size * SIZEOF_PIXEL,
- SRC_BUF_STRIDE * SIZEOF_PIXEL,
- size, mx, my);
+ for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+ ff_vp9dsp_init(&dsp, bit_depth, 0);
+ for (hsize = 0; hsize < 5; hsize++) {
+ int size = 64 >> hsize;
+
+ for (filter = 0; filter < 4; filter++) {
+ for (dx = 0; dx < 2; dx++) {
+ for (dy = 0; dy < 2; dy++) {
+ if (dx || dy) {
+ snprintf(str, sizeof(str),
+ "%s_%s_%d%s", op_names[op],
+ filter_names[filter], size,
+ subpel_names[dy][dx]);
+ } else {
+ snprintf(str, sizeof(str),
+ "%s%d", op_names[op], size);
+ }
+ if (check_func(dsp.mc[hsize][filter][op][dx][dy],
+ "vp9_%s_%dbpp", str, bit_depth)) {
+ int mx = dx ? 1 + (rnd() % 14) : 0;
+ int my = dy ? 1 + (rnd() % 14) : 0;
+ randomize_buffers();
+ call_ref(dst0, size * SIZEOF_PIXEL,
+ src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
+ size, mx, my);
+ call_new(dst1, size * SIZEOF_PIXEL,
+ src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
+ size, mx, my);
+ if (memcmp(dst0, dst1, DST_BUF_SIZE))
+ fail();
+
+ // simd implementations for each filter of subpel
+ // functions are identical
+ if (filter >= 1 && filter <= 2) continue;
+ // 10/12 bpp for bilin are identical
+ if (bit_depth == 12 && filter == 3) continue;
+
+ bench_new(dst1, size * SIZEOF_PIXEL,
+ src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
+ size, mx, my);
+ }
}
}
}
@@ -281,6 +624,8 @@ static void check_mc(void)
void checkasm_check_vp9dsp(void)
{
+ check_ipred();
+ check_itxfm();
check_loopfilter();
check_mc();
}
diff --git a/tests/checkasm/x86/checkasm.asm b/tests/checkasm/x86/checkasm.asm
index 55212fc..d12333b 100644
--- a/tests/checkasm/x86/checkasm.asm
+++ b/tests/checkasm/x86/checkasm.asm
@@ -3,14 +3,14 @@
;* Copyright (c) 2008 Loren Merritt
;* Copyright (c) 2012 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.
OpenPOWER on IntegriCloud