[FFmpeg-cvslog] checkasm: collapse hevc pel tests
J. Dekker
git at videolan.org
Tue Aug 24 23:12:24 EEST 2021
ffmpeg | branch: master | J. Dekker <jdek at itanimul.li> | Thu Aug 5 10:26:48 2021 +0200| [b492cacffd36ad4cb251ba1f13ac398318ee639a] | committer: Thilo Borgmann
checkasm: collapse hevc pel tests
Also add to `make fate-checkasm' target.
Signed-off-by: J. Dekker <jdek at itanimul.li>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b492cacffd36ad4cb251ba1f13ac398318ee639a
---
tests/checkasm/checkasm.c | 11 +----------
tests/checkasm/checkasm.h | 11 +----------
tests/checkasm/hevc_pel.c | 34 ++++++++++++++++++++++++----------
tests/fate/checkasm.mak | 1 +
4 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index be5c17cd2a..b1353f7cbe 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -116,16 +116,7 @@ static const struct {
#if CONFIG_HEVC_DECODER
{ "hevc_add_res", checkasm_check_hevc_add_res },
{ "hevc_idct", checkasm_check_hevc_idct },
- { "hevc_qpel", checkasm_check_hevc_qpel },
- { "hevc_qpel_uni", checkasm_check_hevc_qpel_uni },
- { "hevc_qpel_uni_w", checkasm_check_hevc_qpel_uni_w },
- { "hevc_qpel_bi", checkasm_check_hevc_qpel_bi },
- { "hevc_qpel_bi_w", checkasm_check_hevc_qpel_bi_w },
- { "hevc_epel", checkasm_check_hevc_epel },
- { "hevc_epel_uni", checkasm_check_hevc_epel_uni },
- { "hevc_epel_uni_w", checkasm_check_hevc_epel_uni_w },
- { "hevc_epel_bi", checkasm_check_hevc_epel_bi },
- { "hevc_epel_bi_w", checkasm_check_hevc_epel_bi_w },
+ { "hevc_pel", checkasm_check_hevc_pel },
{ "hevc_sao", checkasm_check_hevc_sao },
#endif
#if CONFIG_HUFFYUV_DECODER
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index b747ed1986..68b0697d3e 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -61,16 +61,7 @@ void checkasm_check_h264pred(void);
void checkasm_check_h264qpel(void);
void checkasm_check_hevc_add_res(void);
void checkasm_check_hevc_idct(void);
-void checkasm_check_hevc_qpel(void);
-void checkasm_check_hevc_qpel_uni(void);
-void checkasm_check_hevc_qpel_uni_w(void);
-void checkasm_check_hevc_qpel_bi(void);
-void checkasm_check_hevc_qpel_bi_w(void);
-void checkasm_check_hevc_epel(void);
-void checkasm_check_hevc_epel_uni(void);
-void checkasm_check_hevc_epel_uni_w(void);
-void checkasm_check_hevc_epel_bi(void);
-void checkasm_check_hevc_epel_bi_w(void);
+void checkasm_check_hevc_pel(void);
void checkasm_check_hevc_sao(void);
void checkasm_check_huffyuvdsp(void);
void checkasm_check_jpeg2000dsp(void);
diff --git a/tests/checkasm/hevc_pel.c b/tests/checkasm/hevc_pel.c
index 4d1545e467..ec24309081 100644
--- a/tests/checkasm/hevc_pel.c
+++ b/tests/checkasm/hevc_pel.c
@@ -65,7 +65,7 @@ static const int offsets[] = {0, 255, -1 };
#define src0 (buf0 + 2 * 4 * MAX_PB_SIZE) /* hevc qpel functions read data from negative src pointer offsets */
#define src1 (buf1 + 2 * 4 * MAX_PB_SIZE)
-void checkasm_check_hevc_qpel(void)
+static void checkasm_check_hevc_qpel(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -109,7 +109,7 @@ void checkasm_check_hevc_qpel(void)
report("qpel");
}
-void checkasm_check_hevc_qpel_uni(void)
+static void checkasm_check_hevc_qpel_uni(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -150,7 +150,7 @@ void checkasm_check_hevc_qpel_uni(void)
report("qpel_uni");
}
-void checkasm_check_hevc_qpel_uni_w(void)
+static void checkasm_check_hevc_qpel_uni_w(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -198,7 +198,7 @@ void checkasm_check_hevc_qpel_uni_w(void)
report("qpel_uni_w");
}
-void checkasm_check_hevc_qpel_bi(void)
+static void checkasm_check_hevc_qpel_bi(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -242,7 +242,7 @@ void checkasm_check_hevc_qpel_bi(void)
report("qpel_bi");
}
-void checkasm_check_hevc_qpel_bi_w(void)
+static void checkasm_check_hevc_qpel_bi_w(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -294,7 +294,7 @@ void checkasm_check_hevc_qpel_bi_w(void)
report("qpel_bi_w");
}
-void checkasm_check_hevc_epel(void)
+static void checkasm_check_hevc_epel(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -338,7 +338,7 @@ void checkasm_check_hevc_epel(void)
report("epel");
}
-void checkasm_check_hevc_epel_uni(void)
+static void checkasm_check_hevc_epel_uni(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -379,7 +379,7 @@ void checkasm_check_hevc_epel_uni(void)
report("epel_uni");
}
-void checkasm_check_hevc_epel_uni_w(void)
+static void checkasm_check_hevc_epel_uni_w(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -427,7 +427,7 @@ void checkasm_check_hevc_epel_uni_w(void)
report("epel_uni_w");
}
-void checkasm_check_hevc_epel_bi(void)
+static void checkasm_check_hevc_epel_bi(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -471,7 +471,7 @@ void checkasm_check_hevc_epel_bi(void)
report("epel_bi");
}
-void checkasm_check_hevc_epel_bi_w(void)
+static void checkasm_check_hevc_epel_bi_w(void)
{
LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]);
LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]);
@@ -522,3 +522,17 @@ void checkasm_check_hevc_epel_bi_w(void)
}
report("epel_bi_w");
}
+
+void checkasm_check_hevc_pel(void)
+{
+ checkasm_check_hevc_qpel();
+ checkasm_check_hevc_qpel_uni();
+ checkasm_check_hevc_qpel_uni_w();
+ checkasm_check_hevc_qpel_bi();
+ checkasm_check_hevc_qpel_bi_w();
+ checkasm_check_hevc_epel();
+ checkasm_check_hevc_epel_uni();
+ checkasm_check_hevc_epel_uni_w();
+ checkasm_check_hevc_epel_bi();
+ checkasm_check_hevc_epel_bi_w();
+}
diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
index 3108fcd510..cec6d28286 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -16,6 +16,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \
fate-checkasm-h264qpel \
fate-checkasm-hevc_add_res \
fate-checkasm-hevc_idct \
+ fate-checkasm-hevc_pel \
fate-checkasm-hevc_sao \
fate-checkasm-jpeg2000dsp \
fate-checkasm-llviddsp \
More information about the ffmpeg-cvslog
mailing list