wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backing out media-cache, bug 475441

Browse Source
This commit is contained in:
Robert O'Callahan 2009-04-01 16:17:45 +13:00
commit 5dc4d3f8f1
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
content/media/video/src/nsOggDecoder.cpp
View File

@ -1399,8 +1399,6 @@ nsresult nsOggDecoder::Play()
mNextState = PLAY_STATE_PLAYING;
return NS_OK;
}
if (mPlayState == PLAY_STATE_ENDED)
return Seek(0);
ChangeState(PLAY_STATE_PLAYING);
@ -1420,11 +1418,7 @@ nsresult nsOggDecoder::Seek(float aTime)
// above will result in the new seek occurring when the current seek
// completes.
if (mPlayState != PLAY_STATE_SEEKING) {
if (mPlayState == PLAY_STATE_ENDED) {
mNextState = PLAY_STATE_PLAYING;
} else {
mNextState = mPlayState;
}
mNextState = mPlayState;
ChangeState(PLAY_STATE_SEEKING);
}
@ -1662,8 +1656,7 @@ void nsOggDecoder::PlaybackEnded()
if (mShuttingDown || mPlayState == nsOggDecoder::PLAY_STATE_SEEKING)
return;
ChangeState(PLAY_STATE_ENDED);
Stop();
if (mElement) {
mElement->PlaybackEnded();
}
@ -1874,6 +1867,20 @@ void nsOggDecoder::ChangeState(PlayState aState)
return;
}
if (mPlayState == PLAY_STATE_ENDED &&
aState != PLAY_STATE_SHUTDOWN) {
// If we've completed playback then the decode and display threads
// have been shutdown. To honor the state change request we need
// to reload the resource and restart the threads.
// Like seeking, this will require opening a new channel, which means
// we may not actually get the same resource --- a server may send
// us something different.
mNextState = aState;
mPlayState = PLAY_STATE_LOADING;
Load(mURI, nsnull, nsnull);
return;
}
mPlayState = aState;
switch (aState) {
case PLAY_STATE_PAUSED: