diff --git a/dom/media/platforms/agnostic/VPXDecoder.cpp b/dom/media/platforms/agnostic/VPXDecoder.cpp index 6b1f5ad2ceed..ac3566174941 100644 --- a/dom/media/platforms/agnostic/VPXDecoder.cpp +++ b/dom/media/platforms/agnostic/VPXDecoder.cpp @@ -90,7 +90,7 @@ VPXDecoder::Flush() } int -VPXDecoder::DoDecodeFrame(MediaRawData* aSample) +VPXDecoder::DoDecode(MediaRawData* aSample) { #if defined(DEBUG) vpx_codec_stream_info_t si; @@ -174,9 +174,9 @@ VPXDecoder::DoDecodeFrame(MediaRawData* aSample) } void -VPXDecoder::DecodeFrame(MediaRawData* aSample) +VPXDecoder::ProcessDecode(MediaRawData* aSample) { - if (DoDecodeFrame(aSample) == -1) { + if (DoDecode(aSample) == -1) { mCallback->Error(); } else if (mTaskQueue->IsEmpty()) { mCallback->InputExhausted(); @@ -187,14 +187,13 @@ nsresult VPXDecoder::Input(MediaRawData* aSample) { mTaskQueue->Dispatch(NewRunnableMethod>( - this, &VPXDecoder::DecodeFrame, - RefPtr(aSample))); + this, &VPXDecoder::ProcessDecode, aSample)); return NS_OK; } void -VPXDecoder::DoDrain() +VPXDecoder::ProcessDrain() { mCallback->DrainComplete(); } @@ -202,7 +201,7 @@ VPXDecoder::DoDrain() nsresult VPXDecoder::Drain() { - mTaskQueue->Dispatch(NewRunnableMethod(this, &VPXDecoder::DoDrain)); + mTaskQueue->Dispatch(NewRunnableMethod(this, &VPXDecoder::ProcessDrain)); return NS_OK; } diff --git a/dom/media/platforms/agnostic/VPXDecoder.h b/dom/media/platforms/agnostic/VPXDecoder.h index 2cb4ab27859e..0fbb00ee2d0a 100644 --- a/dom/media/platforms/agnostic/VPXDecoder.h +++ b/dom/media/platforms/agnostic/VPXDecoder.h @@ -16,7 +16,7 @@ namespace mozilla { - using namespace layers; +using namespace layers; class VPXDecoder : public MediaDataDecoder { @@ -47,10 +47,9 @@ public: static bool IsVPX(const nsACString& aMimeType, uint8_t aCodecMask=VP8|VP9); private: - void DecodeFrame (MediaRawData* aSample); - int DoDecodeFrame (MediaRawData* aSample); - void DoDrain (); - void OutputDelayedFrames (); + void ProcessDecode(MediaRawData* aSample); + int DoDecode(MediaRawData* aSample); + void ProcessDrain(); RefPtr mImageContainer; RefPtr mTaskQueue;