Bug 1069857 - Clear seek timestamp in time. r=jwwang, r=cpearce, a=bajaj
authorBlake Wu <bwu@mozilla.com>
Wed, 24 Sep 2014 09:41:49 +0800
changeset 225418 44c1345c900091c6a634d095db6a85089d6e731c
parent 225417 dd492b01bce77e5926d771d94a69ad81d35be0a1
child 225419 ded4dc4703b90d2369254590a02da09006e413c9
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjwwang, cpearce, bajaj
bugs1069857
milestone34.0a2
Bug 1069857 - Clear seek timestamp in time. r=jwwang, r=cpearce, a=bajaj
content/media/omx/MediaOmxReader.cpp
--- a/content/media/omx/MediaOmxReader.cpp
+++ b/content/media/omx/MediaOmxReader.cpp
@@ -232,31 +232,31 @@ bool MediaOmxReader::DecodeVideoFrame(bo
   while ((TimeStamp::Now() - start) < TimeDuration::FromSeconds(MAX_VIDEO_DECODE_SECONDS)) {
     MPAPI::VideoFrame frame;
     frame.mGraphicBuffer = nullptr;
     frame.mShouldSkip = false;
     if (!mOmxDecoder->ReadVideo(&frame, aTimeThreshold, aKeyframeSkip, doSeek)) {
       return false;
     }
     doSeek = false;
+    mVideoSeekTimeUs = -1;
 
     // Ignore empty buffer which stagefright media read will sporadically return
     if (frame.mSize == 0 && !frame.mGraphicBuffer) {
       continue;
     }
 
     parsed++;
     if (frame.mShouldSkip && mSkipCount < MAX_DROPPED_FRAMES) {
       mSkipCount++;
       continue;
     }
 
     mSkipCount = 0;
 
-    mVideoSeekTimeUs = -1;
     aKeyframeSkip = false;
 
     IntRect picture = ToIntRect(mPicture);
     if (frame.Y.mWidth != mInitialFrame.width ||
         frame.Y.mHeight != mInitialFrame.height) {
 
       // Frame size is different from what the container reports. This is legal,
       // and we will preserve the ratio of the crop rectangle as it