Bug 1252753. Part 2 - remove MediaDecoderStateMachine::PushFront(). r=kinetik. draft
authorJW Wang <jwwang@mozilla.com>
Fri, 04 Mar 2016 16:59:37 +0800
changeset 336869 025e52a4e5930764fb0c865b32f923d62b099a50
parent 336868 2945c6f951f3e42e65f602c3f18f4bf8324e0482
child 515515 42f20f70ef0310062eeebc813f7a9e87aa043f3b
push id12201
push userjwwang@mozilla.com
push dateFri, 04 Mar 2016 09:00:15 +0000
reviewerskinetik
bugs1252753
milestone47.0a1
Bug 1252753. Part 2 - remove MediaDecoderStateMachine::PushFront(). r=kinetik. MozReview-Commit-ID: 2jtDFI61bGf
dom/media/MediaDecoderStateMachine.cpp
dom/media/MediaDecoderStateMachine.h
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -691,32 +691,16 @@ MediaDecoderStateMachine::Push(MediaData
   } else {
     // TODO: Handle MediaRawData, determine which queue should be pushed.
   }
   UpdateNextFrameStatus();
   DispatchDecodeTasksIfNeeded();
 }
 
 void
-MediaDecoderStateMachine::PushFront(MediaData* aSample, MediaData::Type aSampleType)
-{
-  MOZ_ASSERT(OnTaskQueue());
-  MOZ_ASSERT(aSample);
-  if (aSample->mType == MediaData::AUDIO_DATA) {
-    AudioQueue().PushFront(aSample);
-  } else if (aSample->mType == MediaData::VIDEO_DATA) {
-    aSample->As<VideoData>()->mFrameID = ++mCurrentFrameID;
-    VideoQueue().PushFront(aSample);
-  } else {
-    // TODO: Handle MediaRawData, determine which queue should be pushed.
-  }
-  UpdateNextFrameStatus();
-}
-
-void
 MediaDecoderStateMachine::CheckIsAudible(const MediaData* aSample)
 {
   MOZ_ASSERT(OnTaskQueue());
   MOZ_ASSERT(aSample->mType == MediaData::AUDIO_DATA);
 
   const AudioData* data = aSample->As<AudioData>();
   bool isAudible = data->IsAudible();
   if (isAudible && !mIsAudioDataAudible) {
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -387,17 +387,16 @@ protected:
   void SetState(State aState);
 
   void BufferedRangeUpdated();
 
   // Inserts MediaData* samples into their respective MediaQueues.
   // aSample must not be null.
 
   void Push(MediaData* aSample, MediaData::Type aSampleType);
-  void PushFront(MediaData* aSample, MediaData::Type aSampleType);
 
   void OnAudioPopped(const RefPtr<MediaData>& aSample);
   void OnVideoPopped(const RefPtr<MediaData>& aSample);
 
   void CheckIsAudible(const MediaData* aSample);
   void VolumeChanged();
   void LogicalPlaybackRateChanged();
   void PreservesPitchChanged();