Bug 1314526. Part 2 - fix HandleAudioDecoded(). r=kikuo

MozReview-Commit-ID: 1jbZz5m9uR2

--HG--
extra : rebase_source : 6ca65253bca13c36de542bd9410eb3a16b00574a
extra : intermediate-source : 3ac15d1f7c5c36d0f3f0086ff491414101a5ad3b
extra : source : 2ec452b92d37902ea4f58f88dbeb49cea13d6ebd
This commit is contained in:
JW Wang 2016-10-28 16:27:19 +08:00
Родитель 2afb7996af
Коммит a2c26ccc8a
1 изменённых файлов: 5 добавлений и 10 удалений

Просмотреть файл

@ -194,8 +194,7 @@ public:
// Event handlers for various events.
virtual void HandleCDMProxyReady() {}
virtual bool HandleAudioDecoded(MediaData* aAudio) { return false; }
virtual void HandleAudioDecoded(MediaData* aAudio) {}
virtual bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart)
{
@ -479,11 +478,10 @@ public:
return DECODER_STATE_DECODING_FIRSTFRAME;
}
bool HandleAudioDecoded(MediaData* aAudio) override
void HandleAudioDecoded(MediaData* aAudio) override
{
mMaster->Push(aAudio, MediaData::AUDIO_DATA);
MaybeFinishDecodeFirstFrame();
return true;
}
bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
@ -579,11 +577,10 @@ public:
return DECODER_STATE_DECODING;
}
bool HandleAudioDecoded(MediaData* aAudio) override
void HandleAudioDecoded(MediaData* aAudio) override
{
mMaster->Push(aAudio, MediaData::AUDIO_DATA);
MaybeStopPrerolling();
return true;
}
bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
@ -853,10 +850,9 @@ public:
return DECODER_STATE_SEEKING;
}
bool HandleAudioDecoded(MediaData* aAudio) override
void HandleAudioDecoded(MediaData* aAudio) override
{
MOZ_ASSERT(false);
return true;
}
bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
@ -966,13 +962,12 @@ public:
return DECODER_STATE_BUFFERING;
}
bool HandleAudioDecoded(MediaData* aAudio) override
void HandleAudioDecoded(MediaData* aAudio) override
{
// This might be the sample we need to exit buffering.
// Schedule Step() to check it.
mMaster->Push(aAudio, MediaData::AUDIO_DATA);
mMaster->ScheduleStateMachine();
return true;
}
bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override