h264: update test hashes after the changes

diff --git a/nihav-itu/src/codecs/h264/mod.rs b/nihav-itu/src/codecs/h264/mod.rs
index 67156da541ed36c914755dc7e11ebdab7c1e4efa..df46760a08c4945d46b1e2be83546cda51b27f64 100644 (file)
--- a/nihav-itu/src/codecs/h264/mod.rs
+++ b/nihav-itu/src/codecs/h264/mod.rs
@@ -1125,31 +1125,31 @@ mod test {
         test_decoding("rawh264", "h264",
                       "assets/ITU/h264-conformance/CABAST3_Sony_E.jsv",
                       None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
-                        [0x85fc4b44, 0xc9aefdc9, 0x568d0592, 0x2eccf9a0],
-                        [0xbd8d11bc, 0x97acf592, 0x45a3cdbb, 0xa254a882],
-                        [0xbda0e0b9, 0x9fbe1974, 0x1540b244, 0x46a050ca],
-                        [0x471f0057, 0x125ef3b4, 0x4a87515f, 0xba254bbb],
-                        [0x466a7df2, 0xb392c2a4, 0xed66b68b, 0xfdaad2da],
-                        [0x96334b41, 0x41bac7ef, 0xe87154f1, 0xa5fc3551],
-                        [0x0fd4e9b8, 0x4269bbec, 0x00a1978f, 0xe6224851],
-                        [0x68be82af, 0x856615a7, 0x387a253d, 0x8473e6b9],
-                        [0xc4bed119, 0x14ba7fe0, 0x447cb680, 0x555da4c5],
-                        [0x85d127d6, 0x04b85928, 0x26740281, 0x4d848db5],
-                        [0xe44fe461, 0x0d0b64ce, 0xf191179b, 0xabdab686],
-                        [0x347c8edb, 0x847ad11f, 0x8f16b84e, 0xdc915d75],
-                        [0xeb1364a6, 0x91c9d99d, 0x324f5427, 0xcc9f11a2],
-                        [0x7aeb5a3f, 0xebc9c4dd, 0x8f12c8e4, 0x37a2db97],
-                        [0xa11e5c33, 0x656df4c0, 0x1e8b98d8, 0x1736722f],
-                        [0x239f2ef2, 0xe32b0603, 0x448366bb, 0x9331051c],
-                        [0x1815a1b1, 0xfb7e7cf0, 0xd5c7dd5b, 0x0135a8fb],
-                        [0xea3b85dd, 0xa96e7015, 0xa91c576d, 0x5c127ca1],
-                        [0x1c49148f, 0x6d9e7045, 0x093f0b7c, 0x42c2ebaa],
-                        [0x4b4c2863, 0x95709d8c, 0xeb72e251, 0x096632dc],
-                        [0x727418e5, 0x2c015383, 0x59580212, 0x0302dd99],
-                        [0xbe57dfa4, 0xf2aa7d70, 0xa068ee62, 0x77372861],
-                        [0x2faef43a, 0x73da6654, 0xb9d9c22e, 0xc59520bc],
-                        [0x138cff40, 0x3e6c108a, 0xa981e654, 0x903da85b],
-                        [0xa90454f5, 0x7875d5db, 0xbab234bd, 0xe6ce1193]]));
+                        [0xb5e5e368, 0x6ac59bfc, 0x82e35b7b, 0xbed17b81],
+                        [0x8343b34d, 0x0de80ae9, 0xe9c08cc9, 0x05161d82],
+                        [0x26e08b9b, 0x84949759, 0x71622124, 0x9bfff254],
+                        [0x940c38bc, 0x559fb990, 0x2b82a7ca, 0x3543188a],
+                        [0x60d7544d, 0x2fc8cc23, 0x4acac90f, 0x44c2a91c],
+                        [0x68d86265, 0x15fc15b9, 0xe4946d83, 0x39d9584d],
+                        [0xaed8e194, 0xa24b3a8a, 0xbed9085d, 0x05d68293],
+                        [0x1cddffac, 0x0ce9d209, 0xc4090b8a, 0xc3008856],
+                        [0x42ee0e5e, 0x4c1c3b64, 0xd91cc00b, 0x88be4b15],
+                        [0x19a70aa8, 0xd8bc987d, 0x51c04849, 0x71191523],
+                        [0x74532da6, 0xecb92919, 0xd39cb150, 0x9ca9933d],
+                        [0x0444b315, 0x2ddfb91a, 0x1e21ce06, 0x0c8613e6],
+                        [0xce209363, 0xf8d8331f, 0x72e0102f, 0x88de3a97],
+                        [0xdbcfa40a, 0x7eed5940, 0xa5c53a66, 0xdfcd3cea],
+                        [0x00796b14, 0x58f16117, 0xb6a5efd1, 0xfb129acd],
+                        [0x7673f569, 0xfccfb96a, 0x1f614c82, 0xf62ea376],
+                        [0x8669d98b, 0x9fdf4e7d, 0xa4083a7f, 0x9b66d296],
+                        [0xf0537976, 0x924229ab, 0xd0f4612f, 0xad4b614e],
+                        [0xbde82067, 0x6cf23a0c, 0xdd29e64d, 0xcaa72ff3],
+                        [0xcfcb544a, 0x1f1a81b0, 0x2217108c, 0x4888d5ef],
+                        [0x3369f874, 0x6a6dde75, 0x46d64780, 0xbf6ced32],
+                        [0x253a1f45, 0x85954311, 0x983dbabe, 0x658f4ce3],
+                        [0xec97b332, 0xa17b26d0, 0xbead22af, 0xa6bd7d8e],
+                        [0x5673d973, 0x78528036, 0xabfe5e13, 0xdcedfb26],
+                        [0xd6110fa9, 0x532d6a30, 0xb7f0aa7c, 0xae7b544b]]));
     }
 
     // mostly static music video downloaded with youtube-dl
@@ -1201,30 +1201,30 @@ mod test {
                             [0x9dbac04a, 0xc49ca8c1, 0x09bb9182, 0xc7928970],
                             [0x9dbac04a, 0xc49ca8c1, 0x09bb9182, 0xc7928970],
                             [0x9dbac04a, 0xc49ca8c1, 0x09bb9182, 0xc7928970],
-                            [0xf1c88c12, 0x7da871f5, 0xdaf3153f, 0x66e72d72],
-                            [0x3d4765f1, 0x8ac472f6, 0x7ffd13a6, 0xc7a45dae],
-                            [0x60e5e13a, 0xd2d7f239, 0x1a793d71, 0x19f8c190],
-                            [0xdd80c3e4, 0xb1500149, 0x43925280, 0x9e5f3230],
-                            [0x2adf6e64, 0x39012d45, 0x7a776cb5, 0x3df76e84],
-                            [0x44319007, 0xbc837dd2, 0x486b2703, 0x451d0651],
-                            [0x922386ef, 0xaf101e9b, 0xf2094a40, 0xc8c454c0],
-                            [0x0d81e398, 0x04192a56, 0xa31f39d0, 0x5e0a2deb],
-                            [0xcdd144b3, 0xd1c7743e, 0x5753b0f4, 0xc070efa9],
-                            [0xe1c67e39, 0x6065ddaf, 0x576bf9f1, 0x8e6825aa],
-                            [0xaf817b0d, 0xdc6c345a, 0xf7f289c7, 0x6cc482d8],
-                            [0x81dc4bcb, 0xee4fc5e5, 0x9b87c7ef, 0xdd0fb034],
-                            [0x8b07f523, 0x4168799f, 0x990cb270, 0x858b9f2c],
-                            [0x31855a80, 0xadbcc562, 0xe60628be, 0x5f04be09],
-                            [0x9c614acc, 0xbd08a3f4, 0x91b02c45, 0x41899a83],
-                            [0x89d09064, 0xbff810a3, 0x9c674179, 0x305225a6],
-                            [0xba1fc8d3, 0x15d34fae, 0x565d363b, 0x4f4d0604],
-                            [0x1cb15a1b, 0xa0be111e, 0x45cc801f, 0x01a2c691],
-                            [0xd898be48, 0xd19bf58d, 0xe22fe44f, 0x6a2914fb],
-                            [0xec6712af, 0xa13b55c0, 0x2915a746, 0xb29a5c48],
-                            [0x745798fa, 0x4ef0f882, 0x59335c08, 0xb1d9dbb4],
-                            [0x4045b495, 0xdb3d969c, 0x1f0d9220, 0x5a34067b],
-                            [0x94fee093, 0x78ad89b3, 0xf20e882b, 0x941425db],
-                            [0xc3eb1a78, 0x4b4e098a, 0xcbcf9bb4, 0xfd5b5426]]));
+                            [0xc54f1b6e, 0xaba56a71, 0x8b45132b, 0x3c8bde7f],
+                            [0xe2742374, 0x7b9d6fa6, 0xd57eb3bb, 0x42986664],
+                            [0xa5ebdc2e, 0x9753a46a, 0x631c6359, 0x861ae0e3],
+                            [0x4d2c8769, 0xb9e15141, 0x03274d1f, 0xc15a3733],
+                            [0x17ebec8f, 0xe417571e, 0x75eb2559, 0x2f9b882b],
+                            [0x148e8c97, 0x778f92ba, 0x93646539, 0xeebe643a],
+                            [0xc6770caa, 0x1ac11a57, 0x1388a550, 0x2347758e],
+                            [0x91eb3ae4, 0xaf664462, 0x858d344a, 0xda3baa79],
+                            [0x4de79514, 0x3597aff0, 0x53e1a22f, 0x7875aa4c],
+                            [0xd5afcf7c, 0xa0f4ce82, 0x21a70eb2, 0x3911cde1],
+                            [0x9efa2a08, 0x29019ca6, 0xaba90890, 0xfb982857],
+                            [0xc5755e20, 0x4c66cb54, 0x1194812e, 0x11a9d940],
+                            [0xfd131bbb, 0x0acefb02, 0x6c79b7ab, 0x35bcdd26],
+                            [0xad159db0, 0xfa65ced2, 0xf77e2b22, 0x9e6283a8],
+                            [0xba2059e3, 0xc9f1e5e7, 0x7ea5fbcb, 0xf48d4fc3],
+                            [0xbe794078, 0x64d69f9b, 0x7b6355c5, 0x7dfb5b0f],
+                            [0x6031b77b, 0x712f42fd, 0x30d423df, 0x740e488c],
+                            [0xcc475484, 0x30a664fc, 0x227a9725, 0x4b2bfb18],
+                            [0x44bef2ea, 0xaf1e69e8, 0x832d94a8, 0xffb22712],
+                            [0xe9471e3d, 0x103de80f, 0xdc44136f, 0x67dacaa8],
+                            [0x4df3823d, 0xf6486ca9, 0x016f3114, 0x1c2d0b42],
+                            [0x1171666b, 0x08ca0ced, 0x98719757, 0xbd6b4a86],
+                            [0x9d2fc556, 0x5569fbbd, 0x0ebf629f, 0xd4fdc3b5],
+                            [0x27dbd3c3, 0x803f0230, 0x13f2ff1b, 0xb661b622]]));
     }
     // a sample downloaded from gfycat.com
     #[test]
@@ -1237,17 +1237,17 @@ mod test {
         test_decoding("mov", "h264", "assets/ITU/DimpledSpanishCuckoo-mobile.mp4",
                       Some(10), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5Frames(vec![
-                            [0x1addcb8e, 0xde58b857, 0x17222c32, 0x75455fa8],
-                            [0xae63141a, 0x79435b2e, 0xfe606c48, 0xf676da66],
-                            [0xfdb80404, 0x6a288e23, 0x45cc4106, 0xdd5eb57c],
-                            [0xd603a3ff, 0x872dcb9b, 0x43f7a71c, 0x2ad4eecc],
-                            [0x639ed6a5, 0xbb1cfec6, 0x0ee5443a, 0x1694772a],
-                            [0xf8ef3f48, 0x152de238, 0xb1995f9a, 0xf82ad1d5],
-                            [0x604f6265, 0xb9d82f56, 0x21f00cf4, 0xc69c18a7],
-                            [0xd932c16e, 0x25cbf060, 0xcb66543b, 0xfe8a5019],
-                            [0xf2a3dac0, 0x0f4678dd, 0xf64c8228, 0x47f14676],
-                            [0x267041ee, 0x3b6b8b64, 0x8bfe1697, 0x1fba508b],
-                            [0x9f917e72, 0x75d882a9, 0xa5e3e684, 0x4ed87eff]]));
+                            [0x674c6d60, 0xc7ab918d, 0x9db1beaf, 0xda9f2456],
+                            [0x6a935350, 0x3d463ab2, 0xa3ab3c53, 0x97eb896b],
+                            [0xf6c60411, 0x19ea2c49, 0x3512371a, 0xce6cb26a],
+                            [0xc87afeaa, 0x79899908, 0x152e6320, 0xe689827f],
+                            [0xa3d829e3, 0xb404dd32, 0x11983613, 0xbdf10ee6],
+                            [0x2440ea01, 0x5b9d7fc7, 0x4fa5632b, 0xd2d76090],
+                            [0xd80e8bf9, 0xe9190ab7, 0x2be8fa38, 0xb94182e8],
+                            [0x50b9fd9a, 0x64393126, 0xd03162ec, 0xfb54172a],
+                            [0x80d1f58f, 0x12e454c0, 0x2140ca5c, 0xe19350ba],
+                            [0x26078d38, 0xf6a59d57, 0xcd14eaf8, 0x8eb08259],
+                            [0x31494337, 0x6f8d3f52, 0x4bc9ff92, 0x0c601b1c]]));
     }
 }
 

diff --git a/nihav-itu/src/codecs/h264/test/conformance.rs b/nihav-itu/src/codecs/h264/test/conformance.rs
index 5ad0cdc86d1f90c80c023a3e0a103d2c52789e6e..66d7931e9528881defd11066b986c2c57eee97de 100644 (file)
--- a/nihav-itu/src/codecs/h264/test/conformance.rs
+++ b/nihav-itu/src/codecs/h264/test/conformance.rs
@@ -27,36 +27,36 @@ const GENERAL_TEST_STREAMS: &[(&str, [u32; 4])] = &[
     ("SVA_NL1_B.264", [0xB5626983, 0xAC087749, 0x7FFF9A4B, 0x10D2F1D4]),
     ("NL2_Sony_H.jsv", [0x48D8380C, 0xDB7EFF52, 0x116C1AAD, 0xDBC583F5]),
     ("SVA_NL2_E.264", [0xB47E932D, 0x43628801, 0x3B8453D9, 0xA1D0F60D]),
-    ("BA1_Sony_D.jsv", [0xFDE8F7A6, 0x34A7B7CE, 0xA7F1317D, 0xAAF5EB7C]),
-    ("SVA_BA1_B.264", [0x627288C4, 0xE4D4E7A6, 0xA13F187C, 0x4A7A9A4D]),
-    ("BA2_Sony_F.jsv", [0xB4C1B35F, 0xDC25B520, 0x5E842E64, 0x19C0E81A]),
-    ("SVA_BA2_D.264", [0x18B60729, 0x98CDA04B, 0x278B1436, 0x27FC9D4A]),
-    ("BA_MW_D.264", [0xC42C2D96, 0xC49254A6, 0xE980B174, 0xDB1CE2D8]),
-    ("BANM_MW_D.264", [0x6572ACB5, 0xE65EA0BC, 0x4A7ECBE7, 0xE436E654]),
-    ("BA1_FT_C.264", [0x355A737E, 0xE9FBDE6E, 0xAA47ACFD, 0xED7D2475]),
-    ("NLMQ1_JVC_C.264", [0xB5DE2480, 0xBD391286, 0x7FE69D65, 0x7AADDD6E]),
-    ("NLMQ2_JVC_C.264", [0x35635990, 0xBE9CB3E5, 0x1000CBB1, 0xC8322D5B]),
-    ("BAMQ1_JVC_C.264", [0x04B40C4A, 0xF5A4B4C0, 0x94D77821, 0x79D12A88]),
-    ("BAMQ2_JVC_C.264", [0xDAB08F3D, 0x5E304802, 0xC91AC830, 0x71BFB9DE]),
-    ("SVA_Base_B.264", [0x4B5BB06C, 0x8C698DA3, 0xABFAD6B9, 0xA28852D2]),
-    ("SVA_FM1_E.264", [0x5A20AF6C, 0xDBE9B632, 0x5D752096, 0xC587A7F1]),
-    ("BASQP1_Sony_C.jsv", [0xB49014B2, 0xDC04FE5A, 0x6138C083, 0x387A9A9B]),
+    ("BA1_Sony_D.jsv", [0x114D1CF9, 0x4A2FCAFF, 0xDA0CF1B4, 0x9964BF3D]),
+    ("SVA_BA1_B.264", [0xDAB92AA2, 0x145AB44A, 0xBAB2BEB2, 0x868DD326]),
+    ("BA2_Sony_F.jsv", [0x124D2830, 0x7B057028, 0x12A374CF, 0xC9AAD615]),
+    ("SVA_BA2_D.264", [0x66130B14, 0x295574BF, 0x35B725A8, 0xEADED3AE]),
+    ("BA_MW_D.264", [0x7D5D351A, 0xD0616402, 0x94BF43A4, 0x3150FBCA]),
+    ("BANM_MW_D.264", [0xE637D38E, 0xD004DF35, 0x40218E3D, 0x84B43E42]),
+    ("BA1_FT_C.264", [0x8598CFC0, 0x6EDE33D4, 0xF24D8552, 0x28E5C8BB]),
+    ("NLMQ1_JVC_C.264", [0xFFCABB64, 0x192CED39, 0x90872B46, 0x70AF05EB]),
+    ("NLMQ2_JVC_C.264", [0x90B70FBA, 0xA5CA679E, 0xC9BF5E01, 0x1DDBA8F9]),
+    ("BAMQ1_JVC_C.264", [0x2F4F0B86, 0xC76F0356, 0x491CE56D, 0x6331E885]),
+    ("BAMQ2_JVC_C.264", [0xE3F5D5B0, 0x774B5537, 0x0745F2D0, 0x4F009575]),
+    ("SVA_Base_B.264", [0x97F3F1F5, 0xB4034C8A, 0xBC29EF43, 0xE752005C]),
+    ("SVA_FM1_E.264", [0x079F354D, 0xAC1204EE, 0x1C31DCAE, 0xD421E99C]),
+    ("BASQP1_Sony_C.jsv", [0x630F0900, 0x8D248A40, 0xC3E04F7E, 0x43351EC6]),
     /*"FM1_BT_B.h264",
     "FM2_SVA_C.264",
     "FM1_FT_E.264",*/ //special slice modes
-    ("CI_MW_D.264", [0x4571A884, 0xA6C7856F, 0x4377928C, 0x830246E3]),
+    ("CI_MW_D.264", [0x0EB95292, 0xAD9FC21C, 0x89D93F8B, 0x049E451A]),
     ("SVA_CL1_E.264", [0x5723A151, 0x8DE9FADC, 0xA7499C5B, 0xA34DA7C4]),
-    ("CI1_FT_B.264", [0x411ECE62, 0xFDD3791E, 0xE3E90B82, 0x1B79CF77]),
-    ("CVFC1_Sony_C.jsv", [0x78E5AAA2, 0x48CC85CC, 0x68DD1D56, 0x535F6ED0]),
+    ("CI1_FT_B.264", [0x16F329D0, 0x196938FD, 0xB1AB2402, 0x5B208CFD]),
+    ("CVFC1_Sony_C.jsv", [0x4A8F8461, 0xD42A83C5, 0x126C4E5E, 0x5B2060D6]),
     ("AUD_MW_E.264", [0xE96FE505, 0x4DE0329A, 0x8868D060, 0x03375CDB]),
-    ("MIDR_MW_D.264", [0x527E7207, 0x584DFE19, 0x3346316F, 0xCBAB1516]),
-    ("NRF_MW_E.264", [0x22F2011C, 0x44661F4D, 0xABBBD4A2, 0x423AB9B8]),
-    ("MPS_MW_A.264", [0x3159BB10, 0xD656899D, 0xD13D89E2, 0x44F6F5BD]),
-    ("CVBS3_Sony_C.jsv", [0xFF57F1A4, 0xD03A6599, 0x8CDC4EFE, 0x19DC4ADB]),
-    ("BA3_SVA_C.264", [0xe35fe99a, 0xd8ebef51, 0x017e2169, 0xe48e3ad5]),
-    ("SL1_SVA_B.264", [0x738E8AAD, 0x711E58FE, 0x76C5E366, 0x432BBB90]),
+    ("MIDR_MW_D.264", [0xD87BFF88, 0xB2C5B96C, 0xCB291EF6, 0x8A45BBC2]),
+    ("NRF_MW_E.264", [0xA8635615, 0xB50C5A16, 0xDECC555A, 0x3C6C81C8]),
+    ("MPS_MW_A.264", [0x88BB5A51, 0x3BD7F3CC, 0x8190C7C0, 0x3688AB22]),
+    ("CVBS3_Sony_C.jsv", [0xC7794005, 0xC8DA6D8D, 0xEB435ECE, 0x07908055]),
+    ("BA3_SVA_C.264", [0xBF1AE77A, 0x094AA1E7, 0x5316BE72, 0x5B46EF1B]),
+    ("SL1_SVA_B.264", [0xA44D8BAF, 0x7290B175, 0xC59A308D, 0x5C0D1E4C]),
     ("NL3_SVA_E.264", [0x428B0604, 0xFF02E0A0, 0x0DA08577, 0xDA0EEB76]),
-    ("cvmp_mot_frm0_full_B.26l", [0xb8baed20, 0x7e57efcb, 0x22ba5538, 0x849a573f]),
+    ("cvmp_mot_frm0_full_B.26l", [0x9F43ED02, 0xC0C322E8, 0x9FCAB584, 0xC9B31EC4]),
     // no direct mention
     //"FM2_SVA_B.264", //special slice mode
 ];
@@ -75,18 +75,18 @@ fn test_h264_ipcm() {
 }
 
 const MMCO_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("MR1_BT_A.h264", [0x6c9c7a22, 0x3c5d0f04, 0x73d7e777, 0x46d8e1c9]),
-    ("MR2_TANDBERG_E.264", [0x225aff94, 0x8c079867, 0xf7f0af24, 0xc4093834]),
-    ("MR3_TANDBERG_B.264", [0x49728ec3, 0x3d6247de, 0x72dd49ae, 0x22c11930]),
-    ("MR4_TANDBERG_C.264", [0x98aaed22, 0x5bf63437, 0x8209bc05, 0x58ad5782]),
-    ("MR5_TANDBERG_C.264", [0xa1c5e24a, 0xf96e4801, 0x2f2ac7f6, 0xb61e2779]),
-    ("MR1_MW_A.264", [0x6e6ba67d, 0x1829c4e1, 0x639e9ec3, 0x68b72208]),
-    ("MR2_MW_A.264", [0x08499fbb, 0x2a566e46, 0x72e5685e, 0xcacb802c]),
+    ("MR1_BT_A.h264", [0x0402E92F, 0xD2F61B66, 0xCD1FC641, 0x07A73A1D]),
+    ("MR2_TANDBERG_E.264", [0x60A8C721, 0xFC5E83F7, 0xCA83FDAF, 0x4AD1509F]),
+    ("MR3_TANDBERG_B.264", [0x040200B1, 0xC35A2D5A, 0xB07FDFD5, 0xBC5FD5C2]),
+    ("MR4_TANDBERG_C.264", [0x82ADC86A, 0x9F682F8A, 0x45A68C7C, 0xAAF5E116]),
+    ("MR5_TANDBERG_C.264", [0x3570D5C6, 0xA4FD9C71, 0x55AC43D9, 0xF806C46D]),
+    ("MR1_MW_A.264", [0x479C6F4E, 0x73FEA343, 0x69F72425, 0x72EAD53C]),
+    ("MR2_MW_A.264", [0xE1E93E65, 0x96AF2EFD, 0x0E7D0FE5, 0x94D5BE85]),
     /*"MR6_BT_B.h264",
     "MR7_BT_B.h264",
     "MR8_BT_B.h264",*/ // interlaced coding
-    ("HCBP1_HHI_A.264", [0x69F61D9D, 0x050F777D, 0x894C3191, 0x76A33A13]),
-    ("HCBP2_HHI_A.264", [0xEAE95099, 0x1F6CD60B, 0xE2435713, 0x5E4661CA]),
+    ("HCBP1_HHI_A.264", [0x2AD73C01, 0x57EA7763, 0x0F0BDE82, 0x17E27DC2]),
+    ("HCBP2_HHI_A.264", [0x93F3C560, 0x42519B03, 0x1A4F03B1, 0xFD2C3A84]),
 ];
 #[test]
 fn test_h264_mmco() {
@@ -94,10 +94,10 @@ fn test_h264_mmco() {
 }
 
 const WP_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("CVWP5_TOSHIBA_E.264", [0xB6C61135, 0x9A6F86DE, 0xC46445A3, 0x350A75B2]),
-    ("CVWP1_TOSHIBA_E.264", [0xA3F64FC4, 0xC18AA1A1, 0x622C6D25, 0x289930B2]),
-    ("CVWP2_TOSHIBA_E.264", [0x42c18fb8, 0x9062f091, 0xa06c9ac1, 0x00d3bc80]),
-    ("CVWP3_TOSHIBA_E.264", [0x76e164a1, 0x26ff7073, 0x655f1fe9, 0xac40a0fd]),
+    ("CVWP5_TOSHIBA_E.264", [0x9663DA55, 0xE5EF516C, 0x8BF0CA0B, 0xCC0ABBB8]),
+    ("CVWP1_TOSHIBA_E.264", [0xE8868CA5, 0xE934AD77, 0x9132CDB3, 0xC71BE000]),
+    ("CVWP2_TOSHIBA_E.264", [0xD06C81B6, 0x31FD4381, 0xF5AFB345, 0x4AF650AC]),
+    ("CVWP3_TOSHIBA_E.264", [0x909A1FC8, 0x63D649CC, 0x4F091CBB, 0x058ADA78]),
 ];
 #[test]
 fn test_h264_wp() {
@@ -159,7 +159,7 @@ fn test_h264_s_picture() {
 }*/
 
 const LONG_SEQUENCE_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("LS_SVA_D.264", [0xA1F4C1CC, 0x701AF32F, 0x985CDE87, 0xA0785B4D]),
+    ("LS_SVA_D.264", [0x9C53BE4B, 0x1DEDCD45, 0x98D30293, 0xF01C7BFE]),
 ];
 #[test]
 fn test_h264_long_sequence() {
@@ -167,9 +167,9 @@ fn test_h264_long_sequence() {
 }
 
 const SEI_VUI_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("CVSE2_Sony_B.jsv", [0xDC811E9A, 0xD11D06A0, 0x00F55FF3, 0x2179433E]),
-    ("CVSE3_Sony_H.jsv", [0x30CCF52E, 0x2B0DCE8F, 0x98384A84, 0x51BD4F89]),
-    ("CVSEFDFT3_Sony_E.jsv", [0x1EA2228B, 0xBDD88D50, 0x95C452C4, 0xC75A5229]),
+    ("CVSE2_Sony_B.jsv", [0xDD660FB4, 0x07FEB42E, 0xCD3AF06B, 0x42FDA90D]),
+    ("CVSE3_Sony_H.jsv", [0x14DBB021, 0x2CC75879, 0xAA2C6282, 0x14FD2FFE]),
+    ("CVSEFDFT3_Sony_E.jsv", [0xABEDFA7A, 0xAAAADE32, 0xE5E5CF35, 0x9A0DE4EA]),
 ];
 #[test]
 fn test_h264_sei_vui() {
@@ -185,14 +185,14 @@ const CABAC_TEST_STREAMS: &[(&str, [u32; 4])] = &[
     ("CANL2_SVA_B.264", [0xB02DEFCB, 0x741C0E98, 0x2313C574, 0x9F2008ED]),
     ("CANL3_SVA_B.264", [0x04A6DE98, 0x4EF88D1B, 0x8C1B26FC, 0x8F33A425]),
     ("CANL4_SVA_B.264", [0x19cee0ac, 0xcfbebacc, 0x57aa4cf0, 0x3e4ef26d]),
-    ("CABA1_Sony_D.jsv", [0x5EB23E95, 0xD9908DBD, 0x68AAA5BF, 0x775071DE]),
-    ("CABA2_Sony_E.jsv", [0xB60EE63C, 0xB7A969DA, 0x88C9120D, 0xEB6752F6]),
-    ("CABA3_Sony_C.jsv", [0xC74CA8A2, 0x509C153C, 0xFE7ABF23, 0xABF8F8F0]),
-    ("CABA3_TOSHIBA_E.264", [0xC559BBDC, 0x2939EBD9, 0xD09CAA95, 0x63DF81DD]),
-    ("CABA1_SVA_B.264", [0x466A59AE, 0x3968AADD, 0x529FEDFB, 0x87539141]),
-    ("CABA2_SVA_B.264", [0xEF495A1D, 0x8F02E1E7, 0xCA128ACC, 0xC4086CFE]),
-    ("CABA3_SVA_B.264", [0x09F84428, 0xE29B6602, 0x87EF56CF, 0x6093B54F]),
-    ("camp_mot_frm0_full.26l", [0x0CA9541B, 0xCEF163D0, 0x75FC5817, 0x45132421]),
+    ("CABA1_Sony_D.jsv", [0x24B155A4, 0x00DC10D1, 0x1D45A3AA, 0xDF61AE25]),
+    ("CABA2_Sony_E.jsv", [0x3731F0F1, 0xACE3AD91, 0x76093A7B, 0x46347CEA]),
+    ("CABA3_Sony_C.jsv", [0x873A96BF, 0x9359056B, 0x3BF8D878, 0x469B0106]),
+    ("CABA3_TOSHIBA_E.264", [0x13651D01, 0xC5B533E6, 0xB7AA132B, 0xAE7669ED]),
+    ("CABA1_SVA_B.264", [0x2F5CABD5, 0xBB4954C0, 0x386CAFD8, 0xA9AA782A]),
+    ("CABA2_SVA_B.264", [0x6D4277A7, 0xFC70ED1F, 0xBE3C5F10, 0xB0A70671]),
+    ("CABA3_SVA_B.264", [0x0F6066DD, 0xFAED6801, 0x8B3FEE8C, 0xFE8A2E1D]),
+    ("camp_mot_frm0_full.26l", [0x22D837CA, 0x60037CC6, 0xA73AF607, 0x969E5422]),
 ];
 #[test]
 fn test_h264_cabac() {
@@ -200,7 +200,7 @@ fn test_h264_cabac() {
 }
 
 const CABAC_INIT_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("CABACI3_Sony_B.jsv", [0xD74CBB99, 0x81FE3018, 0x0F4A15CD, 0x4C9B490D]),
+    ("CABACI3_Sony_B.jsv", [0x5AFF6524, 0xAE5642C9, 0xE26D44CC, 0xE5BFBF02]),
 ];
 #[test]
 fn test_h264_cabac_init() {
@@ -208,8 +208,8 @@ fn test_h264_cabac_init() {
 }
 
 const CABAC_MB_QPTEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("CAQP1_Sony_B.jsv", [0x3C60A84F, 0xA2A2F0CB, 0x6FEB91AE, 0xD97E36C5]),
-    ("CACQP3_Sony_D.jsv", [0x296FAD20, 0x0369FF53, 0x042FE3A3, 0xDE6BB6C3]),
+    ("CAQP1_Sony_B.jsv", [0xCAC07EAA, 0xBD141764, 0xD64CF9DE, 0x0230A92E]),
+    ("CACQP3_Sony_D.jsv", [0x9E3036F3, 0x79705C9C, 0x32E37D44, 0xF66E5B3A]),
 ];
 #[test]
 fn test_h264_cabac_mb_qp() {
@@ -217,8 +217,8 @@ fn test_h264_cabac_mb_qp() {
 }
 
 const CABAC_SLICE_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("CABAST3_Sony_E.jsv", [0xF97789B5, 0x85A499DF, 0xAED8B05F, 0xA5024D66]),
-    ("CABASTBR3_Sony_B.jsv", [0xbc738fb9, 0x946298c0, 0x3f3f894e, 0x3a10c6bc]),
+    ("CABAST3_Sony_E.jsv", [0xDDA7F376, 0xA040B262, 0x79F6C7FB, 0x04E078BA]),
+    ("CABASTBR3_Sony_B.jsv", [0xE3A61D43, 0xCED165BC, 0xB9A745E0, 0x52F9A2A6]),
 ];
 #[test]
 fn test_h264_cabac_slice() {
@@ -227,8 +227,8 @@ fn test_h264_cabac_slice() {
 
 const CABAC_I_PCM_TEST_STREAMS: &[(&str, [u32; 4])] = &[
     ("CAPCMNL1_Sand_E.264", [0xEE9968EE, 0xEFE935F0, 0x45C6B70B, 0xE51691EB]),
-    ("CAPCM1_Sand_E.264", [0x318680B7, 0x85FA5499, 0xB4C4B2A4, 0xD43AA656]),
-    ("CAPM3_Sony_D.jsv", [0xB515EEDB, 0xF1E4C5A6, 0xD217B1C8, 0xFBEC1DB9]),
+    ("CAPCM1_Sand_E.264", [0xCA073CA1, 0x06E70D5C, 0xD51F6748, 0x5846A5B1]),
+    ("CAPM3_Sony_D.jsv", [0xEA5C66FB, 0xD81D8A80, 0xFC876482, 0xF6A2DEC7]),
 ];
 #[test]
 fn test_h264_cabac_ipcm() {
@@ -237,7 +237,7 @@ fn test_h264_cabac_ipcm() {
 
 const CABAC_MMCO_TEST_STREAMS: &[(&str, [u32; 4])] = &[
     /*"MR9_BT_B.h264",*/ //MBAFF
-    ("HCMP1_HHI_A.264", [0x4ec3788f, 0x2bec7e4c, 0xade27eee, 0xda17b05d]),
+    ("HCMP1_HHI_A.264", [0x18486B98, 0xA55E03D3, 0x8F57EF2B, 0x031FA660]),
 ];
 #[test]
 fn test_h264_cabac_mmco() {
@@ -245,8 +245,8 @@ fn test_h264_cabac_mmco() {
 }
 
 const CABAC_WP_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("CAWP1_TOSHIBA_E.264", [0x305937E4, 0x30B50003, 0xDEC317BD, 0x3A0CDB9C]),
-    ("CAWP5_TOSHIBA_E.264", [0xB6C61135, 0x9A6F86DE, 0xC46445A3, 0x350A75B2]),
+    ("CAWP1_TOSHIBA_E.264", [0x87946607, 0xD1D774C2, 0xDA8EC863, 0x2710C84A]),
+    ("CAWP5_TOSHIBA_E.264", [0x9663DA55, 0xE5EF516C, 0x8BF0CA0B, 0xCC0ABBB8]),
 ];
 #[test]
 fn test_h264_cabac_wp() {
@@ -306,7 +306,7 @@ fn test_h264_cabac_cavlc() {
 }*/ // contains MBAFF
 
 const CABAC_PRED_BW_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("src19td.IBP.264", [0xEE7F2F8E, 0x722B297A, 0x532DFA94, 0xDEE55779]),
+    ("src19td.IBP.264", [0x45C0D420, 0x524779D5, 0xF5D8F8D1, 0xFB02218B]),
 ];
 #[test]
 fn test_h264_cabac_pred_bw() {
@@ -314,47 +314,47 @@ fn test_h264_cabac_pred_bw() {
 }
 
 const FREXT_420_8_TEST_STREAMS: &[(&str, [u32; 4])] = &[
-    ("FRext/FRExt1_Panasonic.avc", [0xBD8EA0B1, 0x9668C25E, 0xFBB50D85, 0xABAFFE7C]),
-    ("FRext/FRExt3_Panasonic.avc", [0x39772F7C, 0xC227DCE3, 0x80732096, 0xEB970937]),
-    ("FRext/HCAFR1_HHI.264", [0x4C1C4214, 0x7190D5B8, 0x6650E6B9, 0xD86BCB03]),
+    ("FRext/FRExt1_Panasonic.avc", [0x2383599D, 0xA01FAE95, 0xCEE2C970, 0xD88CFA93]),
+    ("FRext/FRExt3_Panasonic.avc", [0x3C85643C, 0xE98FD834, 0xA1DA2600, 0x0307F1AF]),
+    ("FRext/HCAFR1_HHI.264", [0xB5B74CA7, 0xBA23DFA4, 0xEF89E066, 0x299EC511]),
     //("FRext/HCAFF1_HHI.264", [0;4]), //PAFF
     //("FRext/HCAMFF1_HHI.264", [0;4]), //MBAFF
     //("FRext/FRExt2_Panasonic.avc", [0;4]), //PAFF
     //("FRext/FRExt4_Panasonic.avc", [0;4]), //MBAFF
-    ("FRext/HPCANL_BRCM_C.264", [0x24BB8150, 0xC03A9FBC, 0x304A427C, 0x5C11B5D7]),
-    ("FRext/HPCA_BRCM_C.264", [0x46AF80A6, 0x8CAA5AD0, 0x42F65E88, 0x0EEE65E4]),
+    ("FRext/HPCANL_BRCM_C.264", [0x8B11529D, 0x9FF96CB8, 0xACC7EDCD, 0x81EDB1E6]),
+    ("FRext/HPCA_BRCM_C.264", [0xC38BCFE1, 0xC5A6A1BF, 0x54F08947, 0x23943FAE]),
     /*("FRext/HPCAFLNL_BRCM_C.264", [0;4]), //PAFF
     ("FRext/HPCAFL_BRCM_C.264", [0;4]),*/
-    ("FRext/HCAFR2_HHI.264", [0x79CC14EA, 0xBD39DDFF, 0x82D49538, 0xF3D9AE1A]),
-    ("FRext/HCAFR3_HHI.264", [0x280AF93D, 0x551539E1, 0xA3F1979D, 0xC1CF64DF]),
+    ("FRext/HCAFR2_HHI.264", [0x0CBD7BBF, 0xE29B3C53, 0x64CF3F10, 0x34B1FF5A]),
+    ("FRext/HCAFR3_HHI.264", [0x5842BBA0, 0x6C01267B, 0xB093FD66, 0xD36CBA66]),
     ("FRext/HCAFR4_HHI.264", [0x6E80B189, 0xAAE83055, 0x6F51F4EE, 0xC3BEE5C8]),
-    ("FRext/HPCADQ_BRCM_B.264", [0xCAB10745, 0xB7CB657A, 0xB51600CE, 0x7C7E7A19]),
-    ("FRext/HPCALQ_BRCM_B.264", [0xCAB10745, 0xB7CB657A, 0xB51600CE, 0x7C7E7A19]),
+    ("FRext/HPCADQ_BRCM_B.264", [0x976A176F, 0x89296F2B, 0x14F2141D, 0x74D684BB]),
+    ("FRext/HPCALQ_BRCM_B.264", [0x976A176F, 0x89296F2B, 0x14F2141D, 0x74D684BB]),
     //("FRext/HPCAMAPALQ_BRCM_B.264", [0;4]), //MBAFF
-    ("FRext/HPCV_BRCM_A.264", [0x9B2D963E, 0x953DE431, 0x8A4385F8, 0x41D7C42C]),
-    ("FRext/HPCVNL_BRCM_A.264", [0x45E2D980, 0xFAB71BA7, 0xC2DFD63B, 0x80AC89E7]),
+    ("FRext/HPCV_BRCM_A.264", [0xEB0EBC5D, 0xA5996EE1, 0x5F6B290F, 0x4F372F21]),
+    ("FRext/HPCVNL_BRCM_A.264", [0x441E6C4F, 0x861B69E6, 0xC007EEFB, 0x820D6494]),
     /*("FRext/HPCVFL_BRCM_A.264", [0;4]), //PAFF
     ("FRext/HPCVFLNL_BRCM_A.264", [0;4]),*/
     //("FRext/HPCVMOLQ_BRCM_B.264", [0;4]), //grayscale
     //("FRext/HPCAMOLQ_BRCM_B.264", [0;4]), //grayscale
-    ("FRext/HPCAQ2LQ_BRCM_B.264", [0x04101005, 0x61E5ED27, 0xBBD135FF, 0x7E35F162]),
-    ("FRext/Freh1_B.264", [0xC9FB3A23, 0x59564945, 0x659E23DB, 0x2D61DE13]),
-    ("FRext/Freh2_B.264", [0x3E1853A5, 0x7B36CA1A, 0xDEDA7FB6, 0xFF60A2E7]),
-    ("FRext/freh3.264", [0x482BA0B8, 0x388252D8, 0x0B7095C9, 0x07D32939]),
+    ("FRext/HPCAQ2LQ_BRCM_B.264", [0xEF0F86EC, 0x8C1C79BA, 0xFA5DFB57, 0x85C2C4FC]),
+    ("FRext/Freh1_B.264", [0x852901B5, 0xC0F54669, 0xD32B9487, 0x40A2BAD9]),
+    ("FRext/Freh2_B.264", [0x28432234, 0x311A2C63, 0x6FE630A8, 0x007AA51E]),
+    ("FRext/freh3.264", [0x94A77E3E, 0xAE7391C7, 0x555071A9, 0xFD67FB69]),
     //("FRext/freh4.264", [0;4]), //PAFF
     //("FRext/freh5.264", [0;4]), //MBAFF
     //("FRext/freh6.264", [0;4]), //PAFF
     //("FRext/Freh7_B.264", [0;4]), //PAFF
-    ("FRext/freh8.264", [0xFC3BC8E0, 0xF6728372, 0x448C0E26, 0xE7472E6F]),
-    ("FRext/freh9.264", [0xA118CCC1, 0xBDFFDFF0, 0xAD0FD32F, 0x9A3821A3]),
+    ("FRext/freh8.264", [0x300C9E08, 0xED69F361, 0xF46A3BF5, 0x79D37EF1]),
+    ("FRext/freh9.264", [0x8B3C12A3, 0xC244D147, 0xD71A4F0E, 0x7109393D]),
     //("FRext/freh10.264", [0;4]), //PAFF
     //("FRext/freh11.264", [0;4]), //PAFF
-    ("FRext/Freh12_B.264", [0xE474287F, 0xCB9CCD28, 0xFD24CD02, 0x02E97603]),
+    ("FRext/Freh12_B.264", [0x73DEE4EE, 0x216B40CB, 0xF7647E2B, 0xCD2BBBD3]),
     /*("FRext/FREXT01_JVC_D.264", [0;4]), //MBAFF
     ("FRext/FREXT02_JVC_C.264", [0;4]),*/
-    ("FRext/FRExt_MMCO4_Sony_B.264", [0x3B226B30, 0x42AC899B, 0x9FE1EB2C, 0x4B6ED90C]),
+    ("FRext/FRExt_MMCO4_Sony_B.264", [0xD4048185, 0xA358D7E7, 0x95EA950D, 0x27C66788]),
 
-    ("FRext/test8b43.264", [0x81A43E33, 0x6811D40D, 0x2DEAAC38, 0xBCC4F535]),
+    ("FRext/test8b43.264", [0x921C816C, 0x14170EAD, 0x03C19C5C, 0x9ED3C0A4]),
 ];
 #[test]
 fn test_h264_frext_420_8() {