Bug 1274466 - per discussion move some functions back to public. r?jya. draft 1274214_remove_WMFMediaDataDecoder_TaskQueue
authorJW Wang <jwwang@mozilla.com>
Mon, 06 Jun 2016 16:17:15 +0800
branch1274214_remove_WMFMediaDataDecoder_TaskQueue
changeset 375982 c305c4627f13211a1c718fa1f4f2ed69773fb14e
parent 375582 aaab07dbdb236ced54e01d0ce26692b2479d355b
child 724587 1e89086afb36c312c008b27ce7ffa68e8750cd33
push id20452
push userjwwang@mozilla.com
push dateTue, 07 Jun 2016 03:18:14 +0000
reviewersjya
bugs1274466
milestone49.0a1
Bug 1274466 - per discussion move some functions back to public. r?jya. MozReview-Commit-ID: BoTB5IKjuDD
dom/media/platforms/agnostic/WAVDecoder.h
dom/media/platforms/apple/AppleVDADecoder.h
dom/media/platforms/apple/AppleVTDecoder.h
dom/media/platforms/wrappers/FuzzingWrapper.h
--- a/dom/media/platforms/agnostic/WAVDecoder.h
+++ b/dom/media/platforms/agnostic/WAVDecoder.h
@@ -16,27 +16,27 @@ class WaveDataDecoder : public MediaData
 {
 public:
   WaveDataDecoder(const AudioInfo& aConfig,
                   MediaDataDecoderCallback* aCallback);
 
   // Return true if mimetype is Wave
   static bool IsWave(const nsACString& aMimeType);
 
-private:
   RefPtr<InitPromise> Init() override;
   nsresult Input(MediaRawData* aSample) override;
   nsresult Flush() override;
   nsresult Drain() override;
   nsresult Shutdown() override;
   const char* GetDescriptionName() const override
   {
     return "wave audio decoder";
   }
 
+private:
   bool DoDecode(MediaRawData* aSample);
 
   const AudioInfo& mInfo;
   MediaDataDecoderCallback* mCallback;
 };
 
 } // namespace mozilla
 #endif
--- a/dom/media/platforms/apple/AppleVDADecoder.h
+++ b/dom/media/platforms/apple/AppleVDADecoder.h
@@ -66,17 +66,16 @@ public:
     MediaDataDecoderCallback* aCallback,
     layers::ImageContainer* aImageContainer);
 
   // Access from the taskqueue and the decoder's thread.
   // OutputFrame is thread-safe.
   nsresult OutputFrame(CVPixelBufferRef aImage,
                        AppleFrameRef aFrameRef);
 
-private:
   RefPtr<InitPromise> Init() override;
   nsresult Input(MediaRawData* aSample) override;
   nsresult Flush() override;
   nsresult Drain() override;
   nsresult Shutdown() override;
   bool IsHardwareAccelerated(nsACString& aFailureReason) const override
   {
     return true;
--- a/dom/media/platforms/apple/AppleVTDecoder.h
+++ b/dom/media/platforms/apple/AppleVTDecoder.h
@@ -15,31 +15,31 @@ namespace mozilla {
 
 class AppleVTDecoder : public AppleVDADecoder {
 public:
   AppleVTDecoder(const VideoInfo& aConfig,
                  TaskQueue* aTaskQueue,
                  MediaDataDecoderCallback* aCallback,
                  layers::ImageContainer* aImageContainer);
 
-private:
-  virtual ~AppleVTDecoder();
   RefPtr<InitPromise> Init() override;
   bool IsHardwareAccelerated(nsACString& aFailureReason) const override
   {
     return mIsHardwareAccelerated;
   }
 
   const char* GetDescriptionName() const override
   {
     return mIsHardwareAccelerated
       ? "apple hardware VT decoder"
       : "apple software VT decoder";
   }
 
+private:
+  virtual ~AppleVTDecoder();
   void ProcessFlush() override;
   void ProcessDrain() override;
   void ProcessShutdown() override;
 
   CMVideoFormatDescriptionRef mFormat;
   VTDecompressionSessionRef mSession;
 
   // Method to pass a frame to VideoToolbox for decoding.
--- a/dom/media/platforms/wrappers/FuzzingWrapper.h
+++ b/dom/media/platforms/wrappers/FuzzingWrapper.h
@@ -95,31 +95,31 @@ public: // public for the benefit of Dec
   void Shutdown();
 };
 
 class DecoderFuzzingWrapper : public MediaDataDecoder
 {
 public:
   DecoderFuzzingWrapper(already_AddRefed<MediaDataDecoder> aDecoder,
                         already_AddRefed<DecoderCallbackFuzzingWrapper> aCallbackWrapper);
-  virtual ~DecoderFuzzingWrapper();
 
-private:
   // MediaDataDecoder implementation.
   RefPtr<InitPromise> Init() override;
   nsresult Input(MediaRawData* aSample) override;
   nsresult Flush() override;
   nsresult Drain() override;
   nsresult Shutdown() override;
   bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
   nsresult ConfigurationChanged(const TrackInfo& aConfig) override;
   const char* GetDescriptionName() const override
   {
     return mDecoder->GetDescriptionName();
   }
 
+private:
+  virtual ~DecoderFuzzingWrapper();
   RefPtr<MediaDataDecoder> mDecoder;
   RefPtr<DecoderCallbackFuzzingWrapper> mCallbackWrapper;
 };
 
 } // namespace mozilla
 
 #endif