Backed out changeset 3538bc8b05aa (bug 1278005) will land directly on m-c
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Sat, 04 Jun 2016 09:40:05 +0200
changeset 339527 515b840d20aa810a56f626a803fcd0682e592653
parent 339526 2395a1485c76d8fa1185faeffc20eee2789d109c
child 339529 77345805ea822d045e3559cefae78826a987518a
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1278005
milestone49.0a1
backs out3538bc8b05aa5b9ee7fc2e27d2c7130cd881bb67
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 3538bc8b05aa (bug 1278005) will land directly on m-c
media/libstagefright/binding/MoofParser.cpp
--- a/media/libstagefright/binding/MoofParser.cpp
+++ b/media/libstagefright/binding/MoofParser.cpp
@@ -389,23 +389,23 @@ Moof::Moof(Box& aBox, Trex& aTrex, Mvhd&
       // duration, so we rewrite the dts accordingly.
       int64_t presentationDuration =
         ctsOrder.LastElement()->mCompositionRange.end
         - ctsOrder[0]->mCompositionRange.start;
       int64_t endDecodeTime =
         aMdhd.ToMicroseconds((int64_t)*aDecodeTime - aEdts.mMediaStart)
         + aMvhd.ToMicroseconds(aEdts.mEmptyOffset);
       int64_t decodeDuration = endDecodeTime - mIndex[0].mDecodeTime;
-      double adjust = (double)decodeDuration / presentationDuration;
+      float adjust = (float)decodeDuration / presentationDuration;
       int64_t dtsOffset = mIndex[0].mDecodeTime;
       int64_t compositionDuration = 0;
       // Adjust the dts, ensuring that the new adjusted dts will never be greater
       // than decodeTime (the next moof's decode start time).
       for (auto& sample : mIndex) {
-        sample.mDecodeTime = dtsOffset + int64_t(compositionDuration * adjust);
+        sample.mDecodeTime = dtsOffset + compositionDuration * adjust;
         compositionDuration += sample.mCompositionRange.Length();
       }
       mTimeRange = Interval<Microseconds>(ctsOrder[0]->mCompositionRange.start,
           ctsOrder.LastElement()->mCompositionRange.end);
     }
     ProcessCenc();
   }
 }