[FFmpeg-cvslog] Revert "checkasm/vf_interlace : add test for lowpass_line 8 and 16"
James Almer
git at videolan.org
Wed Dec 20 00:08:20 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Dec 19 19:07:24 2017 -0300| [da032427786d9db4ab21014998cb1245083d6c85] | committer: James Almer
Revert "checkasm/vf_interlace : add test for lowpass_line 8 and 16"
This reverts commit adff97be5e2ff51c0bb66080c2f904ed40b6c571.
It currently fails on Windows targets.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da032427786d9db4ab21014998cb1245083d6c85
---
tests/checkasm/Makefile | 1 -
tests/checkasm/checkasm.c | 3 --
tests/checkasm/checkasm.h | 1 -
tests/checkasm/vf_interlace.c | 78 -------------------------------------------
tests/fate/checkasm.mak | 1 -
5 files changed, 84 deletions(-)
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 6b5b1684a7..3525094545 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -33,7 +33,6 @@ CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes)
AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o
AVFILTEROBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
-AVFILTEROBJS-$(CONFIG_INTERLACE_FILTER) += vf_interlace.o
AVFILTEROBJS-$(CONFIG_THRESHOLD_FILTER) += vf_threshold.o
CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 8a9480c3ca..45a70aa87f 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -155,9 +155,6 @@ static const struct {
#if CONFIG_HFLIP_FILTER
{ "vf_hflip", checkasm_check_vf_hflip },
#endif
- #if CONFIG_INTERLACE_FILTER
- { "vf_interlace", checkasm_check_vf_interlace },
- #endif
#if CONFIG_THRESHOLD_FILTER
{ "vf_threshold", checkasm_check_vf_threshold },
#endif
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index ec57c8a26f..cfe9bfb355 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -66,7 +66,6 @@ void checkasm_check_synth_filter(void);
void checkasm_check_utvideodsp(void);
void checkasm_check_v210enc(void);
void checkasm_check_vf_hflip(void);
-void checkasm_check_vf_interlace(void);
void checkasm_check_vf_threshold(void);
void checkasm_check_vp8dsp(void);
void checkasm_check_vp9dsp(void);
diff --git a/tests/checkasm/vf_interlace.c b/tests/checkasm/vf_interlace.c
deleted file mode 100644
index d5984c0fc1..0000000000
--- a/tests/checkasm/vf_interlace.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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/interlace.h"
-#include "libavutil/intreadwrite.h"
-
-#define WIDTH 256
-#define WIDTH_PADDED 256 + 32
-#define SRC_SIZE WIDTH_PADDED*3
-
-#define randomize_buffers(buf, size) \
- do { \
- int j; \
- uint8_t *tmp_buf = (uint8_t *)buf;\
- for (j = 0; j < size; j++) \
- tmp_buf[j] = rnd() & 0xFF; \
- } while (0)
-
-static void check_lowpass_line(int depth){
- LOCAL_ALIGNED_32(uint8_t, src, [SRC_SIZE]);
- LOCAL_ALIGNED_32(uint8_t, dst_ref, [WIDTH_PADDED]);
- LOCAL_ALIGNED_32(uint8_t, dst_new, [WIDTH_PADDED]);
- int w = WIDTH;
- int mref = WIDTH_PADDED * -1;
- int pref = WIDTH_PADDED;
- int i, depth_byte;
- InterlaceContext s;
-
- declare_func(void, uint8_t *dstp, ptrdiff_t linesize, const uint8_t *srcp,
- ptrdiff_t mref, ptrdiff_t pref, int clip_max);
-
- s.lowpass = 1;
- s.lowpass = VLPF_LIN;
- depth_byte = depth >> 3;
- w /= depth_byte;
-
- memset(src, 0, SRC_SIZE);
- memset(dst_ref, 0, WIDTH_PADDED);
- memset(dst_new, 0, WIDTH_PADDED);
- randomize_buffers(src, SRC_SIZE);
-
- ff_interlace_init(&s, depth);
-
- if (check_func(s.lowpass_line, "lowpass_line_%d", depth)) {
- for (i = 0; i < 32; i++) { /* simulate crop */
- call_ref(dst_ref, w, src + WIDTH_PADDED, mref - i*depth_byte, pref, 0);
- call_new(dst_new, w, src + WIDTH_PADDED, mref - i*depth_byte, pref, 0);
- if (memcmp(dst_ref, dst_new, WIDTH - i))
- fail();
- }
- bench_new(dst_new, w, src + WIDTH_PADDED, mref, pref, 0);
- }
-}
-void checkasm_check_vf_interlace(void)
-{
- check_lowpass_line(8);
- report("lowpass_line_8");
-
- check_lowpass_line(16);
- report("lowpass_line_16");
-}
diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
index 03f640b31f..9216c71cb8 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -23,7 +23,6 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \
fate-checkasm-vf_blend \
fate-checkasm-vf_colorspace \
fate-checkasm-vf_hflip \
- fate-checkasm-vf_interlace \
fate-checkasm-vf_threshold \
fate-checkasm-videodsp \
fate-checkasm-vp8dsp \
More information about the ffmpeg-cvslog
mailing list