h264: ignore some bits in the avcC box

Apparently some encoders do not bother about setting them to all ones.

diff --git a/nihav-itu/src/codecs/h264/decoder_mt.rs b/nihav-itu/src/codecs/h264/decoder_mt.rs
index b110207786e594124a804ea977b0cf6cc5ebe9e6..118ba8581d35c9f353962181a219883502c0b43c 100644 (file)
--- a/nihav-itu/src/codecs/h264/decoder_mt.rs
+++ b/nihav-itu/src/codecs/h264/decoder_mt.rs
@@ -739,10 +739,10 @@ impl NADecoderMT for H264MTDecoder {
                 let _compatibility      = br.read_byte()?;
                 let _level              = br.read_byte()?;
                 let b                   = br.read_byte()?;
-                validate!((b & 0xFC) == 0xFC);
+                //validate!((b & 0xFC) == 0xFC);
                 self.nal_len            = (b & 3) + 1;
                 let b                   = br.read_byte()?;
-                validate!((b & 0xE0) == 0xE0);
+                //validate!((b & 0xE0) == 0xE0);
                 let num_sps = (b & 0x1F) as usize;
                 for _ in 0..num_sps {
                     let len             = br.read_u16be()? as usize;

diff --git a/nihav-itu/src/codecs/h264/decoder_st.rs b/nihav-itu/src/codecs/h264/decoder_st.rs
index e9983ec6cd7f28b60e45754ac5856ab928d0f639..c82d62eca01f53cd75e3247aa89b4741237308bf 100644 (file)
--- a/nihav-itu/src/codecs/h264/decoder_st.rs
+++ b/nihav-itu/src/codecs/h264/decoder_st.rs
@@ -737,10 +737,10 @@ impl NADecoder for H264Decoder {
                 let _compatibility      = br.read_byte()?;
                 let _level              = br.read_byte()?;
                 let b                   = br.read_byte()?;
-                validate!((b & 0xFC) == 0xFC);
+                //validate!((b & 0xFC) == 0xFC);
                 self.nal_len            = (b & 3) + 1;
                 let b                   = br.read_byte()?;
-                validate!((b & 0xE0) == 0xE0);
+                //validate!((b & 0xE0) == 0xE0);
                 let num_sps = (b & 0x1F) as usize;
                 for _ in 0..num_sps {
                     let len             = br.read_u16be()? as usize;