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

Bug 568162 - More accurate frame end time after seeking for WebM. r=cpearce

Browse Source
This commit is contained in:
Matthew Gregan 2010-06-10 15:46:58 +12:00
parent 4d08546873
commit c157381ae5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/media/webm/nsWebMReader.cpp
View File

@ -626,12 +626,10 @@ nsresult nsWebMReader::Seek(PRInt64 aTarget, PRInt64 aStartTime, PRInt64 aEndTim
return NS_ERROR_FAILURE;
}
if (HasVideo()) {
nsAutoPtr<VideoData> video;
PRBool eof = PR_FALSE;
PRInt64 startTime = -1;
video = nsnull;
while (HasVideo() && !eof) {
while (mVideoQueue.GetSize() == 0 && !eof) {
while (mVideoQueue.GetSize() < 2 && !eof) {
PRBool skip = PR_FALSE;
eof = !DecodeVideoFrame(skip, 0);
MonitorAutoExit exitReaderMon(mMonitor);
@ -640,20 +638,22 @@ nsresult nsWebMReader::Seek(PRInt64 aTarget, PRInt64 aStartTime, PRInt64 aEndTim
return NS_ERROR_FAILURE;
}
}
if (mVideoQueue.GetSize() == 0) {
if (mVideoQueue.GetSize() < 2) {
break;
}
video = mVideoQueue.PeekFront();
nsAutoPtr<VideoData> video(mVideoQueue.PopFront());
nsAutoPtr<VideoData> videoNext(mVideoQueue.PeekFront());
// If the frame end time is less than the seek target, we won't want
// to display this frame after the seek, so discard it.
if (video && video->mTime + 40 < aTarget) {
if (video && videoNext && videoNext->mTime < aTarget) {
if (startTime == -1) {
startTime = video->mTime;
}
mVideoQueue.PopFront();
video = nsnull;
videoNext.forget();
} else {
video.forget();
videoNext.forget();
mVideoQueue.PushFront(video.forget());
break;
}
}