Bug 1027875 - Remove Annex B assertion; r=cpearce

media/libstagefright/binding/AnnexB.cpp

@@ -66,8 +66,9 @@ AnnexB::ConvertExtraDataToAnnexB(mozilla::Vector<uint8_t>& aExtraData)
     ConvertSPSOrPPS(reader, reader.ReadU8() & 31, &annexB);
     ConvertSPSOrPPS(reader, reader.ReadU8(), &annexB);
 
-    MOZ_ASSERT(!reader.Remaining());
+    // MP4Box adds extra bytes that we ignore. I don't know what they do.
   }
+  reader.DiscardRemaining();
 
   return annexB;
 }

media/libstagefright/binding/include/mp4_demuxer/ByteReader.h

@@ -22,6 +22,16 @@ public:
   {
   }
 
+  ~ByteReader()
+  {
+    MOZ_ASSERT(!mRemaining);
+  }
+
+  // Make it explicit if we're not using the extra bytes.
+  void DiscardRemaining() {
+    mRemaining = 0;
+  }
+
   size_t Remaining() const { return mRemaining; }
 
   bool CanRead8() { return mRemaining >= 1; }