Backed out changeset 437ff32b12ea (bug 1340446) for Mac and Windows build bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 22 Feb 2017 20:27:17 -0800
changeset 373381 cbf216f00dba92561fdd37df679e92e4b146aa60
parent 373380 9294b1e9b7e2c0b0b6a74e4d22634874433f11e4
child 373382 212bad17569eb87422dbbde1c8290650c7f64bbe
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1340446
milestone54.0a1
backs out437ff32b12ea5c24126539dd649e9ad28817b4f4
Backed out changeset 437ff32b12ea (bug 1340446) for Mac and Windows build bustage CLOSED TREE
media/libstagefright/binding/MP4Metadata.cpp
--- a/media/libstagefright/binding/MP4Metadata.cpp
+++ b/media/libstagefright/binding/MP4Metadata.cpp
@@ -369,19 +369,19 @@ MP4Metadata::ReadTrackIndex(FallibleTArr
   if (mRustTestMode && ret && mRust) {
     mp4parse_byte_data data = {};
     bool rustRet = mRust->ReadTrackIndice(&data, aTrackID);
     MOZ_DIAGNOSTIC_ASSERT(rustRet);
     MOZ_DIAGNOSTIC_ASSERT(data.length == aDest.Length());
     for (uint32_t i = 0; i < data.length; i++) {
       MOZ_DIAGNOSTIC_ASSERT(data.indices[i].start_offset == aDest[i].start_offset);
       MOZ_DIAGNOSTIC_ASSERT(data.indices[i].end_offset == aDest[i].end_offset);
-      MOZ_DIAGNOSTIC_ASSERT(abs(data.indices[i].start_composition - aDest[i].start_composition) <= 1);
-      MOZ_DIAGNOSTIC_ASSERT(abs(data.indices[i].end_composition - aDest[i].end_composition) <= 1);
-      MOZ_DIAGNOSTIC_ASSERT(abs(data.indices[i].start_decode - aDest[i].start_decode) <= 1);
+      MOZ_DIAGNOSTIC_ASSERT(data.indices[i].start_composition == aDest[i].start_composition);
+      MOZ_DIAGNOSTIC_ASSERT(data.indices[i].end_composition == aDest[i].end_composition);
+      MOZ_DIAGNOSTIC_ASSERT(data.indices[i].start_decode == aDest[i].start_decode);
       MOZ_DIAGNOSTIC_ASSERT(data.indices[i].sync == aDest[i].sync);
     }
   }
 #endif
 
   return ret;
 }