Bug 1342339 - remove compile warning from bug 1340446. r=kinetik draft
authorAlfredo.Yang <ayang@mozilla.com>
Wed, 01 Mar 2017 11:37:30 +0800
changeset 490658 21aa6c5cb0548c080a6fc2d1980b807f14237743
parent 490433 1bc2ad020aee2830e0a7941f10958dbec108c254
child 490744 263a6cfcf50ee3582f3dc1bfc43d4fa0dcc00800
push id47186
push userbmo:ayang@mozilla.com
push dateWed, 01 Mar 2017 03:38:29 +0000
reviewerskinetik
bugs1342339, 1340446
milestone54.0a1
Bug 1342339 - remove compile warning from bug 1340446. r=kinetik MozReview-Commit-ID: yCAZvJRZCC
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(llabs(data.indices[i].start_composition - aDest[i].start_composition) <= 1);
-      MOZ_DIAGNOSTIC_ASSERT(llabs(data.indices[i].end_composition - aDest[i].end_composition) <= 1);
-      MOZ_DIAGNOSTIC_ASSERT(llabs(data.indices[i].start_decode - aDest[i].start_decode) <= 1);
+      MOZ_DIAGNOSTIC_ASSERT(llabs(int64_t(data.indices[i].start_composition - aDest[i].start_composition)) <= 1);
+      MOZ_DIAGNOSTIC_ASSERT(llabs(int64_t(data.indices[i].end_composition - aDest[i].end_composition)) <= 1);
+      MOZ_DIAGNOSTIC_ASSERT(llabs(int64_t(data.indices[i].start_decode - aDest[i].start_decode)) <= 1);
       MOZ_DIAGNOSTIC_ASSERT(data.indices[i].sync == aDest[i].sync);
     }
   }
 #endif
 
   return ret;
 }