From 98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 31 Dec 2013 14:29:03 +0100 Subject: [PATCH] hevc: add new conformance streams Also remove superseded conformance streams. The conformance streams all come from http://wftp3.itu.int/av-arch/jctvc-site/bitstream_exchange/draft_conformance/ Signed-off-by: Anton Khirnov --- tests/fate/hevc.mak | 7 ++- tests/ref/fate/hevc-conformance-RPS_F_docomo_1 | 51 ++++++++++++++++++++++ tests/ref/fate/hevc-conformance-TMVP_A_MS_2 | 18 -------- tests/ref/fate/hevc-conformance-TMVP_A_MS_3 | 18 ++++++++ tests/ref/fate/hevc-conformance-TSKIP_A_MS_2 | 18 -------- tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 | 18 ++++++++ tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 | 6 +++ tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 | 2 + 8 files changed, 100 insertions(+), 38 deletions(-) create mode 100644 tests/ref/fate/hevc-conformance-RPS_F_docomo_1 delete mode 100644 tests/ref/fate/hevc-conformance-TMVP_A_MS_2 create mode 100644 tests/ref/fate/hevc-conformance-TMVP_A_MS_3 delete mode 100644 tests/ref/fate/hevc-conformance-TSKIP_A_MS_2 create mode 100644 tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 create mode 100644 tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 create mode 100644 tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index d5d49ce0db..56e1280901 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -42,6 +42,7 @@ HEVC_SAMPLES = \ ipcm_B_NEC_2 \ ipcm_C_NEC_2 \ ipcm_D_NEC_2 \ + ipcm_E_NEC_2 \ IPRED_A_docomo_2 \ IPRED_B_Nokia_3 \ IPRED_C_Mitsubishi_2 \ @@ -83,6 +84,7 @@ HEVC_SAMPLES = \ RPS_C_ericsson_4 \ RPS_D_ericsson_5 \ RPS_E_qualcomm_5 \ + RPS_F_docomo_1 \ RQT_A_HHI_4 \ RQT_B_HHI_4 \ RQT_C_HHI_4 \ @@ -107,10 +109,11 @@ HEVC_SAMPLES = \ STRUCT_B_Samsung_4 \ TILES_A_Cisco_2 \ TILES_B_Cisco_1 \ - TMVP_A_MS_2 \ + TMVP_A_MS_3 \ TSCL_A_VIDYO_5 \ TSCL_B_VIDYO_4 \ - TSKIP_A_MS_2 \ + TSKIP_A_MS_3 \ + TUSIZE_A_Samsung_1 \ WP_A_Toshiba_3 \ WP_B_Toshiba_3 \ WPP_A_ericsson_MAIN_2 \ diff --git a/tests/ref/fate/hevc-conformance-RPS_F_docomo_1 b/tests/ref/fate/hevc-conformance-RPS_F_docomo_1 new file mode 100644 index 0000000000..06ae9c176a --- /dev/null +++ b/tests/ref/fate/hevc-conformance-RPS_F_docomo_1 @@ -0,0 +1,51 @@ +#tb 0: 1/25 +0, 0, 0, 1, 149760, 0x8edb27d7 +0, 1, 1, 1, 149760, 0x0bdf13f8 +0, 2, 2, 1, 149760, 0x45e702c7 +0, 3, 3, 1, 149760, 0xcc6428c0 +0, 4, 4, 1, 149760, 0xab0ed81d +0, 5, 5, 1, 149760, 0xb518a0ce +0, 6, 6, 1, 149760, 0x038340c0 +0, 7, 7, 1, 149760, 0x18ac1285 +0, 8, 8, 1, 149760, 0xfe2eb624 +0, 9, 9, 1, 149760, 0x3f67dcf5 +0, 10, 10, 1, 149760, 0x9a9adbf1 +0, 11, 11, 1, 149760, 0x41c67437 +0, 12, 12, 1, 149760, 0x8450a1d0 +0, 13, 13, 1, 149760, 0xae606230 +0, 14, 14, 1, 149760, 0x0525d4ba +0, 15, 15, 1, 149760, 0x860755bc +0, 16, 16, 1, 149760, 0xbf646d22 +0, 17, 17, 1, 149760, 0x64c79745 +0, 18, 18, 1, 149760, 0xa3cf35a4 +0, 19, 19, 1, 149760, 0x23d6f5a2 +0, 20, 20, 1, 149760, 0xf2b8ff71 +0, 21, 21, 1, 149760, 0xb98ba444 +0, 22, 22, 1, 149760, 0xa6c0ffd3 +0, 23, 23, 1, 149760, 0x4501ae0d +0, 24, 24, 1, 149760, 0xd8ba65d1 +0, 25, 25, 1, 149760, 0x684d982b +0, 26, 26, 1, 149760, 0x1bf223e0 +0, 27, 27, 1, 149760, 0xf1fb5950 +0, 28, 28, 1, 149760, 0x699f0526 +0, 29, 29, 1, 149760, 0x77d4d641 +0, 30, 30, 1, 149760, 0x0f2cd844 +0, 31, 31, 1, 149760, 0xd99cbe3f +0, 32, 32, 1, 149760, 0xbd342d08 +0, 33, 33, 1, 149760, 0x0b993f3c +0, 34, 34, 1, 149760, 0xd89190e2 +0, 35, 35, 1, 149760, 0xfae538e6 +0, 36, 36, 1, 149760, 0x6994c08f +0, 37, 37, 1, 149760, 0xba181c41 +0, 38, 38, 1, 149760, 0x484f4e19 +0, 39, 39, 1, 149760, 0xd2d8f91d +0, 40, 40, 1, 149760, 0x1294b154 +0, 41, 41, 1, 149760, 0xd98ad86b +0, 42, 42, 1, 149760, 0x3867767d +0, 43, 43, 1, 149760, 0x950d76e0 +0, 44, 44, 1, 149760, 0x752cf844 +0, 45, 45, 1, 149760, 0xd4a11c1c +0, 46, 46, 1, 149760, 0xf5e6dce6 +0, 47, 47, 1, 149760, 0x2c7ff2a6 +0, 48, 48, 1, 149760, 0x7a48af63 +0, 49, 49, 1, 149760, 0xcb72f57a diff --git a/tests/ref/fate/hevc-conformance-TMVP_A_MS_2 b/tests/ref/fate/hevc-conformance-TMVP_A_MS_2 deleted file mode 100644 index a626af8a6f..0000000000 --- a/tests/ref/fate/hevc-conformance-TMVP_A_MS_2 +++ /dev/null @@ -1,18 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 149760, 0xdb5e3b56 -0, 1, 1, 1, 149760, 0x496f2a41 -0, 2, 2, 1, 149760, 0x0690ee0a -0, 3, 3, 1, 149760, 0x5648fb4e -0, 4, 4, 1, 149760, 0xd58bbe51 -0, 5, 5, 1, 149760, 0x647c4520 -0, 6, 6, 1, 149760, 0x0e361335 -0, 7, 7, 1, 149760, 0xd1a4289b -0, 8, 8, 1, 149760, 0x04d29f74 -0, 9, 9, 1, 149760, 0x3bbffc55 -0, 10, 10, 1, 149760, 0xefe30f2b -0, 11, 11, 1, 149760, 0x3a336f52 -0, 12, 12, 1, 149760, 0x0dffed51 -0, 13, 13, 1, 149760, 0x5a9db757 -0, 14, 14, 1, 149760, 0x5e7313c5 -0, 15, 15, 1, 149760, 0xbffb3a0e -0, 16, 16, 1, 149760, 0x073966e9 diff --git a/tests/ref/fate/hevc-conformance-TMVP_A_MS_3 b/tests/ref/fate/hevc-conformance-TMVP_A_MS_3 new file mode 100644 index 0000000000..531370d26a --- /dev/null +++ b/tests/ref/fate/hevc-conformance-TMVP_A_MS_3 @@ -0,0 +1,18 @@ +#tb 0: 1/25 +0, 0, 0, 1, 149760, 0xdb5e3b56 +0, 1, 1, 1, 149760, 0x6d4418eb +0, 2, 2, 1, 149760, 0x0473e366 +0, 3, 3, 1, 149760, 0x988ff70c +0, 4, 4, 1, 149760, 0x87cfb972 +0, 5, 5, 1, 149760, 0x9f006c8d +0, 6, 6, 1, 149760, 0xa83fefd9 +0, 7, 7, 1, 149760, 0xee501a46 +0, 8, 8, 1, 149760, 0x04d29f74 +0, 9, 9, 1, 149760, 0xc1ee00dc +0, 10, 10, 1, 149760, 0x274ef97b +0, 11, 11, 1, 149760, 0xebec6365 +0, 12, 12, 1, 149760, 0x4555eb87 +0, 13, 13, 1, 149760, 0x50c5ae52 +0, 14, 14, 1, 149760, 0xf2861b67 +0, 15, 15, 1, 149760, 0xd6de4556 +0, 16, 16, 1, 149760, 0xc35d6134 diff --git a/tests/ref/fate/hevc-conformance-TSKIP_A_MS_2 b/tests/ref/fate/hevc-conformance-TSKIP_A_MS_2 deleted file mode 100644 index 1226e11faa..0000000000 --- a/tests/ref/fate/hevc-conformance-TSKIP_A_MS_2 +++ /dev/null @@ -1,18 +0,0 @@ -#tb 0: 1/25 -0, 0, 0, 1, 1382400, 0xaea37937 -0, 1, 1, 1, 1382400, 0x39d687d0 -0, 2, 2, 1, 1382400, 0x8ea04595 -0, 3, 3, 1, 1382400, 0x5d5a40d2 -0, 4, 4, 1, 1382400, 0x6915eb4e -0, 5, 5, 1, 1382400, 0xe8bb612d -0, 6, 6, 1, 1382400, 0xd331085a -0, 7, 7, 1, 1382400, 0x2193bc30 -0, 8, 8, 1, 1382400, 0xaeb19418 -0, 9, 9, 1, 1382400, 0xb524eac3 -0, 10, 10, 1, 1382400, 0x141908a2 -0, 11, 11, 1, 1382400, 0x527ab6ac -0, 12, 12, 1, 1382400, 0xe9a73d9f -0, 13, 13, 1, 1382400, 0x2eb0aa14 -0, 14, 14, 1, 1382400, 0x6981af42 -0, 15, 15, 1, 1382400, 0xbb0bbd7a -0, 16, 16, 1, 1382400, 0xf0779b81 diff --git a/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 b/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 new file mode 100644 index 0000000000..b5eca3c3da --- /dev/null +++ b/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 @@ -0,0 +1,18 @@ +#tb 0: 1/25 +0, 0, 0, 1, 1382400, 0xaea37937 +0, 1, 1, 1, 1382400, 0xea5c7b5d +0, 2, 2, 1, 1382400, 0x4e41e421 +0, 3, 3, 1, 1382400, 0x9214d0ee +0, 4, 4, 1, 1382400, 0xc9aef661 +0, 5, 5, 1, 1382400, 0xddb8a3d2 +0, 6, 6, 1, 1382400, 0xf00f3c55 +0, 7, 7, 1, 1382400, 0x586d98bd +0, 8, 8, 1, 1382400, 0x60650aa6 +0, 9, 9, 1, 1382400, 0x13108a54 +0, 10, 10, 1, 1382400, 0x90d25797 +0, 11, 11, 1, 1382400, 0x472fbac3 +0, 12, 12, 1, 1382400, 0xb9f2ac5a +0, 13, 13, 1, 1382400, 0xb6fc0c35 +0, 14, 14, 1, 1382400, 0xfe3fd694 +0, 15, 15, 1, 1382400, 0xb1a0f737 +0, 16, 16, 1, 1382400, 0xf7e62b7e diff --git a/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 b/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 new file mode 100644 index 0000000000..4886a40162 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +0, 0, 0, 1, 6144000, 0x3681421d +0, 1, 1, 1, 6144000, 0xecf3f343 +0, 2, 2, 1, 6144000, 0x53742db2 +0, 3, 3, 1, 6144000, 0x9b780429 +0, 4, 4, 1, 6144000, 0x57abb17e diff --git a/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 b/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 new file mode 100644 index 0000000000..794c4acdd3 --- /dev/null +++ b/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 149760, 0xf4582514 -- 2.11.0