Bug 1124023 - Fix naming of GMPAudioDecoderCallbackProxy. r=cpearce a=lmandel
authorMatthew Gregan <kinetik@flim.org>
Tue, 20 Jan 2015 18:39:00 +1300
changeset 250173 589dc8554797
parent 250172 3c5c3aa669f6
child 250174 3f463a602bea
push id4521
push usercpearce@mozilla.com
push date2015-03-04 01:22 +0000
treeherdermozilla-beta@8abdbdecd2d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce, lmandel
bugs1124023
milestone37.0
Bug 1124023 - Fix naming of GMPAudioDecoderCallbackProxy. r=cpearce a=lmandel
dom/media/fmp4/eme/EMEAudioDecoder.h
dom/media/gmp/GMPAudioDecoderParent.cpp
dom/media/gmp/GMPAudioDecoderParent.h
dom/media/gmp/GMPAudioDecoderProxy.h
--- a/dom/media/fmp4/eme/EMEAudioDecoder.h
+++ b/dom/media/fmp4/eme/EMEAudioDecoder.h
@@ -13,17 +13,17 @@
 #include "nsServiceManagerUtils.h"
 #include "GMPAudioHost.h"
 #include "GMPAudioDecoderProxy.h"
 #include "SamplesWaitingForKey.h"
 
 namespace mozilla {
 
 class EMEAudioDecoder : public MediaDataDecoder
-                      , public GMPAudioDecoderProxyCallback
+                      , public GMPAudioDecoderCallbackProxy
 {
   typedef mp4_demuxer::MP4Sample MP4Sample;
   typedef mp4_demuxer::AudioDecoderConfig AudioDecoderConfig;
 public:
   EMEAudioDecoder(CDMProxy* aProxy,
                   const AudioDecoderConfig& aConfig,
                   MediaTaskQueue* aTaskQueue,
                   MediaDataDecoderCallback* aCallback);
@@ -32,17 +32,17 @@ public:
 
   // MediaDataDecoder implementation.
   virtual nsresult Init() MOZ_OVERRIDE;
   virtual nsresult Input(MP4Sample* aSample) MOZ_OVERRIDE;
   virtual nsresult Flush() MOZ_OVERRIDE;
   virtual nsresult Drain() MOZ_OVERRIDE;
   virtual nsresult Shutdown() MOZ_OVERRIDE;
 
-  // GMPAudioDecoderProxyCallback implementation.
+  // GMPAudioDecoderCallbackProxy implementation.
   virtual void Decoded(const nsTArray<int16_t>& aPCM,
                        uint64_t aTimeStamp,
                        uint32_t aChannels,
                        uint32_t aRate) MOZ_OVERRIDE;
   virtual void InputDataExhausted() MOZ_OVERRIDE;
   virtual void DrainComplete() MOZ_OVERRIDE;
   virtual void ResetComplete() MOZ_OVERRIDE;
   virtual void Error(GMPErr aErr) MOZ_OVERRIDE;
--- a/dom/media/gmp/GMPAudioDecoderParent.cpp
+++ b/dom/media/gmp/GMPAudioDecoderParent.cpp
@@ -43,17 +43,17 @@ GMPAudioDecoderParent::~GMPAudioDecoderP
 }
 
 nsresult
 GMPAudioDecoderParent::InitDecode(GMPAudioCodecType aCodecType,
                                   uint32_t aChannelCount,
                                   uint32_t aBitsPerChannel,
                                   uint32_t aSamplesPerSecond,
                                   nsTArray<uint8_t>& aExtraData,
-                                  GMPAudioDecoderProxyCallback* aCallback)
+                                  GMPAudioDecoderCallbackProxy* aCallback)
 {
   if (mIsOpen) {
     NS_WARNING("Trying to re-init an in-use GMP audio decoder!");
     return NS_ERROR_FAILURE;
   }
 
   MOZ_ASSERT(mPlugin->GMPThread() == NS_GetCurrentThread());
 
--- a/dom/media/gmp/GMPAudioDecoderParent.h
+++ b/dom/media/gmp/GMPAudioDecoderParent.h
@@ -29,17 +29,17 @@ public:
   nsresult Shutdown();
 
   // GMPAudioDecoderProxy
   virtual nsresult InitDecode(GMPAudioCodecType aCodecType,
                               uint32_t aChannelCount,
                               uint32_t aBitsPerChannel,
                               uint32_t aSamplesPerSecond,
                               nsTArray<uint8_t>& aExtraData,
-                              GMPAudioDecoderProxyCallback* aCallback) MOZ_OVERRIDE;
+                              GMPAudioDecoderCallbackProxy* aCallback) MOZ_OVERRIDE;
   virtual nsresult Decode(GMPAudioSamplesImpl& aInput) MOZ_OVERRIDE;
   virtual nsresult Reset() MOZ_OVERRIDE;
   virtual nsresult Drain() MOZ_OVERRIDE;
   virtual nsresult Close() MOZ_OVERRIDE;
 
 private:
   ~GMPAudioDecoderParent();
 
@@ -50,15 +50,15 @@ private:
   virtual bool RecvDrainComplete() MOZ_OVERRIDE;
   virtual bool RecvResetComplete() MOZ_OVERRIDE;
   virtual bool RecvError(const GMPErr& aError) MOZ_OVERRIDE;
   virtual bool Recv__delete__() MOZ_OVERRIDE;
 
   bool mIsOpen;
   bool mShuttingDown;
   nsRefPtr<GMPParent> mPlugin;
-  GMPAudioDecoderProxyCallback* mCallback;
+  GMPAudioDecoderCallbackProxy* mCallback;
 };
 
 } // namespace gmp
 } // namespace mozilla
 
 #endif // GMPAudioDecoderParent_h_
--- a/dom/media/gmp/GMPAudioDecoderProxy.h
+++ b/dom/media/gmp/GMPAudioDecoderProxy.h
@@ -7,19 +7,19 @@
 #define GMPAudioDecoderProxy_h_
 
 #include "GMPCallbackBase.h"
 #include "gmp-audio-codec.h"
 #include "GMPAudioHost.h"
 #include "nsTArray.h"
 #include "mozilla/gmp/GMPTypes.h"
 
-class GMPAudioDecoderProxyCallback : public GMPCallbackBase {
+class GMPAudioDecoderCallbackProxy : public GMPCallbackBase {
 public:
-  virtual ~GMPAudioDecoderProxyCallback() {}
+  virtual ~GMPAudioDecoderCallbackProxy() {}
   // Note: aChannelCount and aSamplesPerSecond may not be consistent from
   // one invocation to the next.
   virtual void Decoded(const nsTArray<int16_t>& aPCM,
                        uint64_t aTimeStamp,
                        uint32_t aChannelCount,
                        uint32_t aSamplesPerSecond) = 0;
   virtual void InputDataExhausted() = 0;
   virtual void DrainComplete() = 0;
@@ -31,17 +31,17 @@ class GMPAudioDecoderProxy {
 public:
   virtual ~GMPAudioDecoderProxy() {}
 
   virtual nsresult InitDecode(GMPAudioCodecType aCodecType,
                               uint32_t aChannelCount,
                               uint32_t aBitsPerChannel,
                               uint32_t aSamplesPerSecond,
                               nsTArray<uint8_t>& aExtraData,
-                              GMPAudioDecoderProxyCallback* aCallback) = 0;
+                              GMPAudioDecoderCallbackProxy* aCallback) = 0;
   virtual nsresult Decode(mozilla::gmp::GMPAudioSamplesImpl& aSamples) = 0;
   virtual nsresult Reset() = 0;
   virtual nsresult Drain() = 0;
   // Call to tell GMP/plugin the consumer will no longer use this
   // interface/codec.
   virtual nsresult Close() = 0;
 };