wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1124023 - Fix naming of GMPAudioDecoderCallbackProxy. r=cpearce

Browse Source
This commit is contained in:
Matthew Gregan 2015-01-20 18:39:00 +13:00
parent 78cd11b4ea
commit 1b6c65bfdb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/fmp4/eme/EMEAudioDecoder.h
View File

@ -18,7 +18,7 @@
namespace mozilla {
class EMEAudioDecoder : public MediaDataDecoder
, public GMPAudioDecoderProxyCallback
, public GMPAudioDecoderCallbackProxy
{
typedef mp4_demuxer::MP4Sample MP4Sample;
typedef mp4_demuxer::AudioDecoderConfig AudioDecoderConfig;
@ -37,7 +37,7 @@ public:
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,

2
dom/media/gmp/GMPAudioDecoderParent.cpp
View File

@ -48,7 +48,7 @@ GMPAudioDecoderParent::InitDecode(GMPAudioCodecType aCodecType,
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!");

4
dom/media/gmp/GMPAudioDecoderParent.h
View File

@ -34,7 +34,7 @@ public:
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;
@ -55,7 +55,7 @@ private:
bool mIsOpen;
bool mShuttingDown;
nsRefPtr<GMPParent> mPlugin;
GMPAudioDecoderProxyCallback* mCallback;
GMPAudioDecoderCallbackProxy* mCallback;
};
} // namespace gmp

6
dom/media/gmp/GMPAudioDecoderProxy.h
View File

@ -12,9 +12,9 @@
#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,
@ -36,7 +36,7 @@ public:
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;