Bug 531340 - Fix wait-on-audio-queue-empty condition in ogg decoder audio playback loop. r=doublec

This commit is contained in:
Chris Pearce 2010-04-01 22:19:35 -07:00
parent 70e2bdb1ab
commit 06593edeb7

View File

@ -319,8 +319,7 @@ void nsOggPlayStateMachine::AudioLoop()
!mStopDecodeThreads &&
(!IsPlaying() ||
mState == DECODER_STATE_BUFFERING ||
(mState == DECODER_STATE_DECODING &&
mReader->mAudioQueue.GetSize() == 0 &&
(mReader->mAudioQueue.GetSize() == 0 &&
!mReader->mAudioQueue.AtEndOfStream())))
{
mon.Wait();
@ -335,8 +334,7 @@ void nsOggPlayStateMachine::AudioLoop()
}
}
NS_ASSERTION(mReader->mAudioQueue.GetSize() > 0 &&
!mReader->mAudioQueue.AtEndOfStream(),
NS_ASSERTION(mReader->mAudioQueue.GetSize() > 0,
"Should have data to play");
nsAutoPtr<SoundData> sound(mReader->mAudioQueue.PopFront());
{