Bug 1316211. P7 - remove mAudioQueue and mVideoQueue for we never push data into the queues. draft
authorJW Wang <jwwang@mozilla.com>
Wed, 19 Jul 2017 14:49:08 +0800
changeset 611841 768fe0da8dfa969f407cce200351149a647ce8d2
parent 611840 a555c17c703e5c452c20944bd8f64ee6c2f2af83
child 611842 e975fdb1bc77ed030c472a845386f965a9c93615
push id69302
push userjwwang@mozilla.com
push dateThu, 20 Jul 2017 02:52:36 +0000
bugs1316211
milestone56.0a1
Bug 1316211. P7 - remove mAudioQueue and mVideoQueue for we never push data into the queues. MozReview-Commit-ID: AL5JqUIAVXo
dom/media/MediaDecoderReader.cpp
dom/media/MediaDecoderReader.h
--- a/dom/media/MediaDecoderReader.cpp
+++ b/dom/media/MediaDecoderReader.cpp
@@ -91,56 +91,44 @@ MediaDecoderReader::Init()
 MediaDecoderReader::~MediaDecoderReader()
 {
   MOZ_ASSERT(mShutdown);
   MOZ_COUNT_DTOR(MediaDecoderReader);
 }
 
 size_t MediaDecoderReader::SizeOfVideoQueueInBytes() const
 {
-  VideoQueueMemoryFunctor functor;
-  mVideoQueue.LockedForEach(functor);
-  return functor.mSize;
+  return 0;
 }
 
 size_t MediaDecoderReader::SizeOfAudioQueueInBytes() const
 {
-  AudioQueueMemoryFunctor functor;
-  mAudioQueue.LockedForEach(functor);
-  return functor.mSize;
+  return 0;
 }
 
 size_t MediaDecoderReader::SizeOfVideoQueueInFrames()
 {
-  return mVideoQueue.GetSize();
+  return 0;
 }
 
 size_t MediaDecoderReader::SizeOfAudioQueueInFrames()
 {
-  return mAudioQueue.GetSize();
+  return 0;
 }
 
 void
 MediaDecoderReader::UpdateDuration(const media::TimeUnit& aDuration)
 {
   MOZ_ASSERT(OnTaskQueue());
   mDuration = Some(aDuration);
   UpdateBuffered();
 }
 
 nsresult MediaDecoderReader::ResetDecode(TrackSet aTracks)
 {
-  if (aTracks.contains(TrackInfo::kVideoTrack)) {
-    VideoQueue().Reset();
-  }
-
-  if (aTracks.contains(TrackInfo::kAudioTrack)) {
-    AudioQueue().Reset();
-  }
-
   return NS_OK;
 }
 
 RefPtr<ShutdownPromise>
 MediaDecoderReader::Shutdown()
 {
   MOZ_ASSERT(OnTaskQueue());
   mShutdown = true;
--- a/dom/media/MediaDecoderReader.h
+++ b/dom/media/MediaDecoderReader.h
@@ -205,19 +205,16 @@ public:
 
   virtual size_t SizeOfVideoQueueInFrames();
   virtual size_t SizeOfAudioQueueInFrames();
 
   // Called once new data has been cached by the MediaResource.
   // mBuffered should be recalculated and updated accordingly.
   virtual void NotifyDataArrived() = 0;
 
-  virtual MediaQueue<AudioData>& AudioQueue() { return mAudioQueue; }
-  virtual MediaQueue<VideoData>& VideoQueue() { return mVideoQueue; }
-
   AbstractCanonical<media::TimeIntervals>* CanonicalBuffered()
   {
     return &mBuffered;
   }
 
   TaskQueue* OwnerThread() const
   {
     return mTaskQueue;
@@ -278,24 +275,16 @@ public:
   virtual void SetVideoNullDecode(bool aIsNullDecode) = 0;
 
 protected:
   virtual ~MediaDecoderReader();
 
   // Recomputes mBuffered.
   virtual void UpdateBuffered() = 0;
 
-  // Queue of audio frames. This queue is threadsafe, and is accessed from
-  // the audio, decoder, state machine, and main threads.
-  MediaQueue<AudioData> mAudioQueue;
-
-  // Queue of video frames. This queue is threadsafe, and is accessed from
-  // the decoder, state machine, and main threads.
-  MediaQueue<VideoData> mVideoQueue;
-
   // Reference to the owning decoder object.
   AbstractMediaDecoder* mDecoder;
 
   // Decode task queue.
   RefPtr<TaskQueue> mTaskQueue;
 
   // Buffered range.
   Canonical<media::TimeIntervals> mBuffered;