Changeset 157733 in webkit

Timestamp:

Oct 21, 2013 2:14:37 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

MediaStreamTrack now tracks its own state
​https://bugs.webkit.org/show_bug.cgi?id=123025

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> on 2013-10-21
Reviewed by Jer Noble.

The spec says that a MediaStreamSource can be shared by different tracks,
so a track must have its own state tracking, synchronizing with its MediaStreamSource when
the underlying MediaStreamSource changes the readyState.
In the old implementation if a user invoked the stop method, its readyState method was still
returning the MediaStreamSource state, which was wrong.
This also adds a setEnabled method, which can be used to set the state of a track when a
remote peer ends it, for instance.

No new tests needed.

• Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::readyState):
(WebCore::MediaStreamTrack::setState):
(WebCore::MediaStreamTrack::stopProducingData):
(WebCore::MediaStreamTrack::ended):
(WebCore::MediaStreamTrack::sourceStateChanged):
(WebCore::MediaStreamTrack::trackDidEnd):

• Modules/mediastream/MediaStreamTrack.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.cpp (modified) (5 diffs)
• Modules/mediastream/MediaStreamTrack.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-21  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        MediaStreamTrack now tracks its own state
+        https://bugs.webkit.org/show_bug.cgi?id=123025
+
+        Reviewed by Jer Noble.
+
+        The spec says that a MediaStreamSource can be shared by different tracks,
+        so a track must have its own state tracking, synchronizing with its MediaStreamSource when
+        the underlying MediaStreamSource changes the readyState.
+        In the old implementation if a user invoked the stop method, its readyState method was still
+        returning the MediaStreamSource state, which was wrong.
+        This also adds a setEnabled method, which can be used to set the state of a track when a
+        remote peer ends it, for instance.
+
+        No new tests needed.
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::readyState):
+        (WebCore::MediaStreamTrack::setState):
+        (WebCore::MediaStreamTrack::stopProducingData):
+        (WebCore::MediaStreamTrack::ended):
+        (WebCore::MediaStreamTrack::sourceStateChanged):
+        (WebCore::MediaStreamTrack::trackDidEnd):
+        * Modules/mediastream/MediaStreamTrack.h:
+
 2013-10-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -205 +205 @@
     static NeverDestroyed<AtomicString> newState("new", AtomicString::ConstructFromLiteral);
 
-    if (!m_source)
-        return newState;
-
     if (m_stopped)
         return ended;
 
-    switch (m_source->readyState()) {
+    switch (m_readyState) {
     case MediaStreamSource::Live:
         return live;
@@ -224 +221 @@
 }
 
+void MediaStreamTrack::setState(MediaStreamSource::ReadyState state)
+{
+    if (m_readyState == MediaStreamSource::Ended || m_readyState == state)
+        return;
+
+    MediaStreamSource::ReadyState oldState = m_readyState;
+    m_readyState = state;
+
+    if (m_readyState == MediaStreamSource::Live && oldState == MediaStreamSource::New)
+        scheduleEventDispatch(Event::create(eventNames().startedEvent, false, false));
+    if (m_readyState == MediaStreamSource::Ended && oldState != MediaStreamSource::Ended)
+        scheduleEventDispatch(Event::create(eventNames().endedEvent, false, false));
+}
+
 void MediaStreamTrack::getSources(ScriptExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callback, ExceptionCode& ec)
 {
@@ -276 +287 @@
     // Set m_stopped before stopping the source because that may result in a call to sourceChangedState
     // and we only want to dispatch the 'ended' event if necessary.
+    setState(MediaStreamSource::Ended);
     m_stopped = true;
     m_source->stop();
-
-    if (m_readyState != MediaStreamSource::Ended)
-        scheduleEventDispatch(Event::create(eventNames().endedEvent, false, false));
 }
 
 bool MediaStreamTrack::ended() const
 {
-    return m_stopped || (m_source && m_source->readyState() == MediaStreamSource::Ended);
+    return m_stopped || m_readyState == MediaStreamSource::Ended;
 }
 
@@ -293 +302 @@
         return;
 
-    MediaStreamSource::ReadyState oldReadyState = m_readyState;
-    m_readyState = m_source->readyState();
-
-    if (m_readyState >= MediaStreamSource::Live && oldReadyState == MediaStreamSource::New)
-        scheduleEventDispatch(Event::create(eventNames().startedEvent, false, false));
-    if (m_readyState == MediaStreamSource::Ended && oldReadyState != MediaStreamSource::Ended)
-        scheduleEventDispatch(Event::create(eventNames().endedEvent, false, false));
+    setState(m_source->readyState());
 }
     
@@ -351 +354 @@
     
     client->trackDidEnd();
+    setState(MediaStreamSource::Ended);
 }
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -64 +64 @@
 
     const AtomicString& readyState() const;
+    void setState(MediaStreamSource::ReadyState);
 
     static void getSources(ScriptExecutionContext*, PassRefPtr<MediaStreamTrackSourcesCallback>, ExceptionCode&);