Bug 1330603. Part 1 - remove the call to CheckIfDecodeComplete() from HandleEndOf{Audio,Video}. r=kaku

1. in HandleEndOfAudio, we surely have !IsAudioDecoding(). So we only need to check !IsVideoDecoding().
2. likewise, we only need to check !IsAudioDecoding() in HandleEndOfVideo().

MozReview-Commit-ID: A3pj1LC2okB

--HG--
extra : rebase_source : 8303196c62e82542b843702d7e1b21dbbe0a7b18
extra : intermediate-source : 200dcde05d8e9673b80362ebb1125b1efff43f47
extra : source : a0831acd3ea9aad663c82b05983e0b7eeda32b97
This commit is contained in:
JW Wang 2017-01-09 22:35:54 +08:00
Родитель bbb3d58dc1
Коммит 51803c6e08
1 изменённых файлов: 4 добавлений и 4 удалений

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

@ -2126,7 +2126,7 @@ MediaDecoderStateMachine::
DecodingState::HandleEndOfAudio()
{
AudioQueue().Finish();
if (mMaster->CheckIfDecodeComplete()) {
if (!mMaster->IsVideoDecoding()) {
SetState<CompletedState>();
} else {
MaybeStopPrerolling();
@ -2138,7 +2138,7 @@ MediaDecoderStateMachine::
DecodingState::HandleEndOfVideo()
{
VideoQueue().Finish();
if (mMaster->CheckIfDecodeComplete()) {
if (!mMaster->IsAudioDecoding()) {
SetState<CompletedState>();
} else {
MaybeStopPrerolling();
@ -2382,7 +2382,7 @@ MediaDecoderStateMachine::
BufferingState::HandleEndOfAudio()
{
AudioQueue().Finish();
if (mMaster->CheckIfDecodeComplete()) {
if (!mMaster->IsVideoDecoding()) {
SetState<CompletedState>();
} else {
// Check if we can exit buffering.
@ -2395,7 +2395,7 @@ MediaDecoderStateMachine::
BufferingState::HandleEndOfVideo()
{
VideoQueue().Finish();
if (mMaster->CheckIfDecodeComplete()) {
if (!mMaster->IsAudioDecoding()) {
SetState<CompletedState>();
} else {
// Check if we can exit buffering.