Bug 1025768 - Restore eager SourceBuffer switching. r=cajbir

content/media/mediasource/MediaSourceDecoder.cpp

@@ -68,7 +68,7 @@ public:
   void RequestAudioData() MOZ_OVERRIDE
   {
     if (!GetAudioReader()) {
-      MSE_DEBUG("%p DecodeAudioFrame called with no audio reader", this);
+      MSE_DEBUG("%p MSR::RequestAudioData called with no audio reader", this);
       MOZ_ASSERT(mPendingDecoders.IsEmpty());
       GetCallback()->OnDecodeError();
       return;
@@ -83,18 +83,21 @@ public:
 
   void OnAudioEOS()
   {
+    MSE_DEBUG("%p OnAudioEOS %d (%p) EOS (readers=%u)",
+              this, mActiveAudioDecoder, mDecoders[mActiveAudioDecoder].get(), mDecoders.Length());
     GetCallback()->OnAudioEOS();
   }
 
   void RequestVideoData(bool aSkipToNextKeyframe, int64_t aTimeThreshold) MOZ_OVERRIDE
   {
     if (!GetVideoReader()) {
-      MSE_DEBUG("%p DecodeVideoFrame called with no video reader", this);
+      MSE_DEBUG("%p MSR::RequestVideoData called with no video reader", this);
       MOZ_ASSERT(mPendingDecoders.IsEmpty());
       GetCallback()->OnDecodeError();
       return;
     }
     mTimeThreshold = aTimeThreshold;
+    SwitchVideoReaders(SWITCH_OPTIONAL);
     GetVideoReader()->RequestVideoData(aSkipToNextKeyframe, aTimeThreshold);
   }
 
@@ -102,28 +105,28 @@ public:
   {
     if (mDropVideoBeforeThreshold) {
       if (aSample->mTime < mTimeThreshold) {
+        MSE_DEBUG("%p MSR::OnVideoDecoded VideoData mTime %lld below mTimeThreshold %lld",
+                  this, aSample->mTime, mTimeThreshold);
         delete aSample;
         GetVideoReader()->RequestVideoData(false, mTimeThreshold);
-      } else {
+        return;
+      }
       mDropVideoBeforeThreshold = false;
-        GetCallback()->OnVideoDecoded(aSample);
     }
-    } else {
     GetCallback()->OnVideoDecoded(aSample);
   }
-  }
 
   void OnVideoEOS()
   {
     // End of stream. See if we can switch to another video decoder.
-    MSE_DEBUG("%p MSR::DecodeVF %d (%p) returned false (readers=%u)",
+    MSE_DEBUG("%p MSR::OnVideoEOS %d (%p) (readers=%u)",
               this, mActiveVideoDecoder, mDecoders[mActiveVideoDecoder].get(), mDecoders.Length());
-    if (MaybeSwitchVideoReaders()) {
+    if (SwitchVideoReaders(SWITCH_FORCED)) {
       // Success! Resume decoding with next video decoder.
       RequestVideoData(false, mTimeThreshold);
     } else {
       // End of stream.
-      MSE_DEBUG("%p MSR::DecodeVF %d (%p) EOS (readers=%u)",
+      MSE_DEBUG("%p MSR::OnVideoEOS %d (%p) EOS (readers=%u)",
                 this, mActiveVideoDecoder, mDecoders[mActiveVideoDecoder].get(), mDecoders.Length());
       GetCallback()->OnVideoEOS();
     }
@@ -175,17 +178,16 @@ public:
   }
 
 private:
-
   // These are read and written on the decode task queue threads.
   int64_t mTimeThreshold;
   bool mDropVideoBeforeThreshold;
 
-  enum SwitchState {
+  enum SwitchType {
-    SWITCHSTATE_SEEKING,
+    SWITCH_OPTIONAL,
-    SWITCHSTATE_PLAYING
+    SWITCH_FORCED
   };
 
-  bool MaybeSwitchVideoReaders(SwitchState aState = SWITCHSTATE_PLAYING) {
+  bool SwitchVideoReaders(SwitchType aType) {
     ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
     MOZ_ASSERT(mActiveVideoDecoder != -1);
 
@@ -197,11 +199,12 @@ private:
         continue;
       }
 
-      if (aState == SWITCHSTATE_SEEKING || mTimeThreshold >= mDecoders[i]->GetMediaStartTime()) {
+      if (aType == SWITCH_FORCED || mTimeThreshold >= mDecoders[i]->GetMediaStartTime()) {
         GetVideoReader()->SetIdle();
 
         mActiveVideoDecoder = i;
-        MSE_DEBUG("%p MSR::DecodeVF switching to %d", this, mActiveVideoDecoder);
+        mDropVideoBeforeThreshold = true;
+        MSE_DEBUG("%p MSR::SwitchVideoReaders(%d) switching to %d", this, aType, mActiveVideoDecoder);
         return true;
       }
     }
@@ -484,7 +487,7 @@ MediaSourceReader::Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime,
   while (!mMediaSource->ActiveSourceBuffers()->AllContainsTime(target)
          && !IsShutdown()) {
     mMediaSource->WaitForData();
-    MaybeSwitchVideoReaders(SWITCHSTATE_SEEKING);
+    SwitchVideoReaders(SWITCH_FORCED);
   }
 
   if (IsShutdown()) {