From d69380b6d1f0a4a51c89772d7f65c1cedf02a0b7 Mon Sep 17 00:00:00 2001 From: Matthew Gregan Date: Mon, 15 Dec 2008 15:12:52 +1300 Subject: [PATCH] Bug 469598 - nsHTMLMediaElement::MetadataLoaded calls nsMediaDecoder::Seek(0) - r=doublec sr=roc --- content/html/content/src/nsHTMLMediaElement.cpp | 2 -- content/media/video/src/nsOggDecoder.cpp | 4 ---- 2 files changed, 6 deletions(-) diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp index f2d42d5cf3e..8f3b069c65c 100644 --- a/content/html/content/src/nsHTMLMediaElement.cpp +++ b/content/html/content/src/nsHTMLMediaElement.cpp @@ -688,8 +688,6 @@ void nsHTMLMediaElement::MetadataLoaded() mNetworkState = nsIDOMHTMLMediaElement::LOADED_METADATA; DispatchAsyncSimpleEvent(NS_LITERAL_STRING("durationchange")); DispatchAsyncSimpleEvent(NS_LITERAL_STRING("loadedmetadata")); - // TODO: Seek to the start time, as set in the start attribute. - mDecoder->Seek(0.0); } void nsHTMLMediaElement::FirstFrameLoaded() diff --git a/content/media/video/src/nsOggDecoder.cpp b/content/media/video/src/nsOggDecoder.cpp index 2fbfa773ddc..d8e9aa6b626 100644 --- a/content/media/video/src/nsOggDecoder.cpp +++ b/content/media/video/src/nsOggDecoder.cpp @@ -1287,10 +1287,6 @@ nsresult nsOggDecoder::Seek(float aTime) if (aTime < 0.0) return NS_ERROR_FAILURE; - if (mPlayState == PLAY_STATE_LOADING && aTime == 0.0) { - return NS_OK; - } - mRequestedSeekTime = aTime; // If we are already in the seeking state, then setting mRequestedSeekTime