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

Bug 487519. Work around Ogg bugs by decoding two frames before we seek to find the duration. r=roc

Browse Source
This commit is contained in:
Chris Double 2009-05-31 22:06:30 +12:00
parent 0c254a71d7
commit 6664a71b4b
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1801,6 +1801,36 @@ void nsOggDecodeStateMachine::LoadOggHeaders(nsChannelReader* aReader)
mSeekable &&
mDuration == -1) {
mDecoder->StopProgressUpdates();
// Workaround for bug 481933. Decoding a frame
// before seeking allows us to detect errors in
// the Ogg file before the seek destroys the
// information about the error triggering the
// bug in the Ogg libraries.
mon.Exit();
OggPlayErrorCode decodeResult = DecodeFrame();
mon.Enter();
HandleDecodeErrors(decodeResult);
if (mState == DECODER_STATE_SHUTDOWN) {
return;
}
// An additional frame is decoded here to work around a
// liboggplay bug. When decoding one frame, then seeking back
// to position 0 (as done a few lines down), liboggplay does
// not seek and continues from the frame following the first
// decode. By doing a second decode frame, the following
// oggplay_seek works correctly to go back to time position 0.
mon.Exit();
decodeResult = DecodeFrame();
mon.Enter();
HandleDecodeErrors(decodeResult);
if (mState == DECODER_STATE_SHUTDOWN) {
return;
}
// Don't hold the monitor during the duration
// call as it can issue seek requests
// and blocks until these are completed.