MediaStream should fire ended event when all tracks are ended

Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "MediaStreamTrack.h"
 
 #if ENABLE(MEDIA_STREAM)
 
 #include "Event.h"
+#include "MediaStream.h"
 #include "MediaStreamCenter.h"
 #include "MediaStreamComponent.h"
 
 namespace WebCore {
 
-PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* context, MediaStreamComponent* component)
+PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* context, MediaStreamComponent* component, MediaStream* stream)
 {
-    RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, component));
+    RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, component, stream));
     track->suspendIfNeeded();
     return track.release();
 }
 
-MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext* context, MediaStreamComponent* component)
+MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext* context, MediaStreamComponent* component, MediaStream* stream)
     : ActiveDOMObject(context)
     , m_stopped(false)
     , m_component(component)
+    , m_stream(stream)
 {
     m_component->source()->addObserver(this);
 }
 
 MediaStreamTrack::~MediaStreamTrack()
 {
     m_component->source()->removeObserver(this);
 }
 
 String MediaStreamTrack::kind() const
@@ skipping 56 matching lines @@
 
     ASSERT_NOT_REACHED();
     return String();
 }
 
 bool MediaStreamTrack::ended() const
 {
     return m_stopped || (m_component->source()->readyState() == MediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamTrack::sourceChangedState()

[abarth-chromium, 2013/04/08 16:58:41]

Who calls this function?  Maybe it would be easier to have the caller pass in
the MediaStream* instead of keeping it on this object.

[Li Yin, 2013/04/09 06:34:07]

It is a callback from MediaStreamSource::setReadyState.
There is not MediaStream instance in MediaStreamSource, so it is impossible to
pass it as a parameter.

 {
     if (m_stopped)
         return;
 
     switch (m_component->source()->readyState()) {
     case MediaStreamSource::ReadyStateLive:
         dispatchEvent(Event::create(eventNames().unmuteEvent, false, false));
         break;
     case MediaStreamSource::ReadyStateMuted:
         dispatchEvent(Event::create(eventNames().muteEvent, false, false));
         break;
     case MediaStreamSource::ReadyStateEnded:
         dispatchEvent(Event::create(eventNames().endedEvent, false, false));
+        if (m_stream)
+            m_stream->trackEndedNotification();
         break;
     }
 }
 
 MediaStreamComponent* MediaStreamTrack::component()
 {
     return m_component.get();
 }
 
 void MediaStreamTrack::stop()
 {
     m_stopped = true;
+    if (m_stream)
+        m_stream->trackEndedNotification();

[Tommy Widenflycht, 2013/04/08 14:01:07]

This is a bit overkill because when stop() is called the world is going down.

[abarth-chromium, 2013/04/08 16:58:41]

Yeah.

 }
 
 const AtomicString& MediaStreamTrack::interfaceName() const
 {
     return eventNames().interfaceForMediaStreamTrack;
 }
 
 ScriptExecutionContext* MediaStreamTrack::scriptExecutionContext() const
 {
     return ActiveDOMObject::scriptExecutionContext();
 }
 
 EventTargetData* MediaStreamTrack::eventTargetData()
 {
     return &m_eventTargetData;
 }
 
 EventTargetData* MediaStreamTrack::ensureEventTargetData()
 {
     return &m_eventTargetData;
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)