зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1206568: P2. Clean up header declarations. r=cpearce
Make it consistent across the use of virtual/override
This commit is contained in:
Родитель
8283012c2a
Коммит
9a88d127d2
|
@ -34,11 +34,11 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override {
|
||||
nsRefPtr<InitPromise> Init() override {
|
||||
return InitPromise::CreateAndResolve(mType, __func__);
|
||||
}
|
||||
|
||||
virtual nsresult Shutdown() override {
|
||||
nsresult Shutdown() override {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -67,7 +67,7 @@ public:
|
|||
MediaDataDecoderCallback* mCallback;
|
||||
};
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample) override
|
||||
nsresult Input(MediaRawData* aSample) override
|
||||
{
|
||||
// The MediaDataDecoder must delete the sample when we're finished
|
||||
// with it, so the OutputEvent stores it in an nsAutoPtr and deletes
|
||||
|
@ -77,12 +77,12 @@ public:
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual nsresult Flush() override {
|
||||
nsresult Flush() override {
|
||||
mTaskQueue->Flush();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
virtual nsresult Drain() override {
|
||||
nsresult Drain() override {
|
||||
mCallback->DrainComplete();
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -213,7 +213,7 @@ class BlankDecoderModule : public PlatformDecoderModule {
|
|||
public:
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
layers::LayersBackend aLayersBackend,
|
||||
layers::ImageContainer* aImageContainer,
|
||||
|
@ -230,7 +230,7 @@ public:
|
|||
}
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override {
|
||||
|
@ -245,18 +245,18 @@ public:
|
|||
return decoder.forget();
|
||||
}
|
||||
|
||||
virtual bool
|
||||
bool
|
||||
SupportsMimeType(const nsACString& aMimeType) override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual bool
|
||||
bool
|
||||
SupportsSharedDecoders(const VideoInfo& aConfig) const override {
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override
|
||||
{
|
||||
return kNeedNone;
|
||||
|
|
|
@ -18,7 +18,7 @@ public:
|
|||
: AudioCallbackAdapter(aCallback)
|
||||
{}
|
||||
|
||||
virtual void Error(GMPErr aErr) override;
|
||||
void Error(GMPErr aErr) override;
|
||||
};
|
||||
|
||||
class EMEAudioDecoder : public GMPAudioDecoder {
|
||||
|
@ -33,8 +33,8 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
virtual void InitTags(nsTArray<nsCString>& aTags) override;
|
||||
virtual nsCString GetNodeId() override;
|
||||
void InitTags(nsTArray<nsCString>& aTags) override;
|
||||
nsCString GetNodeId() override;
|
||||
|
||||
nsRefPtr<CDMProxy> mProxy;
|
||||
};
|
||||
|
|
|
@ -45,12 +45,12 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override {
|
||||
nsRefPtr<InitPromise> Init() override {
|
||||
MOZ_ASSERT(!mIsShutdown);
|
||||
return mDecoder->Init();
|
||||
}
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample) override {
|
||||
nsresult Input(MediaRawData* aSample) override {
|
||||
MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
|
||||
MOZ_ASSERT(!mIsShutdown);
|
||||
if (mSamplesWaitingForKey->WaitIfKeyNotUsable(aSample)) {
|
||||
|
@ -104,7 +104,7 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
virtual nsresult Flush() override {
|
||||
nsresult Flush() override {
|
||||
MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
|
||||
MOZ_ASSERT(!mIsShutdown);
|
||||
mDecrypts.Enumerate(&DropDecryptPromises, nullptr);
|
||||
|
@ -114,7 +114,7 @@ public:
|
|||
return rv;
|
||||
}
|
||||
|
||||
virtual nsresult Drain() override {
|
||||
nsresult Drain() override {
|
||||
MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
|
||||
MOZ_ASSERT(!mIsShutdown);
|
||||
mDecrypts.Enumerate(&DropDecryptPromises, nullptr);
|
||||
|
@ -123,7 +123,7 @@ public:
|
|||
return rv;
|
||||
}
|
||||
|
||||
virtual nsresult Shutdown() override {
|
||||
nsresult Shutdown() override {
|
||||
MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
|
||||
MOZ_ASSERT(!mIsShutdown);
|
||||
mIsShutdown = true;
|
||||
|
@ -157,8 +157,8 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual nsresult Shutdown() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
private:
|
||||
nsRefPtr<SamplesWaitingForKey> mSamplesWaitingForKey;
|
||||
|
|
|
@ -26,7 +26,7 @@ public:
|
|||
virtual ~EMEDecoderModule();
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
layers::LayersBackend aLayersBackend,
|
||||
layers::ImageContainer* aImageContainer,
|
||||
|
@ -34,12 +34,12 @@ public:
|
|||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -23,7 +23,7 @@ public:
|
|||
: VideoCallbackAdapter(aCallback, aVideoInfo, aImageContainer)
|
||||
{}
|
||||
|
||||
virtual void Error(GMPErr aErr) override;
|
||||
void Error(GMPErr aErr) override;
|
||||
};
|
||||
|
||||
class EMEVideoDecoder : public GMPVideoDecoder {
|
||||
|
@ -48,9 +48,9 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
virtual void InitTags(nsTArray<nsCString>& aTags) override;
|
||||
virtual nsCString GetNodeId() override;
|
||||
virtual GMPUniquePtr<GMPVideoEncodedFrame> CreateFrame(MediaRawData* aSample) override;
|
||||
void InitTags(nsTArray<nsCString>& aTags) override;
|
||||
nsCString GetNodeId() override;
|
||||
GMPUniquePtr<GMPVideoEncodedFrame> CreateFrame(MediaRawData* aSample) override;
|
||||
|
||||
nsRefPtr<CDMProxy> mProxy;
|
||||
};
|
||||
|
|
|
@ -25,12 +25,12 @@ public:
|
|||
{}
|
||||
|
||||
// GMPAudioDecoderCallbackProxy
|
||||
virtual void Decoded(const nsTArray<int16_t>& aPCM, uint64_t aTimeStamp, uint32_t aChannels, uint32_t aRate) override;
|
||||
virtual void InputDataExhausted() override;
|
||||
virtual void DrainComplete() override;
|
||||
virtual void ResetComplete() override;
|
||||
virtual void Error(GMPErr aErr) override;
|
||||
virtual void Terminated() override;
|
||||
void Decoded(const nsTArray<int16_t>& aPCM, uint64_t aTimeStamp, uint32_t aChannels, uint32_t aRate) override;
|
||||
void InputDataExhausted() override;
|
||||
void DrainComplete() override;
|
||||
void ResetComplete() override;
|
||||
void Error(GMPErr aErr) override;
|
||||
void Terminated() override;
|
||||
|
||||
void SetLastStreamOffset(int64_t aStreamOffset) {
|
||||
mLastStreamOffset = aStreamOffset;
|
||||
|
@ -69,11 +69,11 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
protected:
|
||||
virtual void InitTags(nsTArray<nsCString>& aTags);
|
||||
|
@ -123,7 +123,7 @@ private:
|
|||
{
|
||||
}
|
||||
|
||||
virtual void Done(GMPAudioDecoderProxy* aGMP)
|
||||
void Done(GMPAudioDecoderProxy* aGMP) override
|
||||
{
|
||||
if (aGMP) {
|
||||
mDecoder->GMPInitDone(aGMP);
|
||||
|
|
|
@ -18,7 +18,7 @@ public:
|
|||
virtual ~GMPDecoderModule();
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
layers::LayersBackend aLayersBackend,
|
||||
layers::ImageContainer* aImageContainer,
|
||||
|
@ -26,12 +26,12 @@ public:
|
|||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override;
|
||||
};
|
||||
|
||||
|
|
|
@ -28,14 +28,14 @@ public:
|
|||
{}
|
||||
|
||||
// GMPVideoDecoderCallbackProxy
|
||||
virtual void Decoded(GMPVideoi420Frame* aDecodedFrame) override;
|
||||
virtual void ReceivedDecodedReferenceFrame(const uint64_t aPictureId) override;
|
||||
virtual void ReceivedDecodedFrame(const uint64_t aPictureId) override;
|
||||
virtual void InputDataExhausted() override;
|
||||
virtual void DrainComplete() override;
|
||||
virtual void ResetComplete() override;
|
||||
virtual void Error(GMPErr aErr) override;
|
||||
virtual void Terminated() override;
|
||||
void Decoded(GMPVideoi420Frame* aDecodedFrame) override;
|
||||
void ReceivedDecodedReferenceFrame(const uint64_t aPictureId) override;
|
||||
void ReceivedDecodedFrame(const uint64_t aPictureId) override;
|
||||
void InputDataExhausted() override;
|
||||
void DrainComplete() override;
|
||||
void ResetComplete() override;
|
||||
void Error(GMPErr aErr) override;
|
||||
void Terminated() override;
|
||||
|
||||
void SetLastStreamOffset(int64_t aStreamOffset) {
|
||||
mLastStreamOffset = aStreamOffset;
|
||||
|
@ -84,11 +84,11 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
protected:
|
||||
virtual void InitTags(nsTArray<nsCString>& aTags);
|
||||
|
@ -139,7 +139,7 @@ private:
|
|||
{
|
||||
}
|
||||
|
||||
virtual void Done(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost)
|
||||
void Done(GMPVideoDecoderProxy* aGMP, GMPVideoHost* aHost) override
|
||||
{
|
||||
if (aGMP) {
|
||||
mDecoder->GMPInitDone(aGMP, aHost);
|
||||
|
|
|
@ -68,27 +68,27 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
virtual void Output(MediaData* aData) override {
|
||||
void Output(MediaData* aData) override {
|
||||
mProxyCallback->Output(aData);
|
||||
}
|
||||
|
||||
virtual void Error() override;
|
||||
void Error() override;
|
||||
|
||||
virtual void InputExhausted() override {
|
||||
void InputExhausted() override {
|
||||
mProxyCallback->InputExhausted();
|
||||
}
|
||||
|
||||
virtual void DrainComplete() override {
|
||||
void DrainComplete() override {
|
||||
mProxyCallback->DrainComplete();
|
||||
}
|
||||
|
||||
virtual void ReleaseMediaResources() override {
|
||||
void ReleaseMediaResources() override {
|
||||
mProxyCallback->ReleaseMediaResources();
|
||||
}
|
||||
|
||||
virtual void FlushComplete();
|
||||
void FlushComplete();
|
||||
|
||||
virtual bool OnReaderTaskQueue() override
|
||||
bool OnReaderTaskQueue() override
|
||||
{
|
||||
return mProxyCallback->OnReaderTaskQueue();
|
||||
}
|
||||
|
@ -132,11 +132,11 @@ public:
|
|||
// Init and Shutdown run synchronously on the proxy thread, all others are
|
||||
// asynchronously and responded to via the MediaDataDecoderCallback.
|
||||
// Note: the nsresults returned by the proxied decoder are lost.
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
// Called by MediaDataDecoderCallbackProxy.
|
||||
void FlushComplete();
|
||||
|
|
|
@ -71,7 +71,7 @@ public:
|
|||
mGLContext = nullptr;
|
||||
}
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample) override {
|
||||
nsresult Input(MediaRawData* aSample) override {
|
||||
return MediaCodecDataDecoder::Input(aSample);
|
||||
}
|
||||
|
||||
|
@ -109,8 +109,8 @@ public:
|
|||
return eglImage;
|
||||
}
|
||||
|
||||
virtual nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat,
|
||||
const media::TimeUnit& aDuration) override {
|
||||
nsresult PostOutput(BufferInfo::Param aInfo, MediaFormat::Param aFormat,
|
||||
const media::TimeUnit& aDuration) override {
|
||||
if (!EnsureGLContext()) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
|
|
@ -20,14 +20,14 @@ typedef std::queue<nsRefPtr<MediaRawData>> SampleQueue;
|
|||
|
||||
class AndroidDecoderModule : public PlatformDecoderModule {
|
||||
public:
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
layers::LayersBackend aLayersBackend,
|
||||
layers::ImageContainer* aImageContainer,
|
||||
FlushableTaskQueue* aVideoTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
@ -36,9 +36,9 @@ public:
|
|||
AndroidDecoderModule() {}
|
||||
virtual ~AndroidDecoderModule() {}
|
||||
|
||||
virtual bool SupportsMimeType(const nsACString& aMimeType) override;
|
||||
bool SupportsMimeType(const nsACString& aMimeType) override;
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override;
|
||||
};
|
||||
|
||||
|
@ -52,11 +52,11 @@ public:
|
|||
|
||||
virtual ~MediaCodecDataDecoder();
|
||||
|
||||
virtual nsRefPtr<MediaDataDecoder::InitPromise> Init() override;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
virtual nsresult Input(MediaRawData* aSample);
|
||||
nsRefPtr<MediaDataDecoder::InitPromise> Init() override;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
|
||||
protected:
|
||||
friend class AndroidDecoderModule;
|
||||
|
|
|
@ -25,11 +25,11 @@ public:
|
|||
MediaDataDecoderCallback* aCallback);
|
||||
virtual ~AppleATDecoder();
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
// Callbacks also need access to the config.
|
||||
const AudioInfo& mConfig;
|
||||
|
|
|
@ -16,10 +16,10 @@ public:
|
|||
AppleDecoderModule();
|
||||
virtual ~AppleDecoderModule();
|
||||
|
||||
virtual nsresult Startup() override;
|
||||
nsresult Startup() override;
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
layers::LayersBackend aLayersBackend,
|
||||
layers::ImageContainer* aImageContainer,
|
||||
|
@ -27,14 +27,14 @@ public:
|
|||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
virtual bool SupportsMimeType(const nsACString& aMimeType) override;
|
||||
bool SupportsMimeType(const nsACString& aMimeType) override;
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override;
|
||||
|
||||
static void Init();
|
||||
|
|
|
@ -71,12 +71,12 @@ public:
|
|||
MediaDataDecoderCallback* aCallback,
|
||||
layers::ImageContainer* aImageContainer);
|
||||
virtual ~AppleVDADecoder();
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
virtual bool IsHardwareAccelerated(nsACString& aFailureReason) const override
|
||||
nsRefPtr<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;
|
||||
}
|
||||
|
|
|
@ -20,9 +20,9 @@ public:
|
|||
MediaDataDecoderCallback* aCallback,
|
||||
layers::ImageContainer* aImageContainer);
|
||||
virtual ~AppleVTDecoder();
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual bool IsHardwareAccelerated(nsACString& aFailureReason) const override
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
bool IsHardwareAccelerated(nsACString& aFailureReason) const override
|
||||
{
|
||||
return mIsHardwareAccelerated;
|
||||
}
|
||||
|
|
|
@ -25,9 +25,9 @@ public:
|
|||
const AudioInfo& aConfig);
|
||||
virtual ~FFmpegAudioDecoder();
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual void ProcessDrain() override;
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
void ProcessDrain() override;
|
||||
static AVCodecID GetCodecId(const nsACString& aMimeType);
|
||||
|
||||
private:
|
||||
|
|
|
@ -30,11 +30,11 @@ public:
|
|||
|
||||
static bool Link();
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override = 0;
|
||||
virtual nsresult Input(MediaRawData* aSample) override = 0;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
nsRefPtr<InitPromise> Init() override = 0;
|
||||
nsresult Input(MediaRawData* aSample) override = 0;
|
||||
nsresult Flush() override;
|
||||
nsresult Drain() override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
protected:
|
||||
// Flush and Drain operation, always run
|
||||
|
|
|
@ -28,7 +28,7 @@ public:
|
|||
FFmpegDecoderModule() {}
|
||||
virtual ~FFmpegDecoderModule() {}
|
||||
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
layers::LayersBackend aLayersBackend,
|
||||
layers::ImageContainer* aImageContainer,
|
||||
|
@ -41,7 +41,7 @@ public:
|
|||
return decoder.forget();
|
||||
}
|
||||
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override
|
||||
|
@ -51,13 +51,13 @@ public:
|
|||
return decoder.forget();
|
||||
}
|
||||
|
||||
virtual bool SupportsMimeType(const nsACString& aMimeType) override
|
||||
bool SupportsMimeType(const nsACString& aMimeType) override
|
||||
{
|
||||
return FFmpegAudioDecoder<V>::GetCodecId(aMimeType) != AV_CODEC_ID_NONE ||
|
||||
FFmpegH264Decoder<V>::GetCodecId(aMimeType) != AV_CODEC_ID_NONE;
|
||||
}
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override
|
||||
{
|
||||
if (aConfig.IsVideo() &&
|
||||
|
|
|
@ -36,9 +36,9 @@ public:
|
|||
ImageContainer* aImageContainer);
|
||||
virtual ~FFmpegH264Decoder();
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual void ProcessDrain() override;
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
void ProcessDrain() override;
|
||||
static AVCodecID GetCodecId(const nsACString& aMimeType);
|
||||
|
||||
private:
|
||||
|
|
|
@ -26,16 +26,16 @@ public:
|
|||
|
||||
virtual ~GonkAudioDecoderManager() override;
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init(MediaDataDecoderCallback* aCallback) override;
|
||||
nsRefPtr<InitPromise> Init(MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
|
||||
virtual nsresult Output(int64_t aStreamOffset,
|
||||
nsresult Output(int64_t aStreamOffset,
|
||||
nsRefPtr<MediaData>& aOutput) override;
|
||||
|
||||
virtual nsresult Flush() override;
|
||||
nsresult Flush() override;
|
||||
|
||||
virtual bool HasQueuedSample() override;
|
||||
bool HasQueuedSample() override;
|
||||
|
||||
private:
|
||||
bool InitMediaCodecProxy(MediaDataDecoderCallback* aCallback);
|
||||
|
|
|
@ -17,7 +17,7 @@ public:
|
|||
virtual ~GonkDecoderModule();
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
mozilla::layers::LayersBackend aLayersBackend,
|
||||
mozilla::layers::ImageContainer* aImageContainer,
|
||||
|
@ -25,17 +25,17 @@ public:
|
|||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
// Decode thread.
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
static void Init();
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override;
|
||||
|
||||
virtual bool SupportsMimeType(const nsACString& aMimeType) override;
|
||||
bool SupportsMimeType(const nsACString& aMimeType) override;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -72,15 +72,15 @@ public:
|
|||
|
||||
~GonkMediaDataDecoder();
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
nsRefPtr<InitPromise> Init() override;
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
|
||||
virtual nsresult Flush() override;
|
||||
nsresult Flush() override;
|
||||
|
||||
virtual nsresult Drain() override;
|
||||
nsresult Drain() override;
|
||||
|
||||
virtual nsresult Shutdown() override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
@ -44,16 +44,16 @@ public:
|
|||
|
||||
virtual ~GonkVideoDecoderManager() override;
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init(MediaDataDecoderCallback* aCallback) override;
|
||||
nsRefPtr<InitPromise> Init(MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
nsresult Input(MediaRawData* aSample) override;
|
||||
|
||||
virtual nsresult Output(int64_t aStreamOffset,
|
||||
nsresult Output(int64_t aStreamOffset,
|
||||
nsRefPtr<MediaData>& aOutput) override;
|
||||
|
||||
virtual nsresult Flush() override;
|
||||
nsresult Flush() override;
|
||||
|
||||
virtual bool HasQueuedSample() override;
|
||||
bool HasQueuedSample() override;
|
||||
|
||||
static void RecycleCallback(TextureClient* aClient, void* aClosure);
|
||||
|
||||
|
@ -76,7 +76,7 @@ private:
|
|||
MessageHandler(GonkVideoDecoderManager *aManager);
|
||||
~MessageHandler();
|
||||
|
||||
virtual void onMessageReceived(const android::sp<android::AMessage> &aMessage);
|
||||
void onMessageReceived(const android::sp<android::AMessage> &aMessage) override;
|
||||
|
||||
private:
|
||||
// Forbidden
|
||||
|
@ -94,8 +94,8 @@ private:
|
|||
VideoResourceListener(GonkVideoDecoderManager *aManager);
|
||||
~VideoResourceListener();
|
||||
|
||||
virtual void codecReserved() override;
|
||||
virtual void codecCanceled() override;
|
||||
void codecReserved() override;
|
||||
void codecCanceled() override;
|
||||
|
||||
private:
|
||||
// Forbidden
|
||||
|
|
|
@ -92,7 +92,7 @@ public:
|
|||
ImageContainer* aContainer,
|
||||
Image** aOutImage) override;
|
||||
|
||||
virtual bool SupportsConfig(IMFMediaType* aType, float aFramerate) override;
|
||||
bool SupportsConfig(IMFMediaType* aType, float aFramerate) override;
|
||||
|
||||
private:
|
||||
nsRefPtr<IDirect3D9Ex> mD3D9;
|
||||
|
@ -481,11 +481,11 @@ public:
|
|||
ImageContainer* aContainer,
|
||||
Image** aOutImage) override;
|
||||
|
||||
virtual HRESULT ConfigureForSize(uint32_t aWidth, uint32_t aHeight) override;
|
||||
HRESULT ConfigureForSize(uint32_t aWidth, uint32_t aHeight) override;
|
||||
|
||||
virtual bool IsD3D11() override { return true; }
|
||||
bool IsD3D11() override { return true; }
|
||||
|
||||
virtual bool SupportsConfig(IMFMediaType* aType, float aFramerate) override;
|
||||
bool SupportsConfig(IMFMediaType* aType, float aFramerate) override;
|
||||
|
||||
private:
|
||||
HRESULT CreateFormatConverter();
|
||||
|
|
|
@ -21,17 +21,17 @@ public:
|
|||
|
||||
bool Init();
|
||||
|
||||
virtual HRESULT Input(MediaRawData* aSample) override;
|
||||
HRESULT Input(MediaRawData* aSample) override;
|
||||
|
||||
// Note WMF's AAC decoder sometimes output negatively timestamped samples,
|
||||
// presumably they're the preroll samples, and we strip them. We may return
|
||||
// a null aOutput in this case.
|
||||
virtual HRESULT Output(int64_t aStreamOffset,
|
||||
HRESULT Output(int64_t aStreamOffset,
|
||||
nsRefPtr<MediaData>& aOutput) override;
|
||||
|
||||
virtual void Shutdown() override;
|
||||
void Shutdown() override;
|
||||
|
||||
virtual TrackInfo::TrackType GetType() override {
|
||||
TrackInfo::TrackType GetType() override {
|
||||
return TrackInfo::kAudioTrack;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,23 +17,23 @@ public:
|
|||
virtual ~WMFDecoderModule();
|
||||
|
||||
// Initializes the module, loads required dynamic libraries, etc.
|
||||
virtual nsresult Startup() override;
|
||||
nsresult Startup() override;
|
||||
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateVideoDecoder(const VideoInfo& aConfig,
|
||||
layers::LayersBackend aLayersBackend,
|
||||
layers::ImageContainer* aImageContainer,
|
||||
FlushableTaskQueue* aVideoTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
virtual already_AddRefed<MediaDataDecoder>
|
||||
already_AddRefed<MediaDataDecoder>
|
||||
CreateAudioDecoder(const AudioInfo& aConfig,
|
||||
FlushableTaskQueue* aAudioTaskQueue,
|
||||
MediaDataDecoderCallback* aCallback) override;
|
||||
|
||||
bool SupportsMimeType(const nsACString& aMimeType) override;
|
||||
|
||||
virtual ConversionRequired
|
||||
ConversionRequired
|
||||
DecoderNeedsConversion(const TrackInfo& aConfig) const override;
|
||||
|
||||
// Accessors that report whether we have the required MFTs available
|
||||
|
|
|
@ -69,17 +69,17 @@ public:
|
|||
MediaDataDecoderCallback* aCallback);
|
||||
~WMFMediaDataDecoder();
|
||||
|
||||
virtual nsRefPtr<MediaDataDecoder::InitPromise> Init() override;
|
||||
nsRefPtr<MediaDataDecoder::InitPromise> Init() override;
|
||||
|
||||
virtual nsresult Input(MediaRawData* aSample);
|
||||
nsresult Input(MediaRawData* aSample);
|
||||
|
||||
virtual nsresult Flush() override;
|
||||
nsresult Flush() override;
|
||||
|
||||
virtual nsresult Drain() override;
|
||||
nsresult Drain() override;
|
||||
|
||||
virtual nsresult Shutdown() override;
|
||||
nsresult Shutdown() override;
|
||||
|
||||
virtual bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
|
||||
bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
|
||||
|
||||
private:
|
||||
|
||||
|
|
|
@ -27,16 +27,15 @@ public:
|
|||
|
||||
bool Init();
|
||||
|
||||
virtual HRESULT Input(MediaRawData* aSample) override;
|
||||
HRESULT Input(MediaRawData* aSample) override;
|
||||
|
||||
virtual HRESULT Output(int64_t aStreamOffset,
|
||||
nsRefPtr<MediaData>& aOutput) override;
|
||||
HRESULT Output(int64_t aStreamOffset, nsRefPtr<MediaData>& aOutput) override;
|
||||
|
||||
virtual void Shutdown() override;
|
||||
void Shutdown() override;
|
||||
|
||||
virtual bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
|
||||
bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
|
||||
|
||||
virtual TrackInfo::TrackType GetType() override {
|
||||
TrackInfo::TrackType GetType() override {
|
||||
return TrackInfo::kVideoTrack;
|
||||
}
|
||||
|
||||
|
|
|
@ -29,12 +29,12 @@ public:
|
|||
MediaDataDecoderCallback* aCallback);
|
||||
virtual ~H264Converter();
|
||||
|
||||
virtual nsRefPtr<InitPromise> Init() override;
|
||||
virtual nsresult Input(MediaRawData* aSample) override;
|
||||
virtual nsresult Flush() override;
|
||||
virtual nsresult Drain() override;
|
||||
virtual nsresult Shutdown() override;
|
||||
virtual bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
|
||||
nsRefPtr<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 if mimetype is H.264.
|
||||
static bool IsH264(const TrackInfo& aConfig);
|
||||
|
|
Загрузка…
Ссылка в новой задаче