--- ./tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3     2019-07-31 21:32:01.464064534 +0200
+++ tests/data/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3      2019-08-02 10:55:39.707488117 +0200
@@ -4,258 +4,131 @@
 #dimensions 0: 416x240
 #sar 0: 0/1
 0,          0,          0,        1,   299520, 0x6ecba46b
-0,          1,          1,        1,   299520, 0x54e6ef0a
-0,          2,          2,        1,   299520, 0x7a4d46c5
-0,          3,          3,        1,   299520, 0xccd57f4e
-0,          4,          4,        1,   299520, 0xbe0cb48d
-0,          5,          5,        1,   299520, 0x10e7b49f
-0,          6,          6,        1,   299520, 0x81aa72e2
-0,          7,          7,        1,   299520, 0x5bf7b51f
-0,          8,          8,        1,   299520, 0xfcedee4a
-0,          9,          9,        1,   299520, 0x586c99b6
-0,         10,         10,        1,   299520, 0x414ca13c
-0,         11,         11,        1,   299520, 0x3f0162f2
-0,         12,         12,        1,   299520, 0x4d450c05
-0,         13,         13,        1,   299520, 0x0a58bd84
-0,         14,         14,        1,   299520, 0x26e8394d
-0,         15,         15,        1,   299520, 0xfd78121b
-0,         16,         16,        1,   299520, 0x6afeaf44
-0,         17,         17,        1,   299520, 0x3e9a9270
-0,         18,         18,        1,   299520, 0x58b889ca
-0,         19,         19,        1,   299520, 0x0245ba62
-0,         20,         20,        1,   299520, 0xddecc5ab
-0,         21,         21,        1,   299520, 0x32cf3cd9
-0,         22,         22,        1,   299520, 0x5c0a0440
-0,         23,         23,        1,   299520, 0x9d3e2fee
-0,         24,         24,        1,   299520, 0x2894c708
-0,         25,         25,        1,   299520, 0x25be67d5
-0,         26,         26,        1,   299520, 0xe3ece9d6
-0,         27,         27,        1,   299520, 0xcc98e38b
-0,         28,         28,        1,   299520, 0xc448c794
-0,         29,         29,        1,   299520, 0xb4f75575
-0,         30,         30,        1,   299520, 0xac74a437
-0,         31,         31,        1,   299520, 0x09c7f2e2
-0,         32,         32,        1,   299520, 0xbfaed8ab
-0,         33,         33,        1,   299520, 0xb077d700
-0,         34,         34,        1,   299520, 0x6efa0545
-0,         35,         35,        1,   299520, 0xb8c1802d
-0,         36,         36,        1,   299520, 0x794774f8
-0,         37,         37,        1,   299520, 0x1098f4ff
-0,         38,         38,        1,   299520, 0x80ab8bfc
-0,         39,         39,        1,   299520, 0xc324c3bc
-0,         40,         40,        1,   299520, 0x1eee77cd
-0,         41,         41,        1,   299520, 0x7147e72e
-0,         42,         42,        1,   299520, 0x1a34883c
-0,         43,         43,        1,   299520, 0x74e93e31
-0,         44,         44,        1,   299520, 0x89410382
-0,         45,         45,        1,   299520, 0xfcce0ce1
-0,         46,         46,        1,   299520, 0x07bb33c6
-0,         47,         47,        1,   299520, 0xc1ee7318
-0,         48,         48,        1,   299520, 0xd1c4bd2d
-0,         49,         49,        1,   299520, 0xa670cfae
-0,         50,         50,        1,   299520, 0x718de79b
-0,         51,         51,        1,   299520, 0x85e40b78
-0,         52,         52,        1,   299520, 0x15362e72
-0,         53,         53,        1,   299520, 0xc6e523fa
-0,         54,         54,        1,   299520, 0x3e536edd
-0,         55,         55,        1,   299520, 0x9312996e
-0,         56,         56,        1,   299520, 0x9456d53c
-0,         57,         57,        1,   299520, 0x7bc01398
-0,         58,         58,        1,   299520, 0x5a40bcb4
-0,         59,         59,        1,   299520, 0xcfe126ce
-0,         60,         60,        1,   299520, 0xd9e1adf1
-0,         61,         61,        1,   299520, 0x9027b1ae
-0,         62,         62,        1,   299520, 0x4c1372fb
-0,         63,         63,        1,   299520, 0xe475a00b
-0,         64,         64,        1,   299520, 0x945bc646
-0,         65,         65,        1,   299520, 0xc33dbab3
-0,         66,         66,        1,   299520, 0x9e4afb82
-0,         67,         67,        1,   299520, 0x1bffa858
-0,         68,         68,        1,   299520, 0x3bc78ad7
-0,         69,         69,        1,   299520, 0xa096e683
-0,         70,         70,        1,   299520, 0xb889aa23
-0,         71,         71,        1,   299520, 0x8ffad857
-0,         72,         72,        1,   299520, 0x59d3cc7c
-0,         73,         73,        1,   299520, 0x47d1377a
-0,         74,         74,        1,   299520, 0xea73e864
-0,         75,         75,        1,   299520, 0x0994bd5c
-0,         76,         76,        1,   299520, 0xdf779d85
-0,         77,         77,        1,   299520, 0x8238cfa7
-0,         78,         78,        1,   299520, 0x8f2e94cc
-0,         79,         79,        1,   299520, 0x9e0b0df8
-0,         80,         80,        1,   299520, 0x98ac1ce5
-0,         81,         81,        1,   299520, 0xc1c293ed
-0,         82,         82,        1,   299520, 0x1f1dfedb
-0,         83,         83,        1,   299520, 0xe7297d56
-0,         84,         84,        1,   299520, 0xa1390726
-0,         85,         85,        1,   299520, 0xf0e828e8
-0,         86,         86,        1,   299520, 0x108b8291
-0,         87,         87,        1,   299520, 0xd8830efb
-0,         88,         88,        1,   299520, 0xeee3d2f0
-0,         89,         89,        1,   299520, 0xa35d5b29
-0,         90,         90,        1,   299520, 0xa14d0840
-0,         91,         91,        1,   299520, 0xfa894a56
-0,         92,         92,        1,   299520, 0xd50005b5
-0,         93,         93,        1,   299520, 0xba625134
-0,         94,         94,        1,   299520, 0xce7dd782
-0,         95,         95,        1,   299520, 0x9e04e32f
-0,         96,         96,        1,   299520, 0x07e6d466
-0,         97,         97,        1,   299520, 0x4e66e1d4
-0,         98,         98,        1,   299520, 0x80aa6be6
-0,         99,         99,        1,   299520, 0xa4564be8
-0,        100,        100,        1,   299520, 0x7d34e443
-0,        101,        101,        1,   299520, 0xd5a08c86
-0,        102,        102,        1,   299520, 0xa73e63e8
-0,        103,        103,        1,   299520, 0x93937eb2
-0,        104,        104,        1,   299520, 0x0c08ba8f
-0,        105,        105,        1,   299520, 0x1d6b1a8c
-0,        106,        106,        1,   299520, 0x2e0272b4
-0,        107,        107,        1,   299520, 0x47177676
-0,        108,        108,        1,   299520, 0x6af7ffce
-0,        109,        109,        1,   299520, 0x0564a4bc
-0,        110,        110,        1,   299520, 0x7f664100
-0,        111,        111,        1,   299520, 0x6decd6ae
-0,        112,        112,        1,   299520, 0xb2d94adc
-0,        113,        113,        1,   299520, 0x55d33809
-0,        114,        114,        1,   299520, 0x5b126674
-0,        115,        115,        1,   299520, 0xd25d5750
-0,        116,        116,        1,   299520, 0x789a7f89
-0,        117,        117,        1,   299520, 0xdd082ab2
-0,        118,        118,        1,   299520, 0x3e6132ee
-0,        119,        119,        1,   299520, 0xe48209ca
-0,        120,        120,        1,   299520, 0x707d3b24
-0,        121,        121,        1,   299520, 0x8af19539
-0,        122,        122,        1,   299520, 0x0bbb4c38
-0,        123,        123,        1,   299520, 0xaaba4bd6
-0,        124,        124,        1,   299520, 0xa325d79e
-0,        125,        125,        1,   299520, 0x2bd4b64a
-0,        126,        126,        1,   299520, 0xab0c59a7
-0,        127,        127,        1,   299520, 0x260a56fc
-0,        128,        128,        1,   299520, 0xa1a55847
-0,        129,        129,        1,   299520, 0xa1a55847
-0,        130,        130,        1,   299520, 0x01438514
-0,        131,        131,        1,   299520, 0xa511e8bd
-0,        132,        132,        1,   299520, 0x7ebfd5b9
-0,        133,        133,        1,   299520, 0xdf4f1365
-0,        134,        134,        1,   299520, 0x6266911a
-0,        135,        135,        1,   299520, 0xe8eefcab
-0,        136,        136,        1,   299520, 0x7e74ca0d
-0,        137,        137,        1,   299520, 0x4b21d349
-0,        138,        138,        1,   299520, 0xa8b9ef41
-0,        139,        139,        1,   299520, 0x3187ee5b
-0,        140,        140,        1,   299520, 0x3fadb935
-0,        141,        141,        1,   299520, 0x8dca0391
-0,        142,        142,        1,   299520, 0x68215cc6
-0,        143,        143,        1,   299520, 0x7c81f366
-0,        144,        144,        1,   299520, 0x1a976381
-0,        145,        145,        1,   299520, 0x8ac095f4
-0,        146,        146,        1,   299520, 0xf5f8752b
-0,        147,        147,        1,   299520, 0xd8c03c80
-0,        148,        148,        1,   299520, 0x445a2e07
-0,        149,        149,        1,   299520, 0xddb83c6f
-0,        150,        150,        1,   299520, 0xc6dfe76a
-0,        151,        151,        1,   299520, 0x860a120f
-0,        152,        152,        1,   299520, 0x1ec91a95
-0,        153,        153,        1,   299520, 0x0180cc49
-0,        154,        154,        1,   299520, 0x63a115e3
-0,        155,        155,        1,   299520, 0x8848e971
-0,        156,        156,        1,   299520, 0x49246622
-0,        157,        157,        1,   299520, 0x3169db32
-0,        158,        158,        1,   299520, 0xcf01d8a3
-0,        159,        159,        1,   299520, 0x57a1a9c1
-0,        160,        160,        1,   299520, 0x517670eb
-0,        161,        161,        1,   299520, 0x4e2e6b5a
-0,        162,        162,        1,   299520, 0x06240a68
-0,        163,        163,        1,   299520, 0xa0d076a1
-0,        164,        164,        1,   299520, 0xb73c4515
-0,        165,        165,        1,   299520, 0x9f523268
-0,        166,        166,        1,   299520, 0x6fdcc6a2
-0,        167,        167,        1,   299520, 0xf3f5b69f
-0,        168,        168,        1,   299520, 0xce33a286
-0,        169,        169,        1,   299520, 0xce46e834
-0,        170,        170,        1,   299520, 0x14a6fe0d
-0,        171,        171,        1,   299520, 0x39a8145f
-0,        172,        172,        1,   299520, 0x91981d47
-0,        173,        173,        1,   299520, 0x1507d9be
-0,        174,        174,        1,   299520, 0x4525d4a2
-0,        175,        175,        1,   299520, 0x95e058ab
-0,        176,        176,        1,   299520, 0x8de2438a
-0,        177,        177,        1,   299520, 0xf43dc0ff
-0,        178,        178,        1,   299520, 0xaf232f4b
-0,        179,        179,        1,   299520, 0x8adabd81
-0,        180,        180,        1,   299520, 0x1e837b72
-0,        181,        181,        1,   299520, 0xb79f811d
-0,        182,        182,        1,   299520, 0x1532fb05
-0,        183,        183,        1,   299520, 0x2e3f6341
-0,        184,        184,        1,   299520, 0x10c82269
-0,        185,        185,        1,   299520, 0x8c39bd0c
-0,        186,        186,        1,   299520, 0x64fefe7b
-0,        187,        187,        1,   299520, 0x3ef6d5c7
-0,        188,        188,        1,   299520, 0x571c1edc
-0,        189,        189,        1,   299520, 0xe9e1584c
-0,        190,        190,        1,   299520, 0xd150a0db
-0,        191,        191,        1,   299520, 0x5d140f2d
-0,        192,        192,        1,   299520, 0xea00f302
-0,        193,        193,        1,   299520, 0xdd4e0fc4
-0,        194,        194,        1,   299520, 0x51c760fa
-0,        195,        195,        1,   299520, 0x68d5d26e
-0,        196,        196,        1,   299520, 0xde594a02
-0,        197,        197,        1,   299520, 0xac6d361a
-0,        198,        198,        1,   299520, 0xef6506ae
-0,        199,        199,        1,   299520, 0x744737a8
-0,        200,        200,        1,   299520, 0x2bd0834b
-0,        201,        201,        1,   299520, 0x348a8d0f
-0,        202,        202,        1,   299520, 0x93e165c8
-0,        203,        203,        1,   299520, 0x208d305c
-0,        204,        204,        1,   299520, 0xb927ed9a
-0,        205,        205,        1,   299520, 0xd252b13a
-0,        206,        206,        1,   299520, 0x11a59b2d
-0,        207,        207,        1,   299520, 0xc27785d0
-0,        208,        208,        1,   299520, 0x5c654cb5
-0,        209,        209,        1,   299520, 0x3d03a387
-0,        210,        210,        1,   299520, 0xdb0dc19d
-0,        211,        211,        1,   299520, 0x2ef3bbba
-0,        212,        212,        1,   299520, 0x7d36cd79
-0,        213,        213,        1,   299520, 0xa9ceca1e
-0,        214,        214,        1,   299520, 0x33db4d99
-0,        215,        215,        1,   299520, 0x8d28a55e
-0,        216,        216,        1,   299520, 0x554864a6
-0,        217,        217,        1,   299520, 0x6a336557
-0,        218,        218,        1,   299520, 0xd2285832
-0,        219,        219,        1,   299520, 0x9509f5f8
-0,        220,        220,        1,   299520, 0x8e479b03
-0,        221,        221,        1,   299520, 0x9513a8c3
-0,        222,        222,        1,   299520, 0x81080fac
-0,        223,        223,        1,   299520, 0x6c447b69
-0,        224,        224,        1,   299520, 0xbf4c2fbd
-0,        225,        225,        1,   299520, 0x1a77306e
-0,        226,        226,        1,   299520, 0xd485864b
-0,        227,        227,        1,   299520, 0x4e87b787
-0,        228,        228,        1,   299520, 0xe28e7153
-0,        229,        229,        1,   299520, 0x2ab24b9b
-0,        230,        230,        1,   299520, 0xffcb7357
-0,        231,        231,        1,   299520, 0x5e1e2b7e
-0,        232,        232,        1,   299520, 0x58d39e6d
-0,        233,        233,        1,   299520, 0x4a2b836a
-0,        234,        234,        1,   299520, 0xa1728e1e
-0,        235,        235,        1,   299520, 0x33e5bdd4
-0,        236,        236,        1,   299520, 0x3b144d98
-0,        237,        237,        1,   299520, 0xe72c4de2
-0,        238,        238,        1,   299520, 0x031350cb
-0,        239,        239,        1,   299520, 0x146fba58
-0,        240,        240,        1,   299520, 0x1b6679c7
-0,        241,        241,        1,   299520, 0x27e9d545
-0,        242,        242,        1,   299520, 0x5105beeb
-0,        243,        243,        1,   299520, 0x80284fd3
-0,        244,        244,        1,   299520, 0x426a5d65
-0,        245,        245,        1,   299520, 0xdcc33f89
-0,        246,        246,        1,   299520, 0x29e805ec
-0,        247,        247,        1,   299520, 0x89a09ed9
-0,        248,        248,        1,   299520, 0x60ad258c
-0,        249,        249,        1,   299520, 0xb44ee9b1
-0,        250,        250,        1,   299520, 0x184d6a88
-0,        251,        251,        1,   299520, 0xb4c8cefe
-0,        252,        252,        1,   299520, 0x358a0407
-0,        253,        253,        1,   299520, 0xa5cb97eb
-0,        254,        254,        1,   299520, 0x3d6a096e
-0,        255,        255,        1,   299520, 0xcb266e78
+0,          1,          1,        1,   299520, 0x7a4d46c5
+0,          2,          2,        1,   299520, 0xbe0cb48d
+0,          3,          3,        1,   299520, 0x81aa72e2
+0,          4,          4,        1,   299520, 0xfcedee4a
+0,          5,          5,        1,   299520, 0x414ca13c
+0,          6,          6,        1,   299520, 0x4d450c05
+0,          7,          7,        1,   299520, 0x26e8394d
+0,          8,          8,        1,   299520, 0x6afeaf44
+0,          9,          9,        1,   299520, 0x58b889ca
+0,         10,         10,        1,   299520, 0xddecc5ab
+0,         11,         11,        1,   299520, 0x5c0a0440
+0,         12,         12,        1,   299520, 0x2894c708
+0,         13,         13,        1,   299520, 0xe3ece9d6
+0,         14,         14,        1,   299520, 0xc448c794
+0,         15,         15,        1,   299520, 0xac74a437
+0,         16,         16,        1,   299520, 0xbfaed8ab
+0,         17,         17,        1,   299520, 0x6efa0545
+0,         18,         18,        1,   299520, 0x794774f8
+0,         19,         19,        1,   299520, 0x80ab8bfc
+0,         20,         20,        1,   299520, 0x1eee77cd
+0,         21,         21,        1,   299520, 0x1a34883c
+0,         22,         22,        1,   299520, 0x89410382
+0,         23,         23,        1,   299520, 0x07bb33c6
+0,         24,         24,        1,   299520, 0xd1c4bd2d
+0,         25,         25,        1,   299520, 0x718de79b
+0,         26,         26,        1,   299520, 0x15362e72
+0,         27,         27,        1,   299520, 0x3e536edd
+0,         28,         28,        1,   299520, 0x9456d53c
+0,         29,         29,        1,   299520, 0x5a40bcb4
+0,         30,         30,        1,   299520, 0xd9e1adf1
+0,         31,         31,        1,   299520, 0x4c1372fb
+0,         32,         32,        1,   299520, 0x945bc646
+0,         33,         33,        1,   299520, 0x9e4afb82
+0,         34,         34,        1,   299520, 0x3bc78ad7
+0,         35,         35,        1,   299520, 0xb889aa23
+0,         36,         36,        1,   299520, 0x59d3cc7c
+0,         37,         37,        1,   299520, 0xea73e864
+0,         38,         38,        1,   299520, 0xdf779d85
+0,         39,         39,        1,   299520, 0x8f2e94cc
+0,         40,         40,        1,   299520, 0x98ac1ce5
+0,         41,         41,        1,   299520, 0x1f1dfedb
+0,         42,         42,        1,   299520, 0xa1390726
+0,         43,         43,        1,   299520, 0x108b8291
+0,         44,         44,        1,   299520, 0xeee3d2f0
+0,         45,         45,        1,   299520, 0xa14d0840
+0,         46,         46,        1,   299520, 0xd50005b5
+0,         47,         47,        1,   299520, 0xce7dd782
+0,         48,         48,        1,   299520, 0x07e6d466
+0,         49,         49,        1,   299520, 0x80aa6be6
+0,         50,         50,        1,   299520, 0x7d34e443
+0,         51,         51,        1,   299520, 0xa73e63e8
+0,         52,         52,        1,   299520, 0x0c08ba8f
+0,         53,         53,        1,   299520, 0x2e0272b4
+0,         54,         54,        1,   299520, 0x6af7ffce
+0,         55,         55,        1,   299520, 0x7f664100
+0,         56,         56,        1,   299520, 0xb2d94adc
+0,         57,         57,        1,   299520, 0x5b126674
+0,         58,         58,        1,   299520, 0x789a7f89
+0,         59,         59,        1,   299520, 0x3e6132ee
+0,         60,         60,        1,   299520, 0x707d3b24
+0,         61,         61,        1,   299520, 0x0bbb4c38
+0,         62,         62,        1,   299520, 0xa325d79e
+0,         63,         63,        1,   299520, 0xab0c59a7
+0,         64,         64,        1,   299520, 0xa1a55847
+0,         65,         65,        1,   299520, 0x01438514
+0,         66,         66,        1,   299520, 0x7ebfd5b9
+0,         67,         67,        1,   299520, 0x6266911a
+0,         68,         68,        1,   299520, 0x7e74ca0d
+0,         69,         69,        1,   299520, 0xa8b9ef41
+0,         70,         70,        1,   299520, 0x3fadb935
+0,         71,         71,        1,   299520, 0x68215cc6
+0,         72,         72,        1,   299520, 0x1a976381
+0,         73,         73,        1,   299520, 0xf5f8752b
+0,         74,         74,        1,   299520, 0x445a2e07
+0,         75,         75,        1,   299520, 0xc6dfe76a
+0,         76,         76,        1,   299520, 0x1ec91a95
+0,         77,         77,        1,   299520, 0x63a115e3
+0,         78,         78,        1,   299520, 0x49246622
+0,         79,         79,        1,   299520, 0xcf01d8a3
+0,         80,         80,        1,   299520, 0x517670eb
+0,         81,         81,        1,   299520, 0x06240a68
+0,         82,         82,        1,   299520, 0xb73c4515
+0,         83,         83,        1,   299520, 0x6fdcc6a2
+0,         84,         84,        1,   299520, 0xce33a286
+0,         85,         85,        1,   299520, 0x14a6fe0d
+0,         86,         86,        1,   299520, 0x91981d47
+0,         87,         87,        1,   299520, 0x4525d4a2
+0,         88,         88,        1,   299520, 0x8de2438a
+0,         89,         89,        1,   299520, 0xaf232f4b
+0,         90,         90,        1,   299520, 0x1e837b72
+0,         91,         91,        1,   299520, 0x1532fb05
+0,         92,         92,        1,   299520, 0x10c82269
+0,         93,         93,        1,   299520, 0x64fefe7b
+0,         94,         94,        1,   299520, 0x571c1edc
+0,         95,         95,        1,   299520, 0xd150a0db
+0,         96,         96,        1,   299520, 0xea00f302
+0,         97,         97,        1,   299520, 0x51c760fa
+0,         98,         98,        1,   299520, 0xde594a02
+0,         99,         99,        1,   299520, 0xef6506ae
+0,        100,        100,        1,   299520, 0x2bd0834b
+0,        101,        101,        1,   299520, 0x93e165c8
+0,        102,        102,        1,   299520, 0xb927ed9a
+0,        103,        103,        1,   299520, 0x11a59b2d
+0,        104,        104,        1,   299520, 0x5c654cb5
+0,        105,        105,        1,   299520, 0xdb0dc19d
+0,        106,        106,        1,   299520, 0x7d36cd79
+0,        107,        107,        1,   299520, 0x33db4d99
+0,        108,        108,        1,   299520, 0x554864a6
+0,        109,        109,        1,   299520, 0xd2285832
+0,        110,        110,        1,   299520, 0x8e479b03
+0,        111,        111,        1,   299520, 0x81080fac
+0,        112,        112,        1,   299520, 0xbf4c2fbd
+0,        113,        113,        1,   299520, 0xd485864b
+0,        114,        114,        1,   299520, 0xe28e7153
+0,        115,        115,        1,   299520, 0xffcb7357
+0,        116,        116,        1,   299520, 0x58d39e6d
+0,        117,        117,        1,   299520, 0xa1728e1e
+0,        118,        118,        1,   299520, 0x3b144d98
+0,        119,        119,        1,   299520, 0x031350cb
+0,        120,        120,        1,   299520, 0x1b6679c7
+0,        121,        121,        1,   299520, 0x5105beeb
+0,        122,        122,        1,   299520, 0x426a5d65
+0,        123,        123,        1,   299520, 0x29e805ec
+0,        124,        124,        1,   299520, 0x60ad258c
+0,        125,        125,        1,   299520, 0x184d6a88
+0,        126,        126,        1,   299520, 0x358a0407
+0,        127,        127,        1,   299520, 0x3d6a096e
+0,        128,        128,        1,   299520, 0xcb266e78
