Bug 1271517. Part 2 - remove use of FlushableTaskQueue. r=jya. draft
authorJW Wang <jwwang@mozilla.com>
Tue, 10 May 2016 17:35:37 +0800
changeset 365539 df5e93a8adddafbab221be6203187b3b57232823
parent 365538 023fd53075e926558501e43285aa56397acd0beb
child 520596 e8d89d77478bfa13e3358df7b970a2cea9563ca2
push id17785
push userjwwang@mozilla.com
push dateWed, 11 May 2016 01:45:02 +0000
reviewersjya
bugs1271517
milestone49.0a1
Bug 1271517. Part 2 - remove use of FlushableTaskQueue. r=jya. MozReview-Commit-ID: DqL3svSMTV3
dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
dom/media/platforms/ffmpeg/FFmpegDataDecoder.h
--- a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.cpp
@@ -17,17 +17,17 @@
 #include "prsystem.h"
 
 namespace mozilla
 {
 
 StaticMutex FFmpegDataDecoder<LIBAV_VER>::sMonitor;
 
   FFmpegDataDecoder<LIBAV_VER>::FFmpegDataDecoder(FFmpegLibWrapper* aLib,
-                                                  FlushableTaskQueue* aTaskQueue,
+                                                  TaskQueue* aTaskQueue,
                                                   MediaDataDecoderCallback* aCallback,
                                                   AVCodecID aCodecID)
   : mLib(aLib)
   , mCallback(aCallback)
   , mCodecContext(nullptr)
   , mFrame(NULL)
   , mExtraData(nullptr)
   , mCodecID(aCodecID)
--- a/dom/media/platforms/ffmpeg/FFmpegDataDecoder.h
+++ b/dom/media/platforms/ffmpeg/FFmpegDataDecoder.h
@@ -19,17 +19,17 @@ template <int V>
 class FFmpegDataDecoder : public MediaDataDecoder
 {
 };
 
 template <>
 class FFmpegDataDecoder<LIBAV_VER> : public MediaDataDecoder
 {
 public:
-  FFmpegDataDecoder(FFmpegLibWrapper* aLib, FlushableTaskQueue* aTaskQueue,
+  FFmpegDataDecoder(FFmpegLibWrapper* aLib, TaskQueue* aTaskQueue,
                     MediaDataDecoderCallback* aCallback,
                     AVCodecID aCodecID);
   virtual ~FFmpegDataDecoder();
 
   static bool Link();
 
   RefPtr<InitPromise> Init() override = 0;
   nsresult Input(MediaRawData* aSample) override;
@@ -62,17 +62,17 @@ protected:
   AVCodecID mCodecID;
 
 private:
   void ProcessDecode(MediaRawData* aSample);
   virtual DecodeResult DoDecode(MediaRawData* aSample) = 0;
   virtual void ProcessDrain() = 0;
 
   static StaticMutex sMonitor;
-  const RefPtr<FlushableTaskQueue> mTaskQueue;
+  const RefPtr<TaskQueue> mTaskQueue;
   // Set/cleared on reader thread calling Flush() to indicate that output is
   // not required and so input samples on mTaskQueue need not be processed.
   Atomic<bool> mIsFlushing;
 };
 
 } // namespace mozilla
 
 #endif // __FFmpegDataDecoder_h__