<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191909] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191909">191909</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 13:49:14 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add HTMLMediaElement behavior and attribute value restrictions for MediaStream
https://bugs.webkit.org/show_bug.cgi?id=146853
Reviewed by Jer Noble.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::scheduleActiveStateChange): Do nothing if the active state hasn't changed.
(WebCore::MediaStream::activityEventTimerFired): Remove FIXME.
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::stopProducingData): Add comments. Notify observers that the track ended.
(WebCore::MediaStreamTrack::trackEnded): Don't dispatch events after having been stopped.
(WebCore::MediaStreamTrack::trackMutedChanged): Ditto.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::defaultPlaybackRate): Always return 1 when using a MediaStream.
(WebCore::HTMLMediaElement::setDefaultPlaybackRate): Do nothing when using a MediaStream.
(WebCore::HTMLMediaElement::playbackRate): Always return 1 when using a MediaStream.
(WebCore::HTMLMediaElement::setPlaybackRate): Do nothing when using a MediaStream.
(WebCore::HTMLMediaElement::ended): Ask the media engine when using a MediaStream.
(WebCore::HTMLMediaElement::preload): Always return "none" when using a MediaStream.
(WebCore::HTMLMediaElement::setPreload): Do nothing when using a MediaStream.
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged): Avoid unnecessary comparisons when the duration
is not definite. Send ended event when MediaStream says stream has ended.
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::ended): New, passthrough to engine.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Set m_ended from stream.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::cancelLoad): Pause the stream if necessary.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::play): Return early if ended or already playing.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::pause): Return early if ended or already paused.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentReadyState): Cleanup. Try to grab a paused
image if the stream isn't active.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateReadyState): New.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::activeStatusChanged): Call updateReadyState.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::characteristicsChanged): Ditto.
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::trackEnabledChanged): Call updateActiveState so the state will
be updated if necessary.
* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::stop): Don't call reset, there is no need to tear everything down.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/ChangeLog 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2015-11-02 Eric Carlson <eric.carlson@apple.com>
+
+ Add HTMLMediaElement behavior and attribute value restrictions for MediaStream
+ https://bugs.webkit.org/show_bug.cgi?id=146853
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::scheduleActiveStateChange): Do nothing if the active state hasn't changed.
+ (WebCore::MediaStream::activityEventTimerFired): Remove FIXME.
+
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::stopProducingData): Add comments. Notify observers that the track ended.
+ (WebCore::MediaStreamTrack::trackEnded): Don't dispatch events after having been stopped.
+ (WebCore::MediaStreamTrack::trackMutedChanged): Ditto.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::defaultPlaybackRate): Always return 1 when using a MediaStream.
+ (WebCore::HTMLMediaElement::setDefaultPlaybackRate): Do nothing when using a MediaStream.
+ (WebCore::HTMLMediaElement::playbackRate): Always return 1 when using a MediaStream.
+ (WebCore::HTMLMediaElement::setPlaybackRate): Do nothing when using a MediaStream.
+ (WebCore::HTMLMediaElement::ended): Ask the media engine when using a MediaStream.
+ (WebCore::HTMLMediaElement::preload): Always return "none" when using a MediaStream.
+ (WebCore::HTMLMediaElement::setPreload): Do nothing when using a MediaStream.
+ (WebCore::HTMLMediaElement::mediaPlayerTimeChanged): Avoid unnecessary comparisons when the duration
+ is not definite. Send ended event when MediaStream says stream has ended.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::ended): New, passthrough to engine.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Set m_ended from stream.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::cancelLoad): Pause the stream if necessary.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::play): Return early if ended or already playing.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::pause): Return early if ended or already paused.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentReadyState): Cleanup. Try to grab a paused
+ image if the stream isn't active.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateReadyState): New.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::activeStatusChanged): Call updateReadyState.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::characteristicsChanged): Ditto.
+
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::trackEnabledChanged): Call updateActiveState so the state will
+ be updated if necessary.
+
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::stop): Don't call reset, there is no need to tear everything down.
+
</ins><span class="cx"> 2015-10-31 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace iOS-only WebKitSystemInterface calls with SPI
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -278,6 +278,18 @@
</span><span class="cx">
</span><span class="cx"> void MediaStream::scheduleActiveStateChange()
</span><span class="cx"> {
</span><ins>+ bool active = false;
+ for (auto& track : m_trackSet.values()) {
+ if (!track->ended()) {
+ active = true;
+ break;
+ }
+ }
+ if (m_isActive == active)
+ return;
+
+ m_isActive = active;
+
</ins><span class="cx"> const AtomicString& eventName = m_isActive ? eventNames().inactiveEvent : eventNames().activeEvent;
</span><span class="cx"> m_scheduledActivityEvents.append(Event::create(eventName, false, false));
</span><span class="cx">
</span><span class="lines">@@ -290,11 +302,8 @@
</span><span class="cx"> Vector<RefPtr<Event>> events;
</span><span class="cx"> events.swap(m_scheduledActivityEvents);
</span><span class="cx">
</span><del>- for (auto& event : events) {
- // FIXME: This can't be right, the event type is set from m_isActive in scheduleActiveStateChange! - https://webkit.org/b/150635
- m_isActive = event->type() == eventNames().activeEvent;
</del><ins>+ for (auto& event : events)
</ins><span class="cx"> dispatchEvent(event.release());
</span><del>- }
</del><span class="cx">
</span><span class="cx"> events.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "MediaStreamPrivate.h"
</span><span class="cx"> #include "MediaTrackConstraints.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><ins>+#include "ScriptExecutionContext.h"
</ins><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -136,10 +137,23 @@
</span><span class="cx"> // the "ImplementedAs" IDL attribute. This is done because ActiveDOMObject requires
</span><span class="cx"> // a "stop" method.
</span><span class="cx">
</span><ins>+ // http://w3c.github.io/mediacapture-main/#widl-MediaStreamTrack-stop-void
+ // 4.3.3.2 Methods
+ // When a MediaStreamTrack object's stop() method is invoked, the User Agent must run following steps:
+ // 1. Let track be the current MediaStreamTrack object.
+ // 2. If track is sourced by a non-local source, then abort these steps.
</ins><span class="cx"> if (remote() || ended())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // 3. Notify track's source that track is ended so that the source may be stopped, unless other
+ // MediaStreamTrack objects depend on it.
+ // 4. Set track's readyState attribute to ended.
</ins><span class="cx"> m_private->endTrack();
</span><ins>+
+ // MediaStreamPrivate::endTrack will not result in a call to MediaStreamTrack::trackEnded, so
+ // notify observers now or they won't know about the change.
+ for (auto& observer : m_observers)
+ observer->trackDidEnd();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaTrackConstraints> MediaStreamTrack::getConstraints() const
</span><span class="lines">@@ -192,6 +206,9 @@
</span><span class="cx">
</span><span class="cx"> void MediaStreamTrack::trackEnded(MediaStreamTrackPrivate&)
</span><span class="cx"> {
</span><ins>+ if (scriptExecutionContext()->activeDOMObjectsAreSuspended() || scriptExecutionContext()->activeDOMObjectsAreStopped())
+ return;
+
</ins><span class="cx"> dispatchEvent(Event::create(eventNames().endedEvent, false, false));
</span><span class="cx">
</span><span class="cx"> for (auto& observer : m_observers)
</span><span class="lines">@@ -202,6 +219,9 @@
</span><span class="cx">
</span><span class="cx"> void MediaStreamTrack::trackMutedChanged(MediaStreamTrackPrivate&)
</span><span class="cx"> {
</span><ins>+ if (scriptExecutionContext()->activeDOMObjectsAreSuspended() || scriptExecutionContext()->activeDOMObjectsAreStopped())
+ return;
+
</ins><span class="cx"> AtomicString eventType = muted() ? eventNames().muteEvent : eventNames().unmuteEvent;
</span><span class="cx"> dispatchEvent(Event::create(eventType, false, false));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -2793,11 +2793,31 @@
</span><span class="cx">
</span><span class="cx"> double HTMLMediaElement::defaultPlaybackRate() const
</span><span class="cx"> {
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+ // "defaultPlaybackRate" - On setting: ignored. On getting: return 1.0
+ // A MediaStream is not seekable. Therefore, this attribute must always have the
+ // value 1.0 and any attempt to alter it must be ignored. Note that this also means
+ // that the ratechange event will not fire.
+ if (m_mediaStreamSrcObject)
+ return 1;
+#endif
+
</ins><span class="cx"> return m_defaultPlaybackRate;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setDefaultPlaybackRate(double rate)
</span><span class="cx"> {
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+ // "defaultPlaybackRate" - On setting: ignored. On getting: return 1.0
+ // A MediaStream is not seekable. Therefore, this attribute must always have the
+ // value 1.0 and any attempt to alter it must be ignored. Note that this also means
+ // that the ratechange event will not fire.
+ if (m_mediaStreamSrcObject)
+ return;
+#endif
+
</ins><span class="cx"> if (m_defaultPlaybackRate != rate) {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::setDefaultPlaybackRate(%p) - %f", this, rate);
</span><span class="cx"> m_defaultPlaybackRate = rate;
</span><span class="lines">@@ -2817,6 +2837,15 @@
</span><span class="cx">
</span><span class="cx"> double HTMLMediaElement::playbackRate() const
</span><span class="cx"> {
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+ // "playbackRate" - A MediaStream is not seekable. Therefore, this attribute must always
+ // have the value 1.0 and any attempt to alter it must be ignored. Note that this also
+ // means that the ratechange event will not fire.
+ if (m_mediaStreamSrcObject)
+ return 1;
+#endif
+
</ins><span class="cx"> return m_requestedPlaybackRate;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2824,6 +2853,15 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::setPlaybackRate(%p) - %f", this, rate);
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+ // "playbackRate" - A MediaStream is not seekable. Therefore, this attribute must always
+ // have the value 1.0 and any attempt to alter it must be ignored. Note that this also
+ // means that the ratechange event will not fire.
+ if (m_mediaStreamSrcObject)
+ return;
+#endif
+
</ins><span class="cx"> if (m_player && potentiallyPlaying() && m_player->rate() != rate && !m_mediaController)
</span><span class="cx"> m_player->setRate(rate);
</span><span class="cx">
</span><span class="lines">@@ -2860,6 +2898,14 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::ended() const
</span><span class="cx"> {
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+ // When the MediaStream state moves from the active to the inactive state, the User Agent
+ // must raise an ended event on the HTMLMediaElement and set its ended attribute to true.
+ if (m_mediaStreamSrcObject && m_player && m_player->ended())
+ return true;
+#endif
+
</ins><span class="cx"> // 4.8.10.8 Playing the media resource
</span><span class="cx"> // The ended attribute must return true if the media element has ended
</span><span class="cx"> // playback and the direction of playback is forwards, and false otherwise.
</span><span class="lines">@@ -2873,6 +2919,13 @@
</span><span class="cx">
</span><span class="cx"> String HTMLMediaElement::preload() const
</span><span class="cx"> {
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+ // "preload" - On getting: none. On setting: ignored.
+ if (m_mediaStreamSrcObject)
+ return ASCIILiteral("none");
+#endif
+
</ins><span class="cx"> switch (m_preload) {
</span><span class="cx"> case MediaPlayer::None:
</span><span class="cx"> return ASCIILiteral("none");
</span><span class="lines">@@ -2889,6 +2942,13 @@
</span><span class="cx"> void HTMLMediaElement::setPreload(const String& preload)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaElement::setPreload(%p) - %s", this, preload.utf8().data());
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+ // "preload" - On getting: none. On setting: ignored.
+ if (m_mediaStreamSrcObject)
+ return;
+#endif
+
</ins><span class="cx"> setAttribute(preloadAttr, preload);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4231,9 +4291,9 @@
</span><span class="cx"> MediaTime now = currentMediaTime();
</span><span class="cx"> MediaTime dur = durationMediaTime();
</span><span class="cx"> double playbackRate = requestedPlaybackRate();
</span><del>-
</del><ins>+
</ins><span class="cx"> // When the current playback position reaches the end of the media resource then the user agent must follow these steps:
</span><del>- if (dur.isValid() && dur) {
</del><ins>+ if (dur && dur.isValid() && !dur.isIndefinite()) {
</ins><span class="cx"> // If the media element has a loop attribute specified and does not have a current media controller,
</span><span class="cx"> if (loop() && !m_mediaController && playbackRate > 0) {
</span><span class="cx"> m_sentEndEvent = false;
</span><span class="lines">@@ -4261,10 +4321,23 @@
</span><span class="cx"> } else
</span><span class="cx"> m_sentEndEvent = false;
</span><span class="cx"> } else {
</span><del>-#if PLATFORM(IOS)
- // The controller changes movie time directly instead of calling through here so we need
- // to post timeupdate events in response to time changes.
- scheduleTimeupdateEvent(false);
</del><ins>+#if ENABLE(MEDIA_STREAM)
+ if (m_mediaStreamSrcObject) {
+ // http://w3c.github.io/mediacapture-main/#event-mediastream-inactive
+ // 6. MediaStreams in Media Elements
+ // When the MediaStream state moves from the active to the inactive state, the User Agent
+ // must raise an ended event on the HTMLMediaElement and set its ended attribute to true.
+ // Note that once ended equals true the HTMLMediaElement will not play media even if new
+ // MediaStreamTrack's are added to the MediaStream (causing it to return to the active
+ // state) unless autoplay is true or the web application restarts the element, e.g.,
+ // by calling play()
+ if (!m_sentEndEvent && m_player && m_player->ended()) {
+ m_sentEndEvent = true;
+ scheduleEvent(eventNames().endedEvent);
+ m_paused = true;
+ setPlaying(false);
+ }
+ } else
</ins><span class="cx"> #endif
</span><span class="cx"> m_sentEndEvent = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -1338,6 +1338,11 @@
</span><span class="cx"> return m_private->fileSize();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MediaPlayer::ended() const
+{
+ return m_private->ended();
+}
+
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> unsigned long MediaPlayer::totalVideoFrames()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -591,6 +591,8 @@
</span><span class="cx"> String sourceApplicationIdentifier() const;
</span><span class="cx"> Vector<String> preferredAudioCharacteristics() const;
</span><span class="cx">
</span><ins>+ bool ended() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> const MediaPlayerFactory* nextBestMediaEngine(const MediaPlayerFactory*) const;
</span><span class="cx"> void loadWithNextMediaEngine(const MediaPlayerFactory*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -260,6 +260,8 @@
</span><span class="cx">
</span><span class="cx"> virtual unsigned long long fileSize() const { return 0; }
</span><span class="cx">
</span><ins>+ virtual bool ended() const { return false; }
+
</ins><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> virtual unsigned long totalVideoFrames() { return 0; }
</span><span class="cx"> virtual unsigned long droppedVideoFrames() { return 0; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -124,9 +124,12 @@
</span><span class="cx">
</span><span class="cx"> size_t extraMemoryCost() const override { return 0; }
</span><span class="cx">
</span><ins>+ bool ended() const override { return m_ended; }
+
</ins><span class="cx"> bool shouldBePlaying() const;
</span><span class="cx">
</span><span class="cx"> MediaPlayer::ReadyState currentReadyState();
</span><ins>+ void updateReadyState();
</ins><span class="cx">
</span><span class="cx"> enum RenderingModeStatus {
</span><span class="cx"> RenderingModeUnchanged,
</span><span class="lines">@@ -159,6 +162,7 @@
</span><span class="cx"> bool m_muted { false };
</span><span class="cx"> bool m_waitingForNewFrame {false };
</span><span class="cx"> bool m_haveEverPlayed { false };
</span><ins>+ bool m_ended { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -125,18 +125,19 @@
</span><span class="cx"> m_mediaStreamPrivate->startProducingData();
</span><span class="cx">
</span><span class="cx"> m_previewLayer = nullptr;
</span><ins>+ m_ended = !m_mediaStreamPrivate->active();
</ins><span class="cx">
</span><span class="cx"> scheduleDeferredTask([this] {
</span><span class="cx"> setNetworkState(MediaPlayer::Idle);
</span><del>- if (m_readyState < MediaPlayer::ReadyState::HaveMetadata)
- this->setReadyState(MediaPlayer::ReadyState::HaveMetadata);
</del><ins>+ updateReadyState();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::cancelLoad()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::cancelLoad(%p)", this);
</span><del>- pause();
</del><ins>+ if (m_playing)
+ pause();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::prepareToPlay()
</span><span class="lines">@@ -200,19 +201,20 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::play(%p)", this);
</span><span class="cx">
</span><del>- if (!metaDataAvailable())
</del><ins>+ if (!metaDataAvailable() || m_playing || m_ended)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_playing = true;
</span><span class="cx"> m_haveEverPlayed = true;
</span><span class="cx"> setPausedImageVisible(false);
</span><ins>+ updateReadyState();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::pause()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::pause(%p)", this);
</span><span class="cx">
</span><del>- if (!metaDataAvailable())
</del><ins>+ if (!metaDataAvailable() || !m_playing || m_ended)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setPausedImageVisible(true);
</span><span class="lines">@@ -290,23 +292,46 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayer::ReadyState MediaPlayerPrivateMediaStreamAVFObjC::currentReadyState()
</span><span class="cx"> {
</span><del>- if (m_mediaStreamPrivate) {
- if (m_mediaStreamPrivate->active())
- return MediaPlayer::ReadyState::HaveEnoughData;
</del><ins>+ if (!m_mediaStreamPrivate)
+ return MediaPlayer::ReadyState::HaveNothing;
</ins><span class="cx">
</span><del>- return MediaPlayer::ReadyState::HaveCurrentData;
</del><ins>+ if (m_mediaStreamPrivate->active()) {
+ if (!m_haveEverPlayed)
+ return MediaPlayer::ReadyState::HaveFutureData;
+ return MediaPlayer::ReadyState::HaveEnoughData;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return MediaPlayer::ReadyState::HaveNothing;
</del><ins>+ if (!m_pausedImage)
+ setPausedImageVisible(true);
+
+ if (m_pausedImage)
+ return MediaPlayer::ReadyState::HaveCurrentData;
+
+ return MediaPlayer::ReadyState::HaveMetadata;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaStreamAVFObjC::activeStatusChanged()
</del><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::updateReadyState()
</ins><span class="cx"> {
</span><span class="cx"> MediaPlayer::ReadyState newReadyState = currentReadyState();
</span><span class="cx">
</span><del>- scheduleDeferredTask([this, newReadyState] {
- if (newReadyState != m_readyState)
- setReadyState(newReadyState);
</del><ins>+ if (newReadyState != m_readyState)
+ setReadyState(newReadyState);
+}
+
+void MediaPlayerPrivateMediaStreamAVFObjC::activeStatusChanged()
+{
+ scheduleDeferredTask([this] {
+ bool ended = !m_mediaStreamPrivate->active();
+ if (ended && m_playing)
+ pause();
+
+ updateReadyState();
+
+ if (ended != m_ended) {
+ m_ended = ended;
+ if (m_player)
+ m_player->timeChanged();
+ }
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -364,10 +389,8 @@
</span><span class="cx"> if (m_waitingForNewFrame && m_mediaStreamPrivate->isProducingData())
</span><span class="cx"> setPausedImageVisible(false);
</span><span class="cx">
</span><del>- MediaPlayer::ReadyState newReadyState = currentReadyState();
- scheduleDeferredTask([this, sizeChanged, newReadyState, status] {
- if (newReadyState != m_readyState)
- setReadyState(newReadyState);
</del><ins>+ scheduleDeferredTask([this, sizeChanged, status] {
+ updateReadyState();
</ins><span class="cx">
</span><span class="cx"> if (!m_player)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -268,6 +268,7 @@
</span><span class="cx"> void MediaStreamPrivate::trackEnabledChanged(MediaStreamTrackPrivate&)
</span><span class="cx"> {
</span><span class="cx"> scheduleDeferredTask([this] {
</span><ins>+ updateActiveState(NotifyClientOption::Notify);
</ins><span class="cx"> characteristicsChanged();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (191908 => 191909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2015-11-02 21:27:42 UTC (rev 191908)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2015-11-02 21:49:14 UTC (rev 191909)
</span><span class="lines">@@ -135,7 +135,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> stopProducingData();
</span><del>- reset();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSource::requestStop(Observer* callingObserver)
</span></span></pre>
</div>
</div>
</body>
</html>