Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 476176. Avoid potential deadlock warnings by not calling 'Available' on the media stream when checking whether to exit buffering; instead we can use our internal position counters. r=doublec

Browse Source 
--HG--
extra : rebase_source : 51901db1ddca66b658d04d8c24769590a8faa7f7
This commit is contained in:
Robert O'Callahan 2009-02-11 14:44:39 +13:00
parent 861235b3f7
commit 5564ffb17a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,9 +423,9 @@ private:
// accessed in the decoder thread.
PRIntervalTime mBufferingStart;
// Number of bytes to buffer when buffering. Only accessed in the
// decoder thread.
PRInt64 mBufferingBytes;
// Download position where we should stop buffering. Only
// accessed in the decoder thread.
PRInt64 mBufferingEndOffset;
// The time value of the last decoded video frame. Used for
// computing the sleep period between frames for a/v sync.
@ -502,7 +502,7 @@ nsOggDecodeStateMachine::nsOggDecodeStateMachine(nsOggDecoder* aDecoder) :
mAudioChannels(0),
mAudioTrack(-1),
mBufferingStart(0),
mBufferingBytes(0),
mBufferingEndOffset(0),
mLastFrameTime(0),
mLastFramePosition(-1),
mState(DECODER_STATE_DECODING_METADATA),
@ -1016,9 +1016,10 @@ nsresult nsOggDecodeStateMachine::Run()
mBufferingStart = PR_IntervalNow();
double playbackRate = mDecoder->GetStatistics().mPlaybackRate;
mBufferingBytes = BUFFERING_RATE(playbackRate) * BUFFERING_WAIT;
mBufferingEndOffset = mDecoder->mDownloadPosition +
BUFFERING_RATE(playbackRate) * BUFFERING_WAIT;
mState = DECODER_STATE_BUFFERING;
LOG(PR_LOG_DEBUG, ("Changed state from DECODING to BUFFERING (%d bytes)", PRInt32(mBufferingBytes)));
LOG(PR_LOG_DEBUG, ("Changed state from DECODING to BUFFERING"));
} else {
PlayFrame();
}
@ -1101,11 +1102,11 @@ nsresult nsOggDecodeStateMachine::Run()
{
PRIntervalTime now = PR_IntervalNow();
if ((PR_IntervalToMilliseconds(now - mBufferingStart) < BUFFERING_WAIT*1000) &&
reader->Available() < mBufferingBytes &&
mDecoder->mDownloadPosition < mBufferingEndOffset &&
(mDecoder->mTotalBytes < 0 || mDecoder->mDownloadPosition < mDecoder->mTotalBytes)) {
LOG(PR_LOG_DEBUG,
("In buffering: buffering data until %d bytes available or %d milliseconds",
PRUint32(mBufferingBytes - reader->Available()),
PRUint32(mBufferingEndOffset - mDecoder->mDownloadPosition),
BUFFERING_WAIT*1000 - (PR_IntervalToMilliseconds(now - mBufferingStart))));
mon.Wait(PR_MillisecondsToInterval(1000));
if (mState == DECODER_STATE_SHUTDOWN)