Bug 1273405. Part 1 - rename some functions to be consistent with other MediaDataDecoder sub-classes. r=jya.
MozReview-Commit-ID: 1CpEZktGNia
--- a/dom/media/platforms/agnostic/VorbisDecoder.cpp
+++ b/dom/media/platforms/agnostic/VorbisDecoder.cpp
@@ -125,24 +125,23 @@ VorbisDataDecoder::DecodeHeader(const un
&pkt);
return r == 0 ? NS_OK : NS_ERROR_FAILURE;
}
nsresult
VorbisDataDecoder::Input(MediaRawData* aSample)
{
mTaskQueue->Dispatch(NewRunnableMethod<RefPtr<MediaRawData>>(
- this, &VorbisDataDecoder::Decode,
- RefPtr<MediaRawData>(aSample)));
+ this, &VorbisDataDecoder::ProcessDecode, aSample));
return NS_OK;
}
void
-VorbisDataDecoder::Decode(MediaRawData* aSample)
+VorbisDataDecoder::ProcessDecode(MediaRawData* aSample)
{
if (DoDecode(aSample) == -1) {
mCallback->Error();
} else if (mTaskQueue->IsEmpty()) {
mCallback->InputExhausted();
}
}
@@ -250,25 +249,25 @@ VorbisDataDecoder::DoDecode(MediaRawData
frames = vorbis_synthesis_pcmout(&mVorbisDsp, &pcm);
}
return aTotalFrames > 0 ? 1 : 0;
}
void
-VorbisDataDecoder::DoDrain()
+VorbisDataDecoder::ProcessDrain()
{
mCallback->DrainComplete();
}
nsresult
VorbisDataDecoder::Drain()
{
- mTaskQueue->Dispatch(NewRunnableMethod(this, &VorbisDataDecoder::DoDrain));
+ mTaskQueue->Dispatch(NewRunnableMethod(this, &VorbisDataDecoder::ProcessDrain));
return NS_OK;
}
nsresult
VorbisDataDecoder::Flush()
{
mTaskQueue->Flush();
// Ignore failed results from vorbis_synthesis_restart. They
--- a/dom/media/platforms/agnostic/VorbisDecoder.h
+++ b/dom/media/platforms/agnostic/VorbisDecoder.h
@@ -38,19 +38,19 @@ public:
// Return true if mimetype is Vorbis
static bool IsVorbis(const nsACString& aMimeType);
static const AudioConfig::Channel* VorbisLayout(uint32_t aChannels);
private:
nsresult DecodeHeader(const unsigned char* aData, size_t aLength);
- void Decode (MediaRawData* aSample);
- int DoDecode (MediaRawData* aSample);
- void DoDrain ();
+ void ProcessDecode(MediaRawData* aSample);
+ int DoDecode(MediaRawData* aSample);
+ void ProcessDrain();
const AudioInfo& mInfo;
RefPtr<FlushableTaskQueue> mTaskQueue;
MediaDataDecoderCallback* mCallback;
// Vorbis decoder state
vorbis_info mVorbisInfo;
vorbis_comment mVorbisComment;