Changeset 144748 in webkit

Timestamp:

Mar 5, 2013 3:34:38 AM (11 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Add the getStreamById method on RTCPeerConnection
​https://bugs.webkit.org/show_bug.cgi?id=111311

Reviewed by Adam Barth.

Source/Platform:

Added an initial initialize method which doesn't take an id;
the id will be generated for you.

• chromium/public/WebMediaStream.h:

(WebMediaStream):

Source/WebCore:

Adding the missing method on RTCPeerConnection defined here:
​http://dev.w3.org/2011/webrtc/editor/webrtc.html#widl-RTCPeerConnection-getStreamById-MediaStream-DOMString-streamId

Existing tests have been extended to cover patch.

• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::getStreamById):
(WebCore):

• Modules/mediastream/RTCPeerConnection.h:

(RTCPeerConnection):

• Modules/mediastream/RTCPeerConnection.idl:
• platform/chromium/support/WebMediaStream.cpp:

(WebKit::WebMediaStream::initialize):
(WebKit):

• platform/mediastream/MediaStreamSource.cpp:

(WebCore::MediaStreamSource::setReadyState):

Tools:

Changing mocks to be more realistic.

• DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp:

(WebTestRunner::MockWebRTCPeerConnectionHandler::addStream):
(WebTestRunner::MockWebRTCPeerConnectionHandler::removeStream):

• DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp:

(WebTestRunner::WebUserMediaClientMock::requestUserMedia):

LayoutTests:

• fast/mediastream/MediaStream-add-remove-tracks.html:
• fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt:
• fast/mediastream/RTCPeerConnection-AddRemoveStream.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html (modified) (3 diffs)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• Source/Platform/ChangeLog (modified) (1 diff)
• Source/Platform/chromium/public/WebMediaStream.h (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.idl (modified) (1 diff)
• Source/WebCore/platform/chromium/support/WebMediaStream.cpp (modified) (2 diffs)
• Source/WebCore/platform/mediastream/MediaStreamSource.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp (modified) (2 diffs)
• Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-05  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Add the getStreamById method on RTCPeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=111311
+
+        Reviewed by Adam Barth.
+
+        * fast/mediastream/MediaStream-add-remove-tracks.html:
+        * fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt:
+        * fast/mediastream/RTCPeerConnection-AddRemoveStream.html:
+
 2013-03-05  Antoine Quint  <graouts@apple.com>
 

trunk/LayoutTests/fast/mediastream/MediaStream-add-remove-tracks.html

@@ -84 +84 @@
     // (re-)add tracks
     tryAddTrack(stream1, audioTrack);
-    tryAddTrack(stream1, videoTrack);    
+    tryAddTrack(stream1, videoTrack);
 
     // verify added tracks

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream-expected.txt

@@ -6 +6 @@
 PASS Got a stream.
 PASS Got another stream.
+PASS stream.id === stream2.id is false
 PASS onAddStream was called.
+PASS pc.getStreamById(stream.id) is stream
+PASS pc.getStreamById(stream2.id) is null
 PASS pc.getLocalStreams().length is 1
 PASS pc.getLocalStreams().length is 1

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-AddRemoveStream.html

@@ -26 +26 @@
 }
 
-function onErroneousRemoveStream() {
-    testFailed('onErroneousRemoveStream was called.');
+function onErroneousNegotiationNeeded() {
+    testFailed('onErroneousNegotiationNeeded was called.');
     finishJSTest();
 }
@@ -39 +39 @@
 }
 
-function onErroneousAddStream() {
-    testFailed('onErroneousAddStream was called.');
-    finishJSTest();
-}
-
 function onAddStream(event) {
     testPassed('onAddStream was called.');
 
-    pc.onaddstream = onErroneousAddStream;
+    shouldBe('pc.getStreamById(stream.id)', 'stream');
+    shouldBe('pc.getStreamById(stream2.id)', 'null');
+
+    pc.onnegotiationneeded = onErroneousNegotiationNeeded;
     pc.addStream(stream);
     shouldBe('pc.getLocalStreams().length', '1');
-
-    pc.onremovestream = onErroneousRemoveStream;
     pc.removeStream(stream2);
     shouldBe('pc.getLocalStreams().length', '1');
 
-    pc.onremovestream = onRemoveStream;
+    pc.onnegotiationneeded = onRemoveStream;
     pc.removeStream(stream);
 }
@@ -63 +59 @@
     stream2 = s;
 
+    shouldBeFalse("stream.id === stream2.id");
+
     pc = new webkitRTCPeerConnection(null, null);
-
-    pc.onaddstream = onAddStream;
+    pc.onnegotiationneeded = onAddStream;
     pc.addStream(stream);
 }

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -4413 +4413 @@
 # These test are failing since r144519
 webkit.org/b/109769 [ Mac ] fast/events/touch/gesture/touch-gesture-noscroll-body-yhidden.html [ Failure ]
-webkit.org/b/109769 [ Mac ] fast/events/touch/gesture/touch-gesture-noscroll-body-propagated.html [ Failure ] 
-
-# New crashing test since r144610
-webkit.org/b/111410 [ Debug ] fast/mediastream/MediaStream-add-remove-tracks.html [ Crash ]
+webkit.org/b/109769 [ Mac ] fast/events/touch/gesture/touch-gesture-noscroll-body-propagated.html [ Failure ]

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2013-03-05  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Add the getStreamById method on RTCPeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=111311
+
+        Reviewed by Adam Barth.
+
+        Added an initial initialize method which doesn't take an id;
+        the id will be generated for you.
+
+        * chromium/public/WebMediaStream.h:
+        (WebMediaStream):
+
 2013-03-04  Chris Rogers  <crogers@google.com>
 

trunk/Source/Platform/chromium/public/WebMediaStream.h

@@ -63 +63 @@
     WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
 
+    WEBKIT_EXPORT void initialize(const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks);
     WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks);
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-05  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Add the getStreamById method on RTCPeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=111311
+
+        Reviewed by Adam Barth.
+
+        Adding the missing method on RTCPeerConnection defined here:
+        http://dev.w3.org/2011/webrtc/editor/webrtc.html#widl-RTCPeerConnection-getStreamById-MediaStream-DOMString-streamId
+
+        Existing tests have been extended to cover patch.
+
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::getStreamById):
+        (WebCore):
+        * Modules/mediastream/RTCPeerConnection.h:
+        (RTCPeerConnection):
+        * Modules/mediastream/RTCPeerConnection.idl:
+        * platform/chromium/support/WebMediaStream.cpp:
+        (WebKit::WebMediaStream::initialize):
+        (WebKit):
+        * platform/mediastream/MediaStreamSource.cpp:
+        (WebCore::MediaStreamSource::setReadyState):
+
 2013-03-05  Antoine Quint  <graouts@apple.com>
 

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

@@ -432 +432 @@
 }
 
+MediaStream* RTCPeerConnection::getStreamById(const String& streamId)
+{
+    for (MediaStreamVector::iterator iter = m_localStreams.begin(); iter != m_localStreams.end(); ++iter) {
+        if ((*iter)->id() == streamId)
+            return iter->get();
+    }
+
+    for (MediaStreamVector::iterator iter = m_remoteStreams.begin(); iter != m_remoteStreams.end(); ++iter) {
+        if ((*iter)->id() == streamId)
+            return iter->get();
+    }
+
+    return 0;
+}
+
 void RTCPeerConnection::getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector)
 {

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

@@ -90 +90 @@
     MediaStreamVector getRemoteStreams() const;
 
+    MediaStream* getStreamById(const String& streamId);
+
     void addStream(PassRefPtr<MediaStream>, const Dictionary& mediaConstraints, ExceptionCode&);
 

trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl

@@ -69 +69 @@
     sequence<MediaStream> getLocalStreams();
     sequence<MediaStream> getRemoteStreams();
+    MediaStream getStreamById(DOMString streamId);
 
     [StrictTypeChecking] void addStream(in MediaStream stream, in [Optional] Dictionary mediaConstraints)

trunk/Source/WebCore/platform/chromium/support/WebMediaStream.cpp

@@ -32 +32 @@
 #include "MediaStreamDescriptor.h"
 #include "MediaStreamSource.h"
+#include "UUID.h"
 #include <public/WebMediaStreamSource.h>
 #include <public/WebMediaStreamTrack.h>
@@ -143 +144 @@
 }
 
+void WebMediaStream::initialize(const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks)
+{
+    initialize(createCanonicalUUIDString(), audioTracks, videoTracks);
+}
+
 void WebMediaStream::initialize(const WebString& label, const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks)
 {

trunk/Source/WebCore/platform/mediastream/MediaStreamSource.cpp

@@ -54 +54 @@
 void MediaStreamSource::setReadyState(ReadyState readyState)
 {
-    ASSERT(m_readyState != ReadyStateEnded);
-    if (m_readyState != readyState) {
+    if (m_readyState != ReadyStateEnded && m_readyState != readyState) {
         m_readyState = readyState;
         for (Vector<Observer*>::iterator i = m_observers.begin(); i != m_observers.end(); ++i)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-03-05  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Add the getStreamById method on RTCPeerConnection
+        https://bugs.webkit.org/show_bug.cgi?id=111311
+
+        Reviewed by Adam Barth.
+
+        Changing mocks to be more realistic.
+
+        * DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp:
+        (WebTestRunner::MockWebRTCPeerConnectionHandler::addStream):
+        (WebTestRunner::MockWebRTCPeerConnectionHandler::removeStream):
+        * DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp:
+        (WebTestRunner::WebUserMediaClientMock::requestUserMedia):
+
 2013-03-05  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/MockWebRTCPeerConnectionHandler.cpp

@@ -256 +256 @@
 bool MockWebRTCPeerConnectionHandler::addStream(const WebMediaStream& stream, const WebMediaConstraints&)
 {
-    m_streamCount += 1;
-    m_client->didAddRemoteStream(stream);
+    ++m_streamCount;
     m_client->negotiationNeeded();
     return true;
@@ -264 +263 @@
 void MockWebRTCPeerConnectionHandler::removeStream(const WebMediaStream& stream)
 {
-    m_streamCount -= 1;
-    m_client->didRemoveRemoteStream(stream);
+    --m_streamCount;
     m_client->negotiationNeeded();
 }

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.cpp

@@ -122 +122 @@
 
     WebMediaStream stream;
-    stream.initialize("foobar", audioTracks, videoTracks);
+    stream.initialize(audioTracks, videoTracks);
 
     stream.setExtraData(new MockExtraData());