Changeset 155249 in webkit

Timestamp:

Sep 7, 2013, 8:34:21 AM (12 years ago)

Author:

eric.carlson@apple.com

Message:

MediaStream should fire ended event when all tracks are ended
​https://bugs.webkit.org/show_bug.cgi?id=120871

Reviewed by Jer Noble.

Merge ​https://chromium.googlesource.com/chromium/blink/+/bebd179b65be69e46f2f434a3ec8b1e4aa85cc42

Source/WebCore:

Test: fast/mediastream/MediaStream-onended.html

• Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::trackEnded): New.

• Modules/mediastream/MediaStream.h:

• Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::sourceChangedState): Call didEndTrack when state changes to ReadyStateEnded.
(WebCore::MediaStreamTrack::didEndTrack): New.
(WebCore::MediaStreamTrack::stop): Call didEndTrack.

• Modules/mediastream/MediaStreamTrack.h:

• platform/mediastream/MediaStreamDescriptor.h:

(WebCore::MediaStreamDescriptor::MediaStreamDescriptor): Require didEndTrack.

LayoutTests:

• fast/mediastream/MediaStream-onended-expected.txt: Added.
• fast/mediastream/MediaStream-onended.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/MediaStream-onended-expected.txt (added)
• LayoutTests/fast/mediastream/MediaStream-onended.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStream.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStream.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.h (modified) (1 diff)
• Source/WebCore/platform/mediastream/MediaStreamDescriptor.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-07  Eric Carlson  <eric.carlson@apple.com>
+
+        MediaStream should fire ended event when all tracks are ended
+        https://bugs.webkit.org/show_bug.cgi?id=120871
+
+        Reviewed by Jer Noble.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/bebd179b65be69e46f2f434a3ec8b1e4aa85cc42
+
+        * fast/mediastream/MediaStream-onended-expected.txt: Added.
+        * fast/mediastream/MediaStream-onended.html: Added.
+
 2013-09-06  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-07  Eric Carlson  <eric.carlson@apple.com>
+
+        MediaStream should fire ended event when all tracks are ended
+        https://bugs.webkit.org/show_bug.cgi?id=120871
+
+        Reviewed by Jer Noble.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/bebd179b65be69e46f2f434a3ec8b1e4aa85cc42
+
+        Test: fast/mediastream/MediaStream-onended.html
+
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::trackEnded): New.
+        * Modules/mediastream/MediaStream.h:
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::sourceChangedState): Call didEndTrack when state changes to ReadyStateEnded. 
+        (WebCore::MediaStreamTrack::didEndTrack): New.
+        (WebCore::MediaStreamTrack::stop): Call didEndTrack.
+        * Modules/mediastream/MediaStreamTrack.h:
+
+        * platform/mediastream/MediaStreamDescriptor.h:
+        (WebCore::MediaStreamDescriptor::MediaStreamDescriptor): Require didEndTrack.
+
 2013-09-06  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

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

@@ -222 +222 @@
 }
 
+void MediaStream::trackEnded()
+{
+    for (size_t i = 0; i < m_audioTracks.size(); ++i)
+        if (!m_audioTracks[i]->ended())
+            return;
+    
+    for (size_t i = 0; i < m_videoTracks.size(); ++i)
+        if (!m_videoTracks[i]->ended())
+            return;
+    
+    streamEnded();
+}
+
 void MediaStream::streamEnded()
 {

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

@@ -67 +67 @@
 
     // MediaStreamDescriptorClient
+    virtual void trackEnded() OVERRIDE;
     virtual void streamEnded() OVERRIDE;
 

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

@@ -136 +136 @@
     case MediaStreamSource::ReadyStateEnded:
         dispatchEvent(Event::create(eventNames().endedEvent, false, false));
+        didEndTrack();
         break;
     }
+}
+
+void MediaStreamTrack::didEndTrack()
+{
+    MediaStreamDescriptorClient* client = m_component->stream()->client();
+    if (!client)
+        return;
+    
+    client->trackEnded();
 }
 
@@ -148 +158 @@
 {
     m_stopped = true;
+    didEndTrack();
 }
 

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

@@ -54 +54 @@
     void setEnabled(bool);
 
+    void didEndTrack();
+    
     String readyState() const;
 

trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.h

@@ -45 +45 @@
     virtual ~MediaStreamDescriptorClient() { }
 
+    virtual void trackEnded() = 0;
     virtual void streamEnded() = 0;
     virtual void addRemoteTrack(MediaStreamComponent*) = 0;