Changeset 127675 in webkit

Timestamp:

Sep 5, 2012 6:58:35 PM (12 years ago)

Author:

vrk@chromium.org

Message:

Add the duration attribute to MediaSource
​https://bugs.webkit.org/show_bug.cgi?id=95149

Reviewed by Eric Carlson.

Add support for the duration attribute recently added to the MediaSource spec.
​http://dev.w3.org/html5/spec/media-elements.html#dom-media-duration

Source/WebCore:

Test: http/tests/media/media-source/video-media-source-duration-changed.html

• Modules/mediasource/MediaSource.cpp:

(WebCore::MediaSource::duration): Added duration method.
(WebCore):
(WebCore::MediaSource::setDuration): Added duration setter.

• Modules/mediasource/MediaSource.h:

(MediaSource):

• Modules/mediasource/MediaSource.idl:
• platform/graphics/MediaPlayer.cpp:

(WebCore::NullMediaPlayerPrivate::sourceSetDuration): Add empty definition.
(WebCore::MediaPlayer::sourceSetDuration): Forward call to m_private.
(WebCore):

• platform/graphics/MediaPlayer.h:
• platform/graphics/MediaPlayerPrivate.h:

(WebCore::MediaPlayerPrivateInterface::sourceSetDuration): Add empty definition.

Source/WebKit/chromium:

• public/WebMediaPlayer.h:

(WebKit::WebMediaPlayer::sourceSetDuration): Add empty definition.

• src/WebMediaPlayerClientImpl.cpp:

(WebKit::WebMediaPlayerClientImpl::sourceSetDuration): Forward call to m_webMediaPlayer.
(WebKit):

• src/WebMediaPlayerClientImpl.h:

(WebMediaPlayerClientImpl):

LayoutTests:

• http/tests/media/media-source/media-source.js:

(MediaSourceTest.SegmentHelper): Add parameter to specify whether full file should be loaded.
(MediaSourceTest.SegmentHelper.prototype.appendAllMediaSegments): Added method to append all file segments.
(MediaSourceTest.roundedEquals_): Added to see if values are equivalent after rounding.
(MediaSourceTest.expectDuration): Added to check for expected duration.
(MediaSourceTest.expectBufferedRange): Added to check for the expected buffered attribute value.

• http/tests/media/media-source/video-media-source-duration-changed-expected.txt: Added.
• http/tests/media/media-source/video-media-source-duration-changed.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/media-source/media-source.js (modified) (4 diffs)
• LayoutTests/http/tests/media/media-source/video-media-source-duration-changed-expected.txt (added)
• LayoutTests/http/tests/media/media-source/video-media-source-duration-changed.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasource/MediaSource.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediasource/MediaSource.h (modified) (1 diff)
• Source/WebCore/Modules/mediasource/MediaSource.idl (modified) (1 diff)
• Source/WebCore/platform/graphics/MediaPlayer.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/MediaPlayer.h (modified) (1 diff)
• Source/WebCore/platform/graphics/MediaPlayerPrivate.h (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebMediaPlayer.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-05  Victoria Kirst  <vrk@chromium.org>
+
+        Add the duration attribute to MediaSource
+        https://bugs.webkit.org/show_bug.cgi?id=95149
+
+        Reviewed by Eric Carlson.
+
+        Add support for the duration attribute recently added to the MediaSource spec.
+        http://dev.w3.org/html5/spec/media-elements.html#dom-media-duration
+
+        * http/tests/media/media-source/media-source.js:
+        (MediaSourceTest.SegmentHelper): Add parameter to specify whether full file should be loaded.
+        (MediaSourceTest.SegmentHelper.prototype.appendAllMediaSegments): Added method to append all file segments.
+        (MediaSourceTest.roundedEquals_): Added to see if values are equivalent after rounding.
+        (MediaSourceTest.expectDuration): Added to check for expected duration.
+        (MediaSourceTest.expectBufferedRange): Added to check for the expected buffered attribute value.
+        * http/tests/media/media-source/video-media-source-duration-changed-expected.txt: Added.
+        * http/tests/media/media-source/video-media-source-duration-changed.html: Added.
+
 2012-09-05  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/LayoutTests/http/tests/media/media-source/media-source.js

@@ -2 +2 @@
 var mediaSource = new WebKitMediaSource();
 
-MediaSourceTest.SegmentHelper = function(segmentInfo)
+MediaSourceTest.SegmentHelper = function(segmentInfo, fullDuration)
 {
     this.MediaSegmentsToLoad = 0;
@@ -15 +15 @@
     var maxDuration = 3;
     for (var i in this.segmentInfo.media) {
-        if (this.segmentInfo.media[i].timecode > maxDuration)
+        if (!fullDuration && this.segmentInfo.media[i].timecode > maxDuration)
             break;
         this.MediaSegmentsToLoad++;
@@ -138 +138 @@
 };
 
+MediaSourceTest.SegmentHelper.prototype.appendAllMediaSegments = function()
+{
+    for (var i = 0; i < this.mediaSegments.length; i++)
+        this.appendMediaSegment(i);
+};
+
 MediaSourceTest.SegmentHelper.prototype.appendUntilEndOfStream = function(startIndex)
 {
@@ -309 +315 @@
 };
 
+MediaSourceTest.roundedEquals_ = function(expected, actual)
+{
+    return expected.toFixed(3) == actual.toFixed(3);
+};
+
+MediaSourceTest.expectDuration = function(videoTag, mediaSource, expected)
+{
+    if (!this.roundedEquals_(expected, videoTag.duration))
+        failTest("Unexpected duration. Expected " + expected + " got " + videoTag.duration);
+    if (!this.roundedEquals_(expected, mediaSource.duration))
+        failTest("Unexpected duration. Expected " + expected + " got " + mediaSource.duration);
+};
+
+MediaSourceTest.expectBufferedRange = function(sourceBuffer, expected)
+{
+    if (sourceBuffer.buffered.length != expected.length)
+        failTest("Unexpected number of buffered regions. Expected " + expected.length + " got " + sourceBuffer.buffered.length);
+
+    for (var i = 0; i < expected.length; i++) {
+        var expectedStart = expected[i][0];
+        var expectedEnd = expected[i][1];
+        var actualStart = sourceBuffer.buffered.start(i);
+        var actualEnd = sourceBuffer.buffered.end(i);
+        if (!this.roundedEquals_(expectedStart, actualStart) ||
+            !this.roundedEquals_(expectedEnd, actualEnd)) {
+            failTest("Unexpected buffered region. Expected (" + expectedStart + ", " + expectedEnd + ") got ("
+                     + actualStart + ", " + actualEnd +")");
+        }
+    }
+};
+
 MediaSourceTest.getReadyStateName = function(state)
 {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-05  Victoria Kirst  <vrk@chromium.org>
+
+        Add the duration attribute to MediaSource
+        https://bugs.webkit.org/show_bug.cgi?id=95149
+
+        Reviewed by Eric Carlson.
+
+        Add support for the duration attribute recently added to the MediaSource spec.
+        http://dev.w3.org/html5/spec/media-elements.html#dom-media-duration
+
+        Test: http/tests/media/media-source/video-media-source-duration-changed.html
+
+        * Modules/mediasource/MediaSource.cpp:
+        (WebCore::MediaSource::duration): Added duration method.
+        (WebCore):
+        (WebCore::MediaSource::setDuration): Added duration setter.
+        * Modules/mediasource/MediaSource.h:
+        (MediaSource):
+        * Modules/mediasource/MediaSource.idl:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::NullMediaPlayerPrivate::sourceSetDuration): Add empty definition.
+        (WebCore::MediaPlayer::sourceSetDuration): Forward call to m_private.
+        (WebCore):
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::sourceSetDuration): Add empty definition.
+
 2012-09-05  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp

@@ -85 +85 @@
 }
 
+double MediaSource::duration() const
+{
+    return m_readyState == closedKeyword() ? std::numeric_limits<float>::quiet_NaN() : m_player->duration();
+}
+
+void MediaSource::setDuration(double duration, ExceptionCode& ec)
+{
+    if (duration < 0.0 || isnan(duration)) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+    if (m_readyState != openKeyword()) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+    m_player->sourceSetDuration(duration);
+}
+
 SourceBuffer* MediaSource::addSourceBuffer(const String& type, ExceptionCode& ec)
 {

trunk/Source/WebCore/Modules/mediasource/MediaSource.h

@@ -55 +55 @@
     SourceBufferList* activeSourceBuffers();
 
+    double duration() const;
+    void setDuration(double, ExceptionCode&);
+
     SourceBuffer* addSourceBuffer(const String& type, ExceptionCode&);
     void removeSourceBuffer(SourceBuffer*, ExceptionCode&);

trunk/Source/WebCore/Modules/mediasource/MediaSource.idl

@@ -44 +44 @@
         readonly attribute SourceBufferList activeSourceBuffers;
 
+        attribute double duration setter raises (DOMException);
+
         SourceBuffer addSourceBuffer(in DOMString type) raises (DOMException);
         void removeSourceBuffer(in SourceBuffer buffer) raises (DOMException);

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -155 +155 @@
     virtual bool sourceAppend(const String&, const unsigned char*, unsigned) { return false; }
     virtual bool sourceAbort(const String&) { return false; }
+    virtual void sourceSetDuration(double) { }
     virtual void sourceEndOfStream(MediaPlayer::EndOfStreamStatus) { }
     virtual bool sourceSetTimestampOffset(const String&, double) { return false; }
@@ -491 +492 @@
 }
 
+void MediaPlayer::sourceSetDuration(double duration)
+{
+    m_private->sourceSetDuration(duration);
+}
+
 void MediaPlayer::sourceEndOfStream(MediaPlayer::EndOfStreamStatus status)
 {

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -267 +267 @@
     PassRefPtr<TimeRanges> sourceBuffered(const String& id);
     bool sourceAppend(const String& id, const unsigned char* data, unsigned length);
+    void sourceSetDuration(double);
     bool sourceAbort(const String& id);
     enum EndOfStreamStatus { EosNoError, EosNetworkError, EosDecodeError };

trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

@@ -174 +174 @@
     virtual bool sourceAppend(const String& id, const unsigned char* data, unsigned length) { return false; }
     virtual bool sourceAbort(const String& id) { return false; }
+    virtual void sourceSetDuration(double) { }
     virtual void sourceEndOfStream(MediaPlayer::EndOfStreamStatus) { };
     virtual bool sourceSetTimestampOffset(const String& id, double offset) { return false; }

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-05  Victoria Kirst  <vrk@chromium.org>
+
+        Add the duration attribute to MediaSource
+        https://bugs.webkit.org/show_bug.cgi?id=95149
+
+        Reviewed by Eric Carlson.
+
+        Add support for the duration attribute recently added to the MediaSource spec.
+        http://dev.w3.org/html5/spec/media-elements.html#dom-media-duration
+
+        * public/WebMediaPlayer.h:
+        (WebKit::WebMediaPlayer::sourceSetDuration): Add empty definition.
+        * src/WebMediaPlayerClientImpl.cpp:
+        (WebKit::WebMediaPlayerClientImpl::sourceSetDuration): Forward call to m_webMediaPlayer.
+        (WebKit):
+        * src/WebMediaPlayerClientImpl.h:
+        (WebMediaPlayerClientImpl):
+
 2012-09-05  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebMediaPlayer.h

@@ -187 +187 @@
     virtual bool sourceAppend(const WebString& id, const unsigned char* data, unsigned length) { return false; }
     virtual bool sourceAbort(const WebString& id) { return false; }
+    virtual void sourceSetDuration(double) { }
     virtual void sourceEndOfStream(EndOfStreamStatus)  { }
     virtual bool sourceSetTimestampOffset(const WebString& id, double offset) { return false; }

trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

@@ -444 +444 @@
 }
 
+void WebMediaPlayerClientImpl::sourceSetDuration(double duration)
+{
+    if (m_webMediaPlayer)
+        m_webMediaPlayer->sourceSetDuration(duration);
+}
+
 void WebMediaPlayerClientImpl::sourceEndOfStream(WebCore::MediaPlayer::EndOfStreamStatus status)
 {

trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

@@ -164 +164 @@
     virtual bool sourceAppend(const String&, const unsigned char* data, unsigned length);
     virtual bool sourceAbort(const String&);
+    virtual void sourceSetDuration(double);
     virtual void sourceEndOfStream(WebCore::MediaPlayer::EndOfStreamStatus);
     virtual bool sourceSetTimestampOffset(const String&, double offset);