Backed out changeset 2198e282bdcf (bug 1451681) for bustage in /builds/worker/workspace/build/src/dom/media/platforms/agnostic/bytestreams/AnnexB.cpp on a CLOSED TREE

dom/media/mp4/Index.cpp

@@ -166,7 +166,7 @@ already_AddRefed<MediaRawData> SampleIterator::GetNext()
     }
 
     auto res = reader.ReadU16();
-    if (res.isOk() && res.unwrap() > 0) {
+    if (res.isOk()) {
       uint16_t count = res.unwrap();
 
       if (reader.Remaining() < count * 6) {

dom/media/platforms/agnostic/bytestreams/AnnexB.cpp

@@ -74,13 +74,8 @@ AnnexB::ConvertSampleToAnnexB(mozilla::MediaRawData* aSample, bool aAddSPS)
     // the length of the first clear data subsample. Otherwise decryption
     // will fail.
     if (aSample->mCrypto.mValid) {
-      if (aSample->mCrypto.mPlainSizes.Length() == 0) {
-        samplewriter->mCrypto.mPlainSizes.AppendElement(annexB->Length());
-        samplewriter->mCrypto.mEncryptedSizes.AppendElement(
-          samplewriter->Size() - annexB->Length());
-      } else {
-        samplewriterwriter->mCrypto.mPlainSizes[0] += annexB->Length();
-      }
+      MOZ_ASSERT(samplewriter->mCrypto.mPlainSizes.Length() > 0);
+      samplewriter->mCrypto.mPlainSizes[0] += annexB->Length();
     }
   }