Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2013-10-25 18:41:50 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-10-27 13:15:56 +0400
commit7b0f61a93604cceab66302aafdfdbc2336056c9b (patch)
tree4a0e852b4f708b5571cf5315535fd1824e95c736 /tests/fate
parent3b56f665b1cdb412d6916aac975664f45fceb938 (diff)
FATE: update HEVC tests
This changes the tests that used the internal hevc checksum to use framecrc Signed-off-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: tests/fate/hevc.mak tests/ref/fate/hevc-conformance-DBLK_A_SONY_3 tests/ref/fate/hevc-conformance-DBLK_B_SONY_3 tests/ref/fate/hevc-conformance-DBLK_C_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3 tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3 tests/ref/fate/hevc-conformance-POC_A_Bossen_3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/hevc.mak110
1 files changed, 51 insertions, 59 deletions
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index b3fa6cff54..e15497dcb1 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -1,6 +1,12 @@
-# those samples have the checksums embedded, so the decoder itself can test
-# correctness
-FATE_HEVC_SEI = \
+HEVC_SAMPLES = \
+ AMP_A_Samsung_4 \
+ AMP_B_Samsung_4 \
+ AMVP_C_Samsung_4 \
+ AMP_D_Hisilicon \
+ AMP_E_Hisilicon \
+ AMP_F_Hisilicon_3 \
+ AMVP_A_MTK_4 \
+ AMVP_B_MTK_4 \
CAINIT_A_SHARP_4 \
CAINIT_B_SHARP_4 \
CAINIT_C_SHARP_3 \
@@ -12,6 +18,19 @@ FATE_HEVC_SEI = \
CIP_A_Panasonic_3 \
cip_B_NEC_2 \
CIP_C_Panasonic_2 \
+ DBLK_A_SONY_3 \
+ DBLK_B_SONY_3 \
+ DBLK_C_SONY_3 \
+ DBLK_D_VIXS_1 \
+ DBLK_D_VIXS_2 \
+ DBLK_E_VIXS_1 \
+ DBLK_E_VIXS_2 \
+ DBLK_F_VIXS_1 \
+ DBLK_F_VIXS_2 \
+ DBLK_G_VIXS_1 \
+ DBLK_G_VIXS_2 \
+ DELTAQP_B_SONY_3 \
+ DELTAQP_C_SONY_3 \
DSLICE_A_HHI_5 \
DSLICE_B_HHI_5 \
DSLICE_C_HHI_5 \
@@ -36,22 +55,30 @@ FATE_HEVC_SEI = \
MERGE_C_TI_3 \
MERGE_D_TI_3 \
MERGE_E_TI_3 \
+ MERGE_F_MTK_4 \
MERGE_G_HHI_4 \
MVCLIP_A_qualcomm_3 \
MVDL1ZERO_A_docomo_3 \
MVEDGE_A_qualcomm_3 \
NUT_A_ericsson_4 \
+ PICSIZE_A_Bossen_1 \
+ PICSIZE_B_Bossen_1 \
+ PICSIZE_C_Bossen_1 \
+ PICSIZE_D_Bossen_1 \
PMERGE_A_TI_3 \
PMERGE_B_TI_3 \
PMERGE_C_TI_3 \
PMERGE_D_TI_3 \
PMERGE_E_TI_3 \
+ POC_A_Bossen_3 \
PPS_A_qualcomm_7 \
+ RAP_A_docomo_4 \
PS_A_VIDYO_3 \
PS_B_VIDYO_3 \
RAP_B_Bossen_1 \
RPLM_A_qualcomm_4 \
RPLM_B_qualcomm_4 \
+ RPS_A_docomo_4 \
RPS_B_qualcomm_5 \
RPS_C_ericsson_4 \
RPS_D_ericsson_5 \
@@ -65,25 +92,38 @@ FATE_HEVC_SEI = \
RQT_G_HHI_4 \
SAO_A_MediaTek_4 \
SAO_B_MediaTek_5 \
+ SAO_C_Samsung_4 \
+ SAO_D_Samsung_4 \
+ SAO_E_Canon_4 \
+ SAO_F_Canon_3 \
+ SAO_G_Canon_3 \
SDH_A_Orange_3 \
SLICES_A_Rovi_3 \
SLIST_A_Sony_4 \
SLIST_B_Sony_8 \
SLIST_C_Sony_3 \
SLIST_D_Sony_9 \
+ STRUCT_A_Samsung_5 \
+ STRUCT_B_Samsung_4 \
+ TILES_A_Cisco_2 \
+ TILES_B_Cisco_1 \
+ TMVP_A_MS_2 \
TSCL_A_VIDYO_5 \
TSCL_B_VIDYO_4 \
TSKIP_A_MS_2 \
WP_A_Toshiba_3 \
WP_B_Toshiba_3 \
- WP_A_MAIN10_Toshiba_3 \
- WP_MAIN10_B_Toshiba_3 \
WPP_A_ericsson_MAIN_2 \
WPP_B_ericsson_MAIN_2 \
WPP_C_ericsson_MAIN_2 \
WPP_D_ericsson_MAIN_2 \
WPP_E_ericsson_MAIN_2 \
WPP_F_ericsson_MAIN_2 \
+
+HEVC_SAMPLES_10BIT = \
+ DBLK_A_MAIN10_VIXS_2 \
+ WP_A_MAIN10_Toshiba_3 \
+ WP_MAIN10_B_Toshiba_3 \
WPP_A_ericsson_MAIN10_2 \
WPP_B_ericsson_MAIN10_2 \
WPP_C_ericsson_MAIN10_2 \
@@ -96,66 +136,18 @@ FATE_HEVC_SEI = \
# HRD_A_Fujitsu_2.bin -- TODO uses hash 2 ("checksum")
# TSUNEQBD_A_MAIN10_Technicolor_2.bit (segfault)
-define FATE_HEVC_SEI_TEST
+define FATE_HEVC_TEST
FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = ffmpeg -err_detect +explode -xerror -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -f null -
-fate-hevc-conformance-$(1): CMP = null
-fate-hevc-conformance-$(1): REF = /dev/null
+fate-hevc-conformance-$(1): CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
endef
-$(foreach N,$(FATE_HEVC_SEI),$(eval $(call FATE_HEVC_SEI_TEST,$(N))))
-
-# those samples don't have embedded checksums, so we test them with framecrc
-FATE_HEVC_FRAMECRC = \
- AMP_A_Samsung_4 \
- AMP_B_Samsung_4 \
- AMVP_C_Samsung_4 \
- AMP_D_Hisilicon \
- AMP_E_Hisilicon \
- AMP_F_Hisilicon_3 \
- AMVP_A_MTK_4 \
- AMVP_B_MTK_4 \
- DBLK_A_SONY_3 \
- DBLK_B_SONY_3 \
- DBLK_C_SONY_3 \
- DBLK_D_VIXS_1 \
- DBLK_D_VIXS_2 \
- DBLK_E_VIXS_1 \
- DBLK_E_VIXS_2 \
- DBLK_F_VIXS_1 \
- DBLK_F_VIXS_2 \
- DBLK_G_VIXS_1 \
- DBLK_G_VIXS_2 \
- DELTAQP_B_SONY_3 \
- DELTAQP_C_SONY_3 \
- MERGE_F_MTK_4 \
- PICSIZE_A_Bossen_1 \
- PICSIZE_B_Bossen_1 \
- PICSIZE_C_Bossen_1 \
- PICSIZE_D_Bossen_1 \
- POC_A_Bossen_3 \
- RAP_A_docomo_4 \
- RPS_A_docomo_4 \
- SAO_C_Samsung_4 \
- SAO_D_Samsung_4 \
- SAO_E_Canon_4 \
- SAO_F_Canon_3 \
- SAO_G_Canon_3 \
- STRUCT_A_Samsung_5 \
- STRUCT_B_Samsung_4 \
- TILES_A_Cisco_2 \
- TILES_B_Cisco_1 \
- TMVP_A_MS_2 \
-
-define FATE_HEVC_FRAMECRC_TEST
+define FATE_HEVC_TEST_10BIT
FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+fate-hevc-conformance-$(1): CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le
endef
-$(foreach N,$(FATE_HEVC_FRAMECRC),$(eval $(call FATE_HEVC_FRAMECRC_TEST,$(N))))
-
-FATE_HEVC += fate-hevc-conformance-DBLK_A_MAIN10_VIXS_2
-fate-hevc-conformance-DBLK_A_MAIN10_VIXS_2: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/DBLK_A_MAIN10_VIXS_2.bit -pix_fmt yuv420p10le
+$(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N))))
+$(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N))))
FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)