Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 557432 - Backed out changeset b64df24f4910

Browse Source
This commit is contained in:
Chris Pearce 2010-04-09 16:33:07 +12:00
parent c331b94df9
commit 27960244ba
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
content/media/ogg/nsOggPlayStateMachine.cpp
View File

@ -933,8 +933,8 @@ nsresult nsOggPlayStateMachine::Run()
AdvanceFrame();
}
if (HasAudio()) {
// Close the audio stream so that next time audio is used a new stream
if (mAudioStream) {
// Close the audop stream so that next time audio is used a new stream
// is created. The StopPlayback call also resets the IsPlaying() state
// so audio is restarted correctly.
StopPlayback(AUDIO_SHUTDOWN);
@ -1125,16 +1125,9 @@ PRInt64
nsOggPlayStateMachine::GetAudioClock()
{
NS_ASSERTION(IsThread(mDecoder->mStateMachineThread), "Should be on state machine thread.");
if (!HasAudio())
if (!mAudioStream || !HasAudio())
return -1;
PRInt64 t;
{
MonitorAutoExit exitMon(mDecoder->GetMonitor());
MonitorAutoEnter audioMon(mAudioMonitor);
if (!mAudioStream)
return -1;
t = mAudioStream->GetPosition();
}
PRInt64 t = mAudioStream->GetPosition();
return (t == -1) ? -1 : t + mAudioStartTime;
}