Bug 1145815 - Do not report discontinuities less than 35ms. r=k17e, a=lmandel FIREFOX_BETA_37_END
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 25 Mar 2015 22:32:21 +1100
changeset 252117 b41c57eefd69242fc9664a3e5c2dcaa46840051c
parent 252116 e737ae27cfd2a86622f03c1f65f0f162e6dc8957
child 252118 db52a04ab5527a179ff8be6e1b9f23054cd2384c
child 259823 f6e25d0e9d2217d998c1068cefa764b7d3d70a62
push id706
push userryanvm@gmail.com
push dateFri, 27 Mar 2015 01:33:15 +0000
treeherdermozilla-release@db52a04ab552 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersk17e, lmandel
bugs1145815
milestone37.0
Bug 1145815 - Do not report discontinuities less than 35ms. r=k17e, a=lmandel CLOSED TREE
dom/media/mediasource/ContainerParser.cpp
media/libstagefright/binding/MoofParser.cpp
--- a/dom/media/mediasource/ContainerParser.cpp
+++ b/dom/media/mediasource/ContainerParser.cpp
@@ -330,21 +330,21 @@ public:
     }
     aStart = compositionRange.start;
     aEnd = compositionRange.end;
     MSE_DEBUG(MP4ContainerParser, "[%lld, %lld]",
               aStart, aEnd);
     return true;
   }
 
-  // Gaps of up to 20ms (marginally longer than a single frame at 60fps) are considered
+  // Gaps of up to 35ms (marginally longer than a single frame at 30fps) are considered
   // to be sequential frames.
   int64_t GetRoundingError()
   {
-    return 20000;
+    return 35000;
   }
 
 private:
   nsRefPtr<MP4Stream> mStream;
   nsAutoPtr<mp4_demuxer::MoofParser> mParser;
   Monitor mMonitor;
 };
 
--- a/media/libstagefright/binding/MoofParser.cpp
+++ b/media/libstagefright/binding/MoofParser.cpp
@@ -236,17 +236,17 @@ MoofParser::ParseEncrypted(Box& aBox)
         break;
       }
     }
   }
 }
 
 Moof::Moof(Box& aBox, Trex& aTrex, Mdhd& aMdhd, Edts& aEdts, Sinf& aSinf)
   : mRange(aBox.Range())
-  , mMaxRoundingError(0)
+  , mMaxRoundingError(35000)
 {
   for (Box box = aBox.FirstChild(); box.IsAvailable(); box = box.Next()) {
     if (box.IsType("traf")) {
       ParseTraf(box, aTrex, aMdhd, aEdts, aSinf);
     }
   }
   if (IsValid()) {
     ProcessCenc();