From 055caa25a5c68856afdb97e52160e3fe1d27a55d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Tue, 2 Jun 2009 09:54:16 +1200
Subject: [PATCH] Bug 495319. Fire 'timeupdate' with the correct final time
 when we finish playing. r=doublec

---
 content/media/video/src/nsOggDecoder.cpp     |   4 +++
 content/media/video/test/Makefile.in         |   2 ++
 content/media/video/test/small-shot.ogg      | Bin 0 -> 6399 bytes
 content/media/video/test/test_bug495319.html |  34 +++++++++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 content/media/video/test/small-shot.ogg
 create mode 100644 content/media/video/test/test_bug495319.html

diff --git a/content/media/video/src/nsOggDecoder.cpp b/content/media/video/src/nsOggDecoder.cpp
index 05d6c42c757..05a6be5bb0b 100644
--- a/content/media/video/src/nsOggDecoder.cpp
+++ b/content/media/video/src/nsOggDecoder.cpp
@@ -1721,6 +1721,9 @@ nsresult nsOggDecodeStateMachine::Run()
             continue;
         }
 
+        // Set the right current time
+        mCurrentFrameTime += mCallbackPeriod;
+
         mon.Exit();
         nsCOMPtr<nsIRunnable> event =
           NS_NEW_RUNNABLE_METHOD(nsOggDecoder, mDecoder, PlaybackEnded);
@@ -2185,6 +2188,7 @@ void nsOggDecoder::PlaybackEnded()
   if (mShuttingDown || mPlayState == nsOggDecoder::PLAY_STATE_SEEKING)
     return;
 
+  PlaybackPositionChanged();
   ChangeState(PLAY_STATE_ENDED);
 
   if (mElement)  {
diff --git a/content/media/video/test/Makefile.in b/content/media/video/test/Makefile.in
index 8fda8ef991c..5c638246af6 100644
--- a/content/media/video/test/Makefile.in
+++ b/content/media/video/test/Makefile.in
@@ -74,6 +74,7 @@ _TEST_FILES += \
 		test_bug493187.html \
 		test_bug495145.html \
 		test_bug495300.html \
+		test_bug495319.html \
 		test_can_play_type_ogg.html \
 		test_closing_connections.html \
 		test_contentDuration1.html \
@@ -112,6 +113,7 @@ _TEST_FILES += \
 		contentDuration5.sjs \
 		contentDuration6.sjs \
 		seek.ogv \
+		small-shot.ogg \
 		sound.ogg \
 		$(NULL)
 
diff --git a/content/media/video/test/small-shot.ogg b/content/media/video/test/small-shot.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..989e13b7c38f2d8d67fd6e8890718105e6d7b9b0
GIT binary patch
literal 6399
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

literal 0
HcmV?d00001

diff --git a/content/media/video/test/test_bug495319.html b/content/media/video/test/test_bug495319.html
new file mode 100644
index 00000000000..9ced78ee224
--- /dev/null
+++ b/content/media/video/test/test_bug495319.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=495319
+-->
+
+<head>
+  <title>Bug 495319 - playing back small audio files should fire timeupdate</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=495319">Mozilla Bug 495319</a>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+var v;
+var timeUpdateCount = 0;
+
+function timeUpdate(event) {
+  ++timeUpdateCount;
+}
+
+function done(event) {
+  ok(timeUpdateCount > 0, "Should see at least one timeupdate: " + event.target.currentTime);
+  SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+</script>
+</pre>
+<audio src='small-shot.ogg' ontimeupdate="timeUpdate(event)" onended='done(event)' controls autoplay></video>
+</body>
+</html>