Merge commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0'

* commit 'f548f9f9e7a2a08c780e88dac63b9d5d2c55efb0':
  hevc: update conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>

8 files changed, 576 insertions, 4 deletions

diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index 278d190254..0727882cea 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -37,7 +37,7 @@ HEVC_SAMPLES =                  \
     ENTP_A_LG_2                 \
     ENTP_B_LG_2                 \
     ENTP_C_LG_3                 \
-    EXT_A_ericsson_3            \
+    EXT_A_ericsson_4            \
     ipcm_A_NEC_3                \
     ipcm_B_NEC_3                \
     ipcm_C_NEC_3                \
@@ -48,6 +48,7 @@ HEVC_SAMPLES =                  \
     IPRED_C_Mitsubishi_2        \
     LS_A_Orange_2               \
     LS_B_ORANGE_4               \
+    LTRPSPS_A_Qualcomm_1        \
     MAXBINS_A_TI_4              \
     MAXBINS_B_TI_4              \
     MAXBINS_C_TI_4              \
@@ -61,7 +62,7 @@ HEVC_SAMPLES =                  \
     MVCLIP_A_qualcomm_3         \
     MVDL1ZERO_A_docomo_3        \
     MVEDGE_A_qualcomm_3         \
-    NUT_A_ericsson_4            \
+    NUT_A_ericsson_5            \
     PICSIZE_A_Bossen_1          \
     PICSIZE_B_Bossen_1          \
     PICSIZE_C_Bossen_1          \
@@ -81,8 +82,8 @@ HEVC_SAMPLES =                  \
     RPLM_B_qualcomm_4           \
     RPS_A_docomo_4              \
     RPS_B_qualcomm_5            \
-    RPS_C_ericsson_4            \
-    RPS_D_ericsson_5            \
+    RPS_C_ericsson_5            \
+    RPS_D_ericsson_6            \
     RPS_E_qualcomm_5            \
     RPS_F_docomo_1              \
     RQT_A_HHI_4                 \
@@ -105,6 +106,7 @@ HEVC_SAMPLES =                  \
     SLIST_B_Sony_8              \
     SLIST_C_Sony_3              \
     SLIST_D_Sony_9              \
+    SLPPLP_A_VIDYO_1            \
     STRUCT_A_Samsung_5          \
     STRUCT_B_Samsung_4          \
     TILES_A_Cisco_2             \
@@ -114,6 +116,7 @@ HEVC_SAMPLES =                  \
     TSCL_B_VIDYO_4              \
     TSKIP_A_MS_3                \
     TUSIZE_A_Samsung_1          \
+    VPSID_A_VIDYO_1             \
     WP_A_Toshiba_3              \
     WP_B_Toshiba_3              \
     WPP_A_ericsson_MAIN_2       \
diff --git a/tests/ref/fate/hevc-conformance-EXT_A_ericsson_3 b/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
index bf4616a919..bf4616a919 100644
--- a/tests/ref/fate/hevc-conformance-EXT_A_ericsson_3
+++ b/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
diff --git a/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
new file mode 100644
index 0000000000..ddf25c9ddf
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
@@ -0,0 +1,501 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0xcfffa013
+0,          1,          1,        1,   149760, 0x8ae80654
+0,          2,          2,        1,   149760, 0xa79915b8
+0,          3,          3,        1,   149760, 0xcc5d4a1e
+0,          4,          4,        1,   149760, 0x80636df7
+0,          5,          5,        1,   149760, 0xbd9ab94a
+0,          6,          6,        1,   149760, 0xb7c9ecc5
+0,          7,          7,        1,   149760, 0xbb8607fc
+0,          8,          8,        1,   149760, 0x82c62409
+0,          9,          9,        1,   149760, 0xdc1a9149
+0,         10,         10,        1,   149760, 0x3d55ac92
+0,         11,         11,        1,   149760, 0x398ad055
+0,         12,         12,        1,   149760, 0xd7c2c80b
+0,         13,         13,        1,   149760, 0x17b0e967
+0,         14,         14,        1,   149760, 0x0463f30b
+0,         15,         15,        1,   149760, 0x73d31d58
+0,         16,         16,        1,   149760, 0xaeee2c07
+0,         17,         17,        1,   149760, 0xcd98831c
+0,         18,         18,        1,   149760, 0x38798b8c
+0,         19,         19,        1,   149760, 0x11a6a0d5
+0,         20,         20,        1,   149760, 0x5e509f19
+0,         21,         21,        1,   149760, 0x399ec835
+0,         22,         22,        1,   149760, 0x0250e3c1
+0,         23,         23,        1,   149760, 0xd62510a1
+0,         24,         24,        1,   149760, 0x715016ac
+0,         25,         25,        1,   149760, 0x1f4e9aae
+0,         26,         26,        1,   149760, 0xd27fa636
+0,         27,         27,        1,   149760, 0x55369ec0
+0,         28,         28,        1,   149760, 0x77ffa34e
+0,         29,         29,        1,   149760, 0x5589f2c0
+0,         30,         30,        1,   149760, 0x99c2e78a
+0,         31,         31,        1,   149760, 0xd7e9ff76
+0,         32,         32,        1,   149760, 0xd4437e12
+0,         33,         33,        1,   149760, 0x3af7b718
+0,         34,         34,        1,   149760, 0x6de8bb92
+0,         35,         35,        1,   149760, 0xd523ca09
+0,         36,         36,        1,   149760, 0x44ccbf86
+0,         37,         37,        1,   149760, 0x8eddf1a0
+0,         38,         38,        1,   149760, 0xf554f120
+0,         39,         39,        1,   149760, 0x75bd170c
+0,         40,         40,        1,   149760, 0x4cf40a64
+0,         41,         41,        1,   149760, 0xefe64d68
+0,         42,         42,        1,   149760, 0xa48e7572
+0,         43,         43,        1,   149760, 0x0773b154
+0,         44,         44,        1,   149760, 0x304a8bb9
+0,         45,         45,        1,   149760, 0x6b219051
+0,         46,         46,        1,   149760, 0xbb9b68a3
+0,         47,         47,        1,   149760, 0x060d7cc8
+0,         48,         48,        1,   149760, 0x49317bcb
+0,         49,         49,        1,   149760, 0xac3c9a38
+0,         50,         50,        1,   149760, 0x2f1ea025
+0,         51,         51,        1,   149760, 0x2b87b9b8
+0,         52,         52,        1,   149760, 0x9024bdc9
+0,         53,         53,        1,   149760, 0xa7d1f5c5
+0,         54,         54,        1,   149760, 0x4d590628
+0,         55,         55,        1,   149760, 0x0a65166a
+0,         56,         56,        1,   149760, 0x9f4f350b
+0,         57,         57,        1,   149760, 0x8a40990d
+0,         58,         58,        1,   149760, 0x75f4ad20
+0,         59,         59,        1,   149760, 0xb3aadfd2
+0,         60,         60,        1,   149760, 0xb23df15d
+0,         61,         61,        1,   149760, 0xff99a695
+0,         62,         62,        1,   149760, 0x710963d7
+0,         63,         63,        1,   149760, 0x7c497146
+0,         64,         64,        1,   149760, 0xd3378be9
+0,         65,         65,        1,   149760, 0x0c449d3b
+0,         66,         66,        1,   149760, 0xcb16554e
+0,         67,         67,        1,   149760, 0xeb5e62d5
+0,         68,         68,        1,   149760, 0xc9b8125a
+0,         69,         69,        1,   149760, 0x8c6b2b56
+0,         70,         70,        1,   149760, 0xaba92f83
+0,         71,         71,        1,   149760, 0xc0a45d8a
+0,         72,         72,        1,   149760, 0x72a17719
+0,         73,         73,        1,   149760, 0x98037887
+0,         74,         74,        1,   149760, 0xb752b50b
+0,         75,         75,        1,   149760, 0x91520f28
+0,         76,         76,        1,   149760, 0x58d7f7cb
+0,         77,         77,        1,   149760, 0x8c639e33
+0,         78,         78,        1,   149760, 0xda16eeed
+0,         79,         79,        1,   149760, 0xfcb7fd52
+0,         80,         80,        1,   149760, 0x193fd521
+0,         81,         81,        1,   149760, 0x51cca11e
+0,         82,         82,        1,   149760, 0x8606cc0f
+0,         83,         83,        1,   149760, 0xa588bdfc
+0,         84,         84,        1,   149760, 0x3f828b28
+0,         85,         85,        1,   149760, 0x7a9d6a9f
+0,         86,         86,        1,   149760, 0xf963ded3
+0,         87,         87,        1,   149760, 0x9d4452bb
+0,         88,         88,        1,   149760, 0x474399bf
+0,         89,         89,        1,   149760, 0x934cdcea
+0,         90,         90,        1,   149760, 0x32efebce
+0,         91,         91,        1,   149760, 0xb9ba01ba
+0,         92,         92,        1,   149760, 0xcdb63f42
+0,         93,         93,        1,   149760, 0x4ca2b3fc
+0,         94,         94,        1,   149760, 0xf5b3fae3
+0,         95,         95,        1,   149760, 0xac216fee
+0,         96,         96,        1,   149760, 0x8753dbea
+0,         97,         97,        1,   149760, 0x605c5d19
+0,         98,         98,        1,   149760, 0x441f3093
+0,         99,         99,        1,   149760, 0x586d3630
+0,        100,        100,        1,   149760, 0xb3678490
+0,        101,        101,        1,   149760, 0xc6c90b12
+0,        102,        102,        1,   149760, 0xb103185e
+0,        103,        103,        1,   149760, 0x92a10168
+0,        104,        104,        1,   149760, 0xa77ae265
+0,        105,        105,        1,   149760, 0x14def17a
+0,        106,        106,        1,   149760, 0x0468ea5a
+0,        107,        107,        1,   149760, 0x078832be
+0,        108,        108,        1,   149760, 0xf353fe88
+0,        109,        109,        1,   149760, 0xa42d3435
+0,        110,        110,        1,   149760, 0xd13a85ea
+0,        111,        111,        1,   149760, 0xd3c2f119
+0,        112,        112,        1,   149760, 0x7ee6c196
+0,        113,        113,        1,   149760, 0xa75aadbc
+0,        114,        114,        1,   149760, 0xbe661a3e
+0,        115,        115,        1,   149760, 0x662cb304
+0,        116,        116,        1,   149760, 0x32a7a688
+0,        117,        117,        1,   149760, 0xedf4ff9f
+0,        118,        118,        1,   149760, 0x3d036dbc
+0,        119,        119,        1,   149760, 0x525025d2
+0,        120,        120,        1,   149760, 0x9ab72bd2
+0,        121,        121,        1,   149760, 0xbf401309
+0,        122,        122,        1,   149760, 0xaab6d421
+0,        123,        123,        1,   149760, 0x3713ce39
+0,        124,        124,        1,   149760, 0x5054b38d
+0,        125,        125,        1,   149760, 0x40211b8d
+0,        126,        126,        1,   149760, 0x769d8bcc
+0,        127,        127,        1,   149760, 0xa3b428d7
+0,        128,        128,        1,   149760, 0x3d4df3de
+0,        129,        129,        1,   149760, 0xa1338ae9
+0,        130,        130,        1,   149760, 0xb12f8c9a
+0,        131,        131,        1,   149760, 0x43cc9612
+0,        132,        132,        1,   149760, 0xcbc4b7ce
+0,        133,        133,        1,   149760, 0xae2e2b7c
+0,        134,        134,        1,   149760, 0x685403bd
+0,        135,        135,        1,   149760, 0x1362c52f
+0,        136,        136,        1,   149760, 0x2a7cf8e7
+0,        137,        137,        1,   149760, 0x2863f3a4
+0,        138,        138,        1,   149760, 0xa94bc07d
+0,        139,        139,        1,   149760, 0xe025b2f7
+0,        140,        140,        1,   149760, 0x0c56ce13
+0,        141,        141,        1,   149760, 0x97ce3184
+0,        142,        142,        1,   149760, 0x3761313f
+0,        143,        143,        1,   149760, 0x7bf850ba
+0,        144,        144,        1,   149760, 0xa7d02257
+0,        145,        145,        1,   149760, 0xb64c79ae
+0,        146,        146,        1,   149760, 0x36a610b8
+0,        147,        147,        1,   149760, 0xc4946568
+0,        148,        148,        1,   149760, 0x89a29ed8
+0,        149,        149,        1,   149760, 0x5040a1e2
+0,        150,        150,        1,   149760, 0x3daa53ba
+0,        151,        151,        1,   149760, 0xbca6b7c2
+0,        152,        152,        1,   149760, 0x540af705
+0,        153,        153,        1,   149760, 0x524e8012
+0,        154,        154,        1,   149760, 0x2cfd69dd
+0,        155,        155,        1,   149760, 0x6d222afd
+0,        156,        156,        1,   149760, 0xf522489b
+0,        157,        157,        1,   149760, 0x18357f2f
+0,        158,        158,        1,   149760, 0x38c58007
+0,        159,        159,        1,   149760, 0xb367598b
+0,        160,        160,        1,   149760, 0xeaee7801
+0,        161,        161,        1,   149760, 0x6ec20703
+0,        162,        162,        1,   149760, 0x19b61bbe
+0,        163,        163,        1,   149760, 0x81d328ab
+0,        164,        164,        1,   149760, 0x6f5555eb
+0,        165,        165,        1,   149760, 0x7706277a
+0,        166,        166,        1,   149760, 0x45a7e27a
+0,        167,        167,        1,   149760, 0xd30a2c09
+0,        168,        168,        1,   149760, 0x13fdcefc
+0,        169,        169,        1,   149760, 0x952bf8f5
+0,        170,        170,        1,   149760, 0x18a627d7
+0,        171,        171,        1,   149760, 0x33838dc4
+0,        172,        172,        1,   149760, 0x0b81d369
+0,        173,        173,        1,   149760, 0x9a85acb5
+0,        174,        174,        1,   149760, 0x6bee543e
+0,        175,        175,        1,   149760, 0xff9563dc
+0,        176,        176,        1,   149760, 0x15177760
+0,        177,        177,        1,   149760, 0xc2ca9fcd
+0,        178,        178,        1,   149760, 0xe14290cf
+0,        179,        179,        1,   149760, 0x113a84ed
+0,        180,        180,        1,   149760, 0x423b83ac
+0,        181,        181,        1,   149760, 0x64c37fa9
+0,        182,        182,        1,   149760, 0x07a324fc
+0,        183,        183,        1,   149760, 0xb7a5dd83
+0,        184,        184,        1,   149760, 0xc9c65cfe
+0,        185,        185,        1,   149760, 0xecab5ab0
+0,        186,        186,        1,   149760, 0x04240342
+0,        187,        187,        1,   149760, 0x6d6ec6ea
+0,        188,        188,        1,   149760, 0x18e1413a
+0,        189,        189,        1,   149760, 0x4602403a
+0,        190,        190,        1,   149760, 0x9a4c03b4
+0,        191,        191,        1,   149760, 0x7b93bd44
+0,        192,        192,        1,   149760, 0xa72ecc38
+0,        193,        193,        1,   149760, 0xb4bc1591
+0,        194,        194,        1,   149760, 0x6c8e40b4
+0,        195,        195,        1,   149760, 0x5adb674b
+0,        196,        196,        1,   149760, 0x223f68e5
+0,        197,        197,        1,   149760, 0x6257d660
+0,        198,        198,        1,   149760, 0xade0f8af
+0,        199,        199,        1,   149760, 0xe5834d9a
+0,        200,        200,        1,   149760, 0x593b7957
+0,        201,        201,        1,   149760, 0x278109dc
+0,        202,        202,        1,   149760, 0x9e46908e
+0,        203,        203,        1,   149760, 0x221b16c6
+0,        204,        204,        1,   149760, 0x26f1387b
+0,        205,        205,        1,   149760, 0xfe87a439
+0,        206,        206,        1,   149760, 0x79a2aa13
+0,        207,        207,        1,   149760, 0xd9d6ed45
+0,        208,        208,        1,   149760, 0xc4bde65b
+0,        209,        209,        1,   149760, 0x3f4c2558
+0,        210,        210,        1,   149760, 0x2bce7b58
+0,        211,        211,        1,   149760, 0x76468d74
+0,        212,        212,        1,   149760, 0x3c8ceb15
+0,        213,        213,        1,   149760, 0x6d55430f
+0,        214,        214,        1,   149760, 0x2500386a
+0,        215,        215,        1,   149760, 0x5c220604
+0,        216,        216,        1,   149760, 0xc8c5e3c7
+0,        217,        217,        1,   149760, 0xb35b12d3
+0,        218,        218,        1,   149760, 0x47bbea46
+0,        219,        219,        1,   149760, 0xd15acaff
+0,        220,        220,        1,   149760, 0xf1a35a2f
+0,        221,        221,        1,   149760, 0xf9d845e0
+0,        222,        222,        1,   149760, 0x87cfe711
+0,        223,        223,        1,   149760, 0xf6f2d8a5
+0,        224,        224,        1,   149760, 0x167b5401
+0,        225,        225,        1,   149760, 0x33f355c2
+0,        226,        226,        1,   149760, 0xd0d66b7c
+0,        227,        227,        1,   149760, 0xb676a0ad
+0,        228,        228,        1,   149760, 0x987cbc29
+0,        229,        229,        1,   149760, 0x5fb71596
+0,        230,        230,        1,   149760, 0xf993350a
+0,        231,        231,        1,   149760, 0x586a6ae0
+0,        232,        232,        1,   149760, 0x3b678b28
+0,        233,        233,        1,   149760, 0x45a1c869
+0,        234,        234,        1,   149760, 0xa4ccfdeb
+0,        235,        235,        1,   149760, 0x5ff52df9
+0,        236,        236,        1,   149760, 0x84c01dee
+0,        237,        237,        1,   149760, 0x8d4ed483
+0,        238,        238,        1,   149760, 0x9b4f466f
+0,        239,        239,        1,   149760, 0x954dfaed
+0,        240,        240,        1,   149760, 0xae07d9cd
+0,        241,        241,        1,   149760, 0xf81ecbe8
+0,        242,        242,        1,   149760, 0xdb6f97f7
+0,        243,        243,        1,   149760, 0x1b1b50f4
+0,        244,        244,        1,   149760, 0xbd450e28
+0,        245,        245,        1,   149760, 0x1307a938
+0,        246,        246,        1,   149760, 0xb2af5ddd
+0,        247,        247,        1,   149760, 0xbf80377d
+0,        248,        248,        1,   149760, 0x230b0fbb
+0,        249,        249,        1,   149760, 0x365afaa8
+0,        250,        250,        1,   149760, 0xe517dcb0
+0,        251,        251,        1,   149760, 0xfa1dcda3
+0,        252,        252,        1,   149760, 0x4908b5a1
+0,        253,        253,        1,   149760, 0x423a9ebd
+0,        254,        254,        1,   149760, 0x1145a6d1
+0,        255,        255,        1,   149760, 0x4f40a141
+0,        256,        256,        1,   149760, 0x851e84de
+0,        257,        257,        1,   149760, 0x1709a3cd
+0,        258,        258,        1,   149760, 0x3dace2eb
+0,        259,        259,        1,   149760, 0x3e9d4890
+0,        260,        260,        1,   149760, 0xea53610c
+0,        261,        261,        1,   149760, 0xe50f2ee9
+0,        262,        262,        1,   149760, 0x59a16fc6
+0,        263,        263,        1,   149760, 0x9bee92d8
+0,        264,        264,        1,   149760, 0xf3047aed
+0,        265,        265,        1,   149760, 0x30f922ed
+0,        266,        266,        1,   149760, 0x4eb5c685
+0,        267,        267,        1,   149760, 0xf688d9e5
+0,        268,        268,        1,   149760, 0xf5f5ec81
+0,        269,        269,        1,   149760, 0xa5667bdc
+0,        270,        270,        1,   149760, 0x9a64c3f1
+0,        271,        271,        1,   149760, 0x0fbe3441
+0,        272,        272,        1,   149760, 0xf67f517c
+0,        273,        273,        1,   149760, 0x97155c90
+0,        274,        274,        1,   149760, 0xe41fde38
+0,        275,        275,        1,   149760, 0xdf140d56
+0,        276,        276,        1,   149760, 0x5ae5f31b
+0,        277,        277,        1,   149760, 0x13238d0a
+0,        278,        278,        1,   149760, 0x53a867a4
+0,        279,        279,        1,   149760, 0xbc6327fa
+0,        280,        280,        1,   149760, 0x34ce9cda
+0,        281,        281,        1,   149760, 0x07b6d6f4
+0,        282,        282,        1,   149760, 0x271e7299
+0,        283,        283,        1,   149760, 0x2e53d61b
+0,        284,        284,        1,   149760, 0x5ec6c37a
+0,        285,        285,        1,   149760, 0x2284efdc
+0,        286,        286,        1,   149760, 0x5c59625b
+0,        287,        287,        1,   149760, 0x93965c3b
+0,        288,        288,        1,   149760, 0x4eaa64c0
+0,        289,        289,        1,   149760, 0xde7fd5b7
+0,        290,        290,        1,   149760, 0x00f2fdf1
+0,        291,        291,        1,   149760, 0xb7daf9f2
+0,        292,        292,        1,   149760, 0x988d751e
+0,        293,        293,        1,   149760, 0x5c8baa8e
+0,        294,        294,        1,   149760, 0xcdea5c41
+0,        295,        295,        1,   149760, 0x22d0cddc
+0,        296,        296,        1,   149760, 0xd913bba8
+0,        297,        297,        1,   149760, 0xba74650e
+0,        298,        298,        1,   149760, 0x01af4f86
+0,        299,        299,        1,   149760, 0xc4e60d8a
+0,        300,        300,        1,   149760, 0x1a193c1c
+0,        301,        301,        1,   149760, 0x7f66ab93
+0,        302,        302,        1,   149760, 0xa47c8c5a
+0,        303,        303,        1,   149760, 0x221d4c1c
+0,        304,        304,        1,   149760, 0xadd8f1e7
+0,        305,        305,        1,   149760, 0xa8224d8e
+0,        306,        306,        1,   149760, 0xca2dc482
+0,        307,        307,        1,   149760, 0x74110b2d
+0,        308,        308,        1,   149760, 0x1c2271df
+0,        309,        309,        1,   149760, 0xb1dbae7e
+0,        310,        310,        1,   149760, 0x0932826d
+0,        311,        311,        1,   149760, 0x386f191d
+0,        312,        312,        1,   149760, 0x11863aa3
+0,        313,        313,        1,   149760, 0x0a07f11f
+0,        314,        314,        1,   149760, 0x164d047a
+0,        315,        315,        1,   149760, 0xb79fa393
+0,        316,        316,        1,   149760, 0x83d4eba8
+0,        317,        317,        1,   149760, 0x4d8dad20
+0,        318,        318,        1,   149760, 0x5bd2ae35
+0,        319,        319,        1,   149760, 0xedbfcbf6
+0,        320,        320,        1,   149760, 0x4e3c1463
+0,        321,        321,        1,   149760, 0x79564bd9
+0,        322,        322,        1,   149760, 0x3d84e6f5
+0,        323,        323,        1,   149760, 0x2117e35d
+0,        324,        324,        1,   149760, 0xa7e71f6e
+0,        325,        325,        1,   149760, 0xc4db38cf
+0,        326,        326,        1,   149760, 0x1fb89dc7
+0,        327,        327,        1,   149760, 0x2606f7fc
+0,        328,        328,        1,   149760, 0x232478d4
+0,        329,        329,        1,   149760, 0x5ee6d57a
+0,        330,        330,        1,   149760, 0xc9dcad6a
+0,        331,        331,        1,   149760, 0x9190e77f
+0,        332,        332,        1,   149760, 0x9c4770a6
+0,        333,        333,        1,   149760, 0x58e4f194
+0,        334,        334,        1,   149760, 0x2fdcc67c
+0,        335,        335,        1,   149760, 0xaaede6fd
+0,        336,        336,        1,   149760, 0x676c3f9b
+0,        337,        337,        1,   149760, 0xd420e536
+0,        338,        338,        1,   149760, 0x6dc24987
+0,        339,        339,        1,   149760, 0xc6368607
+0,        340,        340,        1,   149760, 0x34620402
+0,        341,        341,        1,   149760, 0xd98da63e
+0,        342,        342,        1,   149760, 0xeb724c79
+0,        343,        343,        1,   149760, 0x4ba2c1f5
+0,        344,        344,        1,   149760, 0x2795fc4c
+0,        345,        345,        1,   149760, 0x0e7ece9a
+0,        346,        346,        1,   149760, 0x6ac54741
+0,        347,        347,        1,   149760, 0xb96fd2cc
+0,        348,        348,        1,   149760, 0x117291e5
+0,        349,        349,        1,   149760, 0x87415084
+0,        350,        350,        1,   149760, 0x8f73b005
+0,        351,        351,        1,   149760, 0xda24dd2d
+0,        352,        352,        1,   149760, 0xbb7a0383
+0,        353,        353,        1,   149760, 0x31b6d2ad
+0,        354,        354,        1,   149760, 0x87f8b103
+0,        355,        355,        1,   149760, 0xc2c41bca
+0,        356,        356,        1,   149760, 0xf021cb64
+0,        357,        357,        1,   149760, 0x19809718
+0,        358,        358,        1,   149760, 0x81247b86
+0,        359,        359,        1,   149760, 0x2326d770
+0,        360,        360,        1,   149760, 0x2b27c7ee
+0,        361,        361,        1,   149760, 0xa9ce4ef4
+0,        362,        362,        1,   149760, 0x0de330b8
+0,        363,        363,        1,   149760, 0xf8c14fc9
+0,        364,        364,        1,   149760, 0x3264e471
+0,        365,        365,        1,   149760, 0x410e8591
+0,        366,        366,        1,   149760, 0xb38f2ea9
+0,        367,        367,        1,   149760, 0xf4fbcbea
+0,        368,        368,        1,   149760, 0x60935dc0
+0,        369,        369,        1,   149760, 0x98f4cfb4
+0,        370,        370,        1,   149760, 0xab0156db
+0,        371,        371,        1,   149760, 0x0bd8e392
+0,        372,        372,        1,   149760, 0x6b4701c1
+0,        373,        373,        1,   149760, 0xe94b1bea
+0,        374,        374,        1,   149760, 0x86d932fb
+0,        375,        375,        1,   149760, 0xebb7cf5b
+0,        376,        376,        1,   149760, 0xb4022144
+0,        377,        377,        1,   149760, 0xb61506a3
+0,        378,        378,        1,   149760, 0xd48b1fa0
+0,        379,        379,        1,   149760, 0xd4b7ecaf
+0,        380,        380,        1,   149760, 0x9296f641
+0,        381,        381,        1,   149760, 0x976e816a
+0,        382,        382,        1,   149760, 0xd4d1e34e
+0,        383,        383,        1,   149760, 0xe34fd75b
+0,        384,        384,        1,   149760, 0x9a926a62
+0,        385,        385,        1,   149760, 0x3fb24f62
+0,        386,        386,        1,   149760, 0x0e7840af
+0,        387,        387,        1,   149760, 0x1cb583c4
+0,        388,        388,        1,   149760, 0x24c4fd96
+0,        389,        389,        1,   149760, 0x923493e0
+0,        390,        390,        1,   149760, 0xd4755d80
+0,        391,        391,        1,   149760, 0x9cd4b85c
+0,        392,        392,        1,   149760, 0xd01aa4ad
+0,        393,        393,        1,   149760, 0x55e09c4f
+0,        394,        394,        1,   149760, 0x09a873b6
+0,        395,        395,        1,   149760, 0x915a4408
+0,        396,        396,        1,   149760, 0x714aeafb
+0,        397,        397,        1,   149760, 0x8941f5b8
+0,        398,        398,        1,   149760, 0x1fe23244
+0,        399,        399,        1,   149760, 0x1663a392
+0,        400,        400,        1,   149760, 0x91b4d995
+0,        401,        401,        1,   149760, 0xb4fc80b0
+0,        402,        402,        1,   149760, 0x02523fbb
+0,        403,        403,        1,   149760, 0xc6d16d89
+0,        404,        404,        1,   149760, 0xd1d899be
+0,        405,        405,        1,   149760, 0x03c55283
+0,        406,        406,        1,   149760, 0x581b2f1a
+0,        407,        407,        1,   149760, 0xac93eb35
+0,        408,        408,        1,   149760, 0x21d0573b
+0,        409,        409,        1,   149760, 0xda4f9ea4
+0,        410,        410,        1,   149760, 0x2a04ad09
+0,        411,        411,        1,   149760, 0x46d9c0fc
+0,        412,        412,        1,   149760, 0x90b79b33
+0,        413,        413,        1,   149760, 0x6cadf70b
+0,        414,        414,        1,   149760, 0xb4f294a4
+0,        415,        415,        1,   149760, 0xc6d599d2
+0,        416,        416,        1,   149760, 0xec332a7f
+0,        417,        417,        1,   149760, 0x1e4c9fea
+0,        418,        418,        1,   149760, 0xadacff11
+0,        419,        419,        1,   149760, 0x63ffacab
+0,        420,        420,        1,   149760, 0xcc504bbf
+0,        421,        421,        1,   149760, 0xfd9002d4
+0,        422,        422,        1,   149760, 0xe338cabf
+0,        423,        423,        1,   149760, 0x89ab95bd
+0,        424,        424,        1,   149760, 0x932602d1
+0,        425,        425,        1,   149760, 0x063a9a8a
+0,        426,        426,        1,   149760, 0xd07c1d2c
+0,        427,        427,        1,   149760, 0x1016fee6
+0,        428,        428,        1,   149760, 0xe778f595
+0,        429,        429,        1,   149760, 0x5c46d12a
+0,        430,        430,        1,   149760, 0xe50e7d26
+0,        431,        431,        1,   149760, 0x6ef2149d
+0,        432,        432,        1,   149760, 0x5c1c475c
+0,        433,        433,        1,   149760, 0xd1af09dd
+0,        434,        434,        1,   149760, 0x91e38b8e
+0,        435,        435,        1,   149760, 0xe8f0fb1e
+0,        436,        436,        1,   149760, 0xabef97c8
+0,        437,        437,        1,   149760, 0x7a2a5abd
+0,        438,        438,        1,   149760, 0xc74774f0
+0,        439,        439,        1,   149760, 0x47d17c54
+0,        440,        440,        1,   149760, 0x849f8860
+0,        441,        441,        1,   149760, 0xe81e0022
+0,        442,        442,        1,   149760, 0xa572c832
+0,        443,        443,        1,   149760, 0x7670f316
+0,        444,        444,        1,   149760, 0x67556784
+0,        445,        445,        1,   149760, 0x42b2af9d
+0,        446,        446,        1,   149760, 0x731e17c8
+0,        447,        447,        1,   149760, 0x491f3ed7
+0,        448,        448,        1,   149760, 0xdb9d163d
+0,        449,        449,        1,   149760, 0x7282e4d6
+0,        450,        450,        1,   149760, 0x8d6dc686
+0,        451,        451,        1,   149760, 0x2d413343
+0,        452,        452,        1,   149760, 0x27a05c87
+0,        453,        453,        1,   149760, 0x0edfe7c8
+0,        454,        454,        1,   149760, 0xf2fb72cd
+0,        455,        455,        1,   149760, 0x0c046074
+0,        456,        456,        1,   149760, 0xbd2ffeec
+0,        457,        457,        1,   149760, 0xdb849b70
+0,        458,        458,        1,   149760, 0xc8193666
+0,        459,        459,        1,   149760, 0x7dab4b05
+0,        460,        460,        1,   149760, 0x83a94327
+0,        461,        461,        1,   149760, 0x56a2ca36
+0,        462,        462,        1,   149760, 0x7d20c938
+0,        463,        463,        1,   149760, 0xcba79c1b
+0,        464,        464,        1,   149760, 0xea020d13
+0,        465,        465,        1,   149760, 0xf188d8ca
+0,        466,        466,        1,   149760, 0xecec2c0f
+0,        467,        467,        1,   149760, 0xec7e6c6e
+0,        468,        468,        1,   149760, 0x10f4bd53
+0,        469,        469,        1,   149760, 0xe91a78f9
+0,        470,        470,        1,   149760, 0x996b5fe0
+0,        471,        471,        1,   149760, 0xafff2efb
+0,        472,        472,        1,   149760, 0x5270e8d7
+0,        473,        473,        1,   149760, 0x24f548b6
+0,        474,        474,        1,   149760, 0xe4b5ffe6
+0,        475,        475,        1,   149760, 0x59c7f7da
+0,        476,        476,        1,   149760, 0x4a7b30a2
+0,        477,        477,        1,   149760, 0xbe5829b3
+0,        478,        478,        1,   149760, 0x70226e30
+0,        479,        479,        1,   149760, 0xfbba9558
+0,        480,        480,        1,   149760, 0x2cb89025
+0,        481,        481,        1,   149760, 0x18e2a4ad
+0,        482,        482,        1,   149760, 0xf50dce5e
+0,        483,        483,        1,   149760, 0x9f87c44f
+0,        484,        484,        1,   149760, 0xbfdc521d
+0,        485,        485,        1,   149760, 0xa06f5b06
+0,        486,        486,        1,   149760, 0xa169a6fe
+0,        487,        487,        1,   149760, 0xce6280d4
+0,        488,        488,        1,   149760, 0x056c21d6
+0,        489,        489,        1,   149760, 0xdf7177ef
+0,        490,        490,        1,   149760, 0x1097459b
+0,        491,        491,        1,   149760, 0xf00518a4
+0,        492,        492,        1,   149760, 0x6969b893
+0,        493,        493,        1,   149760, 0xfc3ce0af
+0,        494,        494,        1,   149760, 0x53cf36b5
+0,        495,        495,        1,   149760, 0xdef7e027
+0,        496,        496,        1,   149760, 0xff11e733
+0,        497,        497,        1,   149760, 0x4ffd5d92
+0,        498,        498,        1,   149760, 0x96f0bb4a
+0,        499,        499,        1,   149760, 0x7b04dd15
diff --git a/tests/ref/fate/hevc-conformance-NUT_A_ericsson_4 b/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
index fe65880bc5..fe65880bc5 100644
--- a/tests/ref/fate/hevc-conformance-NUT_A_ericsson_4
+++ b/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
diff --git a/tests/ref/fate/hevc-conformance-RPS_C_ericsson_4 b/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
index e97e7eafa2..e97e7eafa2 100644
--- a/tests/ref/fate/hevc-conformance-RPS_C_ericsson_4
+++ b/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
diff --git a/tests/ref/fate/hevc-conformance-RPS_D_ericsson_5 b/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
index 2851704c52..2851704c52 100644
--- a/tests/ref/fate/hevc-conformance-RPS_D_ericsson_5
+++ b/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
diff --git a/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1 b/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
new file mode 100644
index 0000000000..bbb3cfeaa1
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
@@ -0,0 +1,34 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x88619f80
+0,          1,          1,        1,   149760, 0x550bdaf0
+0,          2,          2,        1,   149760, 0x99440a14
+0,          3,          3,        1,   149760, 0xcc2c2049
+0,          4,          4,        1,   149760, 0x46927368
+0,          5,          5,        1,   149760, 0x53cdb3fe
+0,          6,          6,        1,   149760, 0x654df025
+0,          7,          7,        1,   149760, 0x024d24bc
+0,          8,          8,        1,   149760, 0x409138c2
+0,          9,          9,        1,   149760, 0xfbb47c48
+0,         10,         10,        1,   149760, 0x18caa19d
+0,         11,         11,        1,   149760, 0x0f88c2e5
+0,         12,         12,        1,   149760, 0x1c16aa2d
+0,         13,         13,        1,   149760, 0x60bfcce8
+0,         14,         14,        1,   149760, 0x1c38e3d3
+0,         15,         15,        1,   149760, 0x0d5b044a
+0,         16,         16,        1,   149760, 0x93d21593
+0,         17,         17,        1,   149760, 0xdf283910
+0,         18,         18,        1,   149760, 0x03324c23
+0,         19,         19,        1,   149760, 0x3b175b7b
+0,         20,         20,        1,   149760, 0xb91b9a7e
+0,         21,         21,        1,   149760, 0x734fbbe7
+0,         22,         22,        1,   149760, 0xfc3fea48
+0,         23,         23,        1,   149760, 0x6609103e
+0,         24,         24,        1,   149760, 0x3f5916fa
+0,         25,         25,        1,   149760, 0x08e43f4d
+0,         26,         26,        1,   149760, 0xc84e5471
+0,         27,         27,        1,   149760, 0xbd4e5c8d
+0,         28,         28,        1,   149760, 0x4a4d3995
+0,         29,         29,        1,   149760, 0x662163c0
+0,         30,         30,        1,   149760, 0xda28671f
+0,         31,         31,        1,   149760, 0x19e1878e
+0,         32,         32,        1,   149760, 0x19807e67
diff --git a/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1 b/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
new file mode 100644
index 0000000000..bbb3cfeaa1
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
@@ -0,0 +1,34 @@
+#tb 0: 1/25
+0,          0,          0,        1,   149760, 0x88619f80
+0,          1,          1,        1,   149760, 0x550bdaf0
+0,          2,          2,        1,   149760, 0x99440a14
+0,          3,          3,        1,   149760, 0xcc2c2049
+0,          4,          4,        1,   149760, 0x46927368
+0,          5,          5,        1,   149760, 0x53cdb3fe
+0,          6,          6,        1,   149760, 0x654df025
+0,          7,          7,        1,   149760, 0x024d24bc
+0,          8,          8,        1,   149760, 0x409138c2
+0,          9,          9,        1,   149760, 0xfbb47c48
+0,         10,         10,        1,   149760, 0x18caa19d
+0,         11,         11,        1,   149760, 0x0f88c2e5
+0,         12,         12,        1,   149760, 0x1c16aa2d
+0,         13,         13,        1,   149760, 0x60bfcce8
+0,         14,         14,        1,   149760, 0x1c38e3d3
+0,         15,         15,        1,   149760, 0x0d5b044a
+0,         16,         16,        1,   149760, 0x93d21593
+0,         17,         17,        1,   149760, 0xdf283910
+0,         18,         18,        1,   149760, 0x03324c23
+0,         19,         19,        1,   149760, 0x3b175b7b
+0,         20,         20,        1,   149760, 0xb91b9a7e
+0,         21,         21,        1,   149760, 0x734fbbe7
+0,         22,         22,        1,   149760, 0xfc3fea48
+0,         23,         23,        1,   149760, 0x6609103e
+0,         24,         24,        1,   149760, 0x3f5916fa
+0,         25,         25,        1,   149760, 0x08e43f4d
+0,         26,         26,        1,   149760, 0xc84e5471
+0,         27,         27,        1,   149760, 0xbd4e5c8d
+0,         28,         28,        1,   149760, 0x4a4d3995
+0,         29,         29,        1,   149760, 0x662163c0
+0,         30,         30,        1,   149760, 0xda28671f
+0,         31,         31,        1,   149760, 0x19e1878e
+0,         32,         32,        1,   149760, 0x19807e67