mpeg4asp: mark actual skip MBs in B-frames as such

diff --git a/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs b/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs
index 5dcbc4a7958729854d91dafb82c03615994639b9..a180a422f439acb728ccae2ed98771114297e358 100644 (file)
--- a/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs
+++ b/nihav-mpeg/src/codecs/mpeg4asp/bitstream.rs
@@ -837,7 +837,7 @@ unimplemented!();
                     mb.mvs = [ZERO_MV; 4];
                 }
             } else {
-                mb.mb_type = MBType::Forward;
+                mb.mb_type = MBType::Skip;
                 mb.cbp = 0;
                 mb.mvs = [ZERO_MV; 4];
             }

diff --git a/nihav-mpeg/src/codecs/mpeg4asp/mod.rs b/nihav-mpeg/src/codecs/mpeg4asp/mod.rs
index f63c4cffba90cdb64d90c39f1215c724397332a8..d9d3e56f1392839750bc91f94ca0f351fa188f4d 100644 (file)
--- a/nihav-mpeg/src/codecs/mpeg4asp/mod.rs
+++ b/nihav-mpeg/src/codecs/mpeg4asp/mod.rs
@@ -412,11 +412,11 @@ mod test {
                         [0x536b8b3f, 0x6b33df1f, 0x3253605f, 0x92b6c801],
                         [0x9b9953f6, 0x1d14ef3d, 0x974aa0e9, 0x3b1b88d7],
                         [0x6d941dcc, 0x174efb79, 0xba65a60f, 0x208040ce],
-                        [0xe67b2e27, 0x16e9eb68, 0xed812111, 0xba7eff8a],
+                        [0x83121290, 0x2d45c2a1, 0xc84e104e, 0xa1d985f6],
                         [0xc6bf0541, 0x297a8b0a, 0xc2711e63, 0x8eb34b78],
-                        [0x71c61f3e, 0x3c252570, 0x3f74433d, 0xe58d4e3f],
+                        [0x57d94a6e, 0xf692435e, 0xf8c0464b, 0xf8adbc39],
                         [0xab946927, 0xfdd4434a, 0x46e87ebf, 0x7bf70818],
-                        [0xd99fb937, 0xd1412a14, 0xe78ae113, 0x9d9e44a9],
+                        [0xb2011cee, 0x6309778d, 0x0dbb6ca1, 0x2a20c5c7],
                         [0x4b4421cc, 0x919b086c, 0x33b5b5f3, 0xbe9d5a87]]));
     }
 }