WebCore:

        Reviewed by Adele.

        Fix that 'timeupdate' and 'waiting' events were never dispatched.

        Add explicit m_paused attribute instead of trying to derive paused state from
        underlying media. Call updatePlayState() to start/stop media playback
        when any attribute that affects active playback state changes. This matches
        specification text.

        Test: http/tests/media/video-play-stall.html

        * html/HTMLMediaElement.cpp:
        (WebCore::HTMLMediaElement::HTMLMediaElement):
        (WebCore::HTMLMediaElement::setReadyState):
        (WebCore::HTMLMediaElement::paused):
        (WebCore::HTMLMediaElement::play):
        (WebCore::HTMLMediaElement::pause):
        (WebCore::HTMLMediaElement::checkIfSeekNeeded):
        (WebCore::HTMLMediaElement::movieDidEnd):
        (WebCore::HTMLMediaElement::updatePlayState):
        * html/HTMLMediaElement.h:

LayoutTests:

        Reviewed by Adele.

        - add HTTP media test for stalling load
        - update tests that don't specifically test autoplay feature to not use autoplay
          attribute since playback may start before event listeners are registered

        * http/tests/media: Added.
        * http/tests/media/video-load-and-stall.cgi: Added.
        * http/tests/media/video-play-stall-expected.txt: Added.
        * http/tests/media/video-play-stall.html: Added.
        * media/video-autoplay.html:
        * media/video-dom-loopstart.html:
        * media/video-end.html:
        * media/video-loopcount.html:
        * media/video-loopend.html:
        * media/video-loopstart.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27758 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a8290ead70eac497809f06bf80d9d339969ca8d6..50763135e4d3a7e082947c6f7029b143e365ed46 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2007-11-12  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Adele.
+        
+        - add HTTP media test for stalling load
+        - update tests that don't specifically test autoplay feature to not use autoplay 
+          attribute since playback may start before event listeners are registered
+
+        * http/tests/media: Added.
+        * http/tests/media/video-load-and-stall.cgi: Added.
+        * http/tests/media/video-play-stall-expected.txt: Added.
+        * http/tests/media/video-play-stall.html: Added.
+        * media/video-autoplay.html:
+        * media/video-dom-loopstart.html:
+        * media/video-end.html:
+        * media/video-loopcount.html:
+        * media/video-loopend.html:
+        * media/video-loopstart.html:
+
 2007-11-13  Darin Adler  <darin@apple.com>
 
         Reviewed by Geoff.

diff --git a/LayoutTests/http/tests/media/video-load-and-stall.cgi b/LayoutTests/http/tests/media/video-load-and-stall.cgi
new file mode 100755 (executable)
index 0000000..9c2c134
--- /dev/null
+++ b/LayoutTests/http/tests/media/video-load-and-stall.cgi
@@ -0,0 +1,26 @@
+#!/usr/bin/perl -w
+
+use CGI;
+use File::stat;
+
+$query = new CGI;
+$name = $query->param('name');
+$stallAt = $query->param('stallAt');
+
+my $filesize = stat($name)->size;
+print "Content-type: video/mp4\n"; 
+print "Content-Length: " . $filesize . "\n\n";
+
+open FILE, $name or die;
+binmode FILE;
+$total = 0;
+my ($buf, $data, $n);
+while (($n = read FILE, $data, 1024) != 0) {
+    $total += $n;
+    if ($total > $stallAt) {
+        close(FILE);
+        return;
+    }
+    print $data;
+}
+close(FILE);

diff --git a/LayoutTests/http/tests/media/video-play-stall-expected.txt b/LayoutTests/http/tests/media/video-play-stall-expected.txt
new file mode 100644 (file)
index 0000000..7ddb9cb
--- /dev/null
+++ b/LayoutTests/http/tests/media/video-play-stall-expected.txt
@@ -0,0 +1,12 @@
+Test that dataunavailable, timeupdate and waiting events are sent when media load stalls in the middle.
+
+EVENT(durationchange)
+EVENT(loadedmetadata)
+EVENT(loadedfirstframe)
+EVENT(canshowcurrentframe)
+EVENT(canplay)
+EVENT(dataunavailable)
+EVENT(timeupdate)
+EVENT(waiting)
+END OF TEST
+

diff --git a/LayoutTests/http/tests/media/video-play-stall.html b/LayoutTests/http/tests/media/video-play-stall.html
new file mode 100644 (file)
index 0000000..4db5129
--- /dev/null
+++ b/LayoutTests/http/tests/media/video-play-stall.html
@@ -0,0 +1,15 @@
+<video src="http://127.0.0.1:8000/media/video-load-and-stall.cgi?name=../../../media/content/test.mp4&stallAt=80000"></video>
+<p>Test that dataunavailable, timeupdate and waiting events are sent when media load stalls in the middle.</p>
+<script src=../../../media/video-test.js></script>
+<script>
+waitForEvent('durationchange');
+waitForEvent('loadedmetadata');
+waitForEvent('loadedfirstframe');
+waitForEvent('canshowcurrentframe');
+waitForEvent('canplay', function () {
+    waitForEvent('dataunavailable');
+    waitForEvent('timeupdate');
+    waitForEventAndEnd('waiting');
+} );
+video.play();
+</script>

diff --git a/LayoutTests/media/video-autoplay.html b/LayoutTests/media/video-autoplay.html
index b52710f6b380318a3317e102c345690d5746e029..d0f6eb74b8144850023cd7fdfb3b2515de446312 100644 (file)
--- a/LayoutTests/media/video-autoplay.html
+++ b/LayoutTests/media/video-autoplay.html
@@ -1,7 +1,8 @@
-<video src=content/test.mp4 autoplay></video>
+<video autoplay></video>
 <script src=video-test.js></script>
 <script>
 test("video.autoplay");
 test("video.getAttribute('autoplay') != null");
 waitForEventTestAndEnd('play', "!video.paused");
+video.src = "content/test.mp4";
 </script>

diff --git a/LayoutTests/media/video-dom-loopstart.html b/LayoutTests/media/video-dom-loopstart.html
index 2d21195d13f62c480e8f7a8f53b28da5b7aca812..5cd54e1d53ea0047c689626c8864f71e510a438e 100644 (file)
--- a/LayoutTests/media/video-dom-loopstart.html
+++ b/LayoutTests/media/video-dom-loopstart.html
@@ -1,4 +1,4 @@
-<video src=content/test.mp4 loopcount=2 autoplay></video>
+<video src=content/test.mp4 loopcount=2></video>
 <script src=video-test.js></script>
 <script>
 video.loopStart = 1.0;
@@ -6,4 +6,5 @@ test("video.loopStart==1.0");
 test("video.getAttribute('loopstart') == '1s'");
 waitForEvent('play', function () { video.currentTime = 500; });
 waitForEventTestAndEnd('timeupdate', "video.currentTime.toFixed(1) && video.currentLoop==1");
+video.play();
 </script>

diff --git a/LayoutTests/media/video-end.html b/LayoutTests/media/video-end.html
index d9874f964237cb0d85a10ae42df3a1caaca7576b..1f8d4e6da539f66971367801c3c86b935a3d8a7e 100644 (file)
--- a/LayoutTests/media/video-end.html
+++ b/LayoutTests/media/video-end.html
@@ -1,4 +1,4 @@
-<video autoplay src=content/test.mp4 end=0.5s></video>
+<video src=content/test.mp4 end=0.5s></video>
 <script src=video-test.js></script>
 <script>
 test("!video.ended");
@@ -11,4 +11,5 @@ waitForEvent('ended',
         endTest();
     }
 );
+video.play();
 </script>

diff --git a/LayoutTests/media/video-loopcount.html b/LayoutTests/media/video-loopcount.html
index 48820c1fedff62e2ecf9282fd1adca9d149126d8..aedc9508c495f316044f6df9c6922a8145b19014 100644 (file)
--- a/LayoutTests/media/video-loopcount.html
+++ b/LayoutTests/media/video-loopcount.html
@@ -1,7 +1,8 @@
-<video src=content/test.mp4 loopcount=2 loopend=0.2s end=0.2s autoplay></video>
+<video src=content/test.mp4 loopcount=2 loopend=0.2s end=0.2s></video>
 <script src=video-test.js></script>
 <script>
 test("video.loopCount == 2");
 test("video.currentLoop == 0");
 waitForEventTestAndEnd('ended', "video.currentLoop == 1");
+video.play();
 </script>

diff --git a/LayoutTests/media/video-loopend.html b/LayoutTests/media/video-loopend.html
index ef99976bb989295adc3cfe9de4bcb5209228ecda..00cfeb10f3ad8d0740f36d34beef6ddddb2ecd29 100644 (file)
--- a/LayoutTests/media/video-loopend.html
+++ b/LayoutTests/media/video-loopend.html
@@ -1,8 +1,9 @@
-<video src=content/test.mp4 loopcount=2 autoplay></video>
+<video src=content/test.mp4 loopcount=2></video>
 <script src=video-test.js></script>
 <script>
 video.loopEnd = 0.5;
 test("video.loopEnd==0.5");
 setTimeout(function () { test("video.currentTime<=0.5"); }, 2000);
 waitForEventTestAndEnd('timeupdate', "video.currentTime.toFixed(1) == 0 && video.currentLoop==1");
+video.play();
 </script>

diff --git a/LayoutTests/media/video-loopstart.html b/LayoutTests/media/video-loopstart.html
index 2aff30b8e85a8ef0f38edef53d1ffcbee545438a..7134f1064f133532ecbe0c44849b13833cd05b03 100644 (file)
--- a/LayoutTests/media/video-loopstart.html
+++ b/LayoutTests/media/video-loopstart.html
@@ -1,7 +1,8 @@
-<video src=content/test.mp4 loopcount=2 loopstart=1s autoplay></video>
+<video src=content/test.mp4 loopcount=2 loopstart=1s></video>
 <script src=video-test.js></script>
 <script>
 test("video.loopStart==1.0");
 waitForEvent('play', function () { video.currentTime = 500; });
 waitForEventTestAndEnd('timeupdate', "video.currentTime.toFixed(1) == 1.0 && video.currentLoop==1");
+video.play();
 </script>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5b4f53e033634d9855efa3cde735dbfec560611..e1c9ea3cfd9ee0abc1d42be7aeb50665d68dc675 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2007-11-12  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Adele.
+
+        Fix that 'timeupdate' and 'waiting' events were never dispatched.
+        
+        Add explicit m_paused attribute instead of trying to derive paused state from
+        underlying media. Call updatePlayState() to start/stop media playback
+        when any attribute that affects active playback state changes. This matches 
+        specification text.
+        
+        Test: http/tests/media/video-play-stall.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement):
+        (WebCore::HTMLMediaElement::setReadyState):
+        (WebCore::HTMLMediaElement::paused):
+        (WebCore::HTMLMediaElement::play):
+        (WebCore::HTMLMediaElement::pause):
+        (WebCore::HTMLMediaElement::checkIfSeekNeeded):
+        (WebCore::HTMLMediaElement::movieDidEnd):
+        (WebCore::HTMLMediaElement::updatePlayState):
+        * html/HTMLMediaElement.h:
+
 2007-11-13  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp
index d621a9300f2bfe676e214fe2e517a690674b3136..b1059b9089a4d662d0e37b77b384d3789a612190 100644 (file)
--- a/WebCore/html/HTMLMediaElement.cpp
+++ b/WebCore/html/HTMLMediaElement.cpp
@@ -71,6 +71,7 @@ HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document* doc)
     , m_currentLoop(0)
     , m_volume(0.5f)
     , m_muted(false)
+    , m_paused(true)
     , m_previousProgress(0)
     , m_previousProgressTime(numeric_limits<double>::max())
     , m_sentStalledEvent(false)
@@ -259,6 +260,7 @@ void HTMLMediaElement::load(ExceptionCode& ec)
     if (networkState() != EMPTY) {
         m_networkState = EMPTY;
         m_readyState = DATA_UNAVAILABLE;
+        m_paused = true;
         if (m_movie) {
             m_movie->pause();
             m_movie->seek(0);
@@ -435,11 +437,12 @@ void HTMLMediaElement::setReadyState(ReadyState state)
         dispatchHTMLEvent(canplayEvent, false, true);
     } else if (state == CAN_PLAY_THROUGH) {
         dispatchHTMLEvent(canplaythroughEvent, false, true);
-        if (m_autoplaying && paused() && autoplay()) {
-            m_movie->play();
+        if (m_autoplaying && m_paused && autoplay()) {
+            m_paused = false;
             dispatchHTMLEvent(playEvent, false, true);
         }
     }
+    updatePlayState();
 }
 
 void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)
@@ -545,7 +548,7 @@ float HTMLMediaElement::duration() const
 
 bool HTMLMediaElement::paused() const
 {
-    return m_movie ? m_movie->paused() : true;
+    return m_paused;
 }
 
 float HTMLMediaElement::defaultPlaybackRate() const
@@ -613,8 +616,9 @@ void HTMLMediaElement::play(ExceptionCode& ec)
     }
     setPlaybackRate(defaultPlaybackRate(), unused);
     
-    if (m_movie->paused()) {
-        m_movie->play();
+    if (m_paused) {
+        m_paused = false;
+        updatePlayState();
         dispatchEventAsync(playEvent);
     }
 
@@ -631,8 +635,9 @@ void HTMLMediaElement::pause(ExceptionCode& ec)
             return;
     }
 
-    if (!m_movie->paused()) {
-        m_movie->pause();
+    if (!m_paused) {
+        m_paused = true;
+        updatePlayState();
         dispatchEventAsync(timeupdateEvent);
         dispatchEventAsync(pauseEvent);
     }
@@ -818,6 +823,8 @@ void HTMLMediaElement::checkIfSeekNeeded()
     // 6
     if (m_currentLoop == loopCount() - 1 && time > effectiveEnd())
         seek(effectiveEnd(), ec);
+
+    updatePlayState();
 }
 
 void HTMLMediaElement::movieVolumeChanged(Movie*)
@@ -837,8 +844,7 @@ void HTMLMediaElement::movieDidEnd(Movie*)
         m_movie->seek(effectiveLoopStart());
         m_currentLoop++;
         m_movie->setEndTime(m_currentLoop == loopCount() - 1 ? effectiveEnd() : effectiveLoopEnd());
-        if (m_movie)
-            m_movie->play();
+        updatePlayState();
         dispatchHTMLEvent(timeupdateEvent, false, true);
     }
     
@@ -967,6 +973,17 @@ bool HTMLMediaElement::endedPlayback() const
     return networkState() >= LOADED_METADATA && currentTime() >= effectiveEnd() && currentLoop() == loopCount() - 1;
 }
 
+void HTMLMediaElement::updatePlayState()
+{
+    if (!m_movie)
+        return;
+    bool shouldBePlaying = activelyPlaying();
+    if (shouldBePlaying && m_movie->paused())
+        m_movie->play();
+    else if (!shouldBePlaying && !m_movie->paused())
+        m_movie->pause();
+}
+    
 void HTMLMediaElement::willSaveToCache()
 {
     // 3.14.9.4. Loading the media resource

diff --git a/WebCore/html/HTMLMediaElement.h b/WebCore/html/HTMLMediaElement.h
index d7bec748f3a54d4838a51b54575054ffb8a7079b..656041c7d55dc0b6e3443f37d8a347262e1267b6 100644 (file)
--- a/WebCore/html/HTMLMediaElement.h
+++ b/WebCore/html/HTMLMediaElement.h
@@ -152,6 +152,7 @@ private:
     void checkIfSeekNeeded();
     
     String pickMedia();
+    void updatePlayState();
     float effectiveStart() const;
     float effectiveEnd() const;
     float effectiveLoopStart() const;
@@ -182,6 +183,7 @@ protected:
     float m_volume;
     bool m_muted;
     
+    bool m_paused;
     bool m_seeking;
     
     unsigned m_previousProgress;