Changeset 238720 in webkit

Timestamp:

Nov 29, 2018 5:32:17 PM (5 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r238680.

Caused existing webrtc layout tests to fail an assertion.

Reverted changeset:

"A sender created through addTransceiver and populated using
addTrack should have its source set"
​https://bugs.webkit.org/show_bug.cgi?id=192136
​https://trac.webkit.org/changeset/238680

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/video-replace-track-expected.txt (modified) (1 diff)
• LayoutTests/webrtc/video-replace-track.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-29  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r238680.
+
+        Caused existing webrtc layout tests to fail an assertion.
+
+        Reverted changeset:
+
+        "A sender created through addTransceiver and populated using
+        addTrack should have its source set"
+        https://bugs.webkit.org/show_bug.cgi?id=192136
+        https://trac.webkit.org/changeset/238680
+
 2018-11-29  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/webrtc/video-replace-track-expected.txt

@@ -3 +3 @@
 PASS Switching from front to back camera, with lower resolution 
 PASS Switching from front to back camera, with higher resolution 
-PASS Replace a track for a sender created by addTransceiver and used by addTrack 
 

trunk/LayoutTests/webrtc/video-replace-track.html

@@ -182 +182 @@
 
 }, "Switching from front to back camera, with higher resolution");
-
-promise_test(async (test) => {
-    const stream = await navigator.mediaDevices.getUserMedia({ video: true });
-    const pc = new RTCPeerConnection();
-    pc.addTransceiver("video", {direction: "sendonly"});
-    const sender = pc.addTrack(stream.getVideoTracks()[0], stream);
-    await sender.replaceTrack(stream.getVideoTracks()[0].clone());
-}, "Replace a track for a sender created by addTransceiver and used by addTrack");
         </script>
     </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-29  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r238680.
+
+        Caused existing webrtc layout tests to fail an assertion.
+
+        Reverted changeset:
+
+        "A sender created through addTransceiver and populated using
+        addTrack should have its source set"
+        https://bugs.webkit.org/show_bug.cgi?id=192136
+        https://trac.webkit.org/changeset/238680
+
 2018-11-29  Justin Fan  <justin_fan@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp

@@ -404 +404 @@
 
         if (auto sender = findExistingSender(m_peerConnection.currentSenders(), *senderBackend)) {
-            backendFromRTPSender(*sender).takeSource(*senderBackend);
             sender->setTrack(makeRef(track));
             sender->setMediaStreamIds(WTFMove(mediaStreamIds));

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCRtpSenderBackend.h

@@ -95 +95 @@
     }
 
-    void takeSource(LibWebRTCRtpSenderBackend& backend)
-    {
-        ASSERT(backend.hasSource());
-        setSource(WTFMove(backend.m_source));
-    }
-
 private:
     void replaceTrack(ScriptExecutionContext&, RTCRtpSender&, RefPtr<MediaStreamTrack>&&, DOMPromiseDeferred<void>&&) final;