Changeset 219127 in webkit

Timestamp:

Jul 5, 2017, 8:53:17 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Receiving tracks should be ended when peer connection is being closed
​https://bugs.webkit.org/show_bug.cgi?id=174109

Patch by Youenn Fablet <​youenn@apple.com> on 2017-07-05
Reviewed by Eric Carlson.

Source/WebCore:

Test: webrtc/peer-connection-track-end.html

As per ​https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close, tracks should be ended when peer connection is closed.
Also updating transceiver stopped state.

• Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::doClose):

• Modules/mediastream/RTCRtpReceiver.cpp:

(WebCore::RTCRtpReceiver::stop):

• Modules/mediastream/RTCRtpReceiver.h:

LayoutTests:

• webrtc/peer-connection-track-end-expected.txt: Added.
• webrtc/peer-connection-track-end.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/peer-connection-track-end-expected.txt (added)
• LayoutTests/webrtc/peer-connection-track-end.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCRtpReceiver.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-05  Youenn Fablet  <youenn@apple.com>
+
+        Receiving tracks should be ended when peer connection is being closed
+        https://bugs.webkit.org/show_bug.cgi?id=174109
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/peer-connection-track-end-expected.txt: Added.
+        * webrtc/peer-connection-track-end.html: Added.
+
 2017-07-04  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-05  Youenn Fablet  <youenn@apple.com>
+
+        Receiving tracks should be ended when peer connection is being closed
+        https://bugs.webkit.org/show_bug.cgi?id=174109
+
+        Reviewed by Eric Carlson.
+
+        Test: webrtc/peer-connection-track-end.html
+
+        As per https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close, tracks should be ended when peer connection is closed.
+        Also updating transceiver stopped state.
+
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::doClose):
+        * Modules/mediastream/RTCRtpReceiver.cpp:
+        (WebCore::RTCRtpReceiver::stop):
+        * Modules/mediastream/RTCRtpReceiver.h:
+
 2017-07-04  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

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

@@ -388 +388 @@
     m_iceConnectionState = RTCIceConnectionState::Closed;
 
-    for (RTCRtpReceiver& receiver : m_transceiverSet->receivers())
-        receiver.stop();
-
-    for (RTCRtpSender& sender : m_transceiverSet->senders())
-        sender.stop();
+    for (auto& transceiver : m_transceiverSet->list()) {
+        transceiver->stop();
+        transceiver->sender().stop();
+        transceiver->receiver().stop();
+    }
 
     return true;

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

@@ -44 +44 @@
 }
 
+void RTCRtpReceiver::stop()
+{
+    m_backend = nullptr;
+
+    if (m_track)
+        m_track->stopTrack(MediaStreamTrack::StopMode::PostEvent);
+}
+
 } // namespace WebCore
 

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

@@ -52 +52 @@
     }
 
-    void stop() { m_backend = nullptr; }
+    void stop();
+
     // FIXME: We should pass a UniqueRef here.
     void setBackend(std::unique_ptr<Backend>&& backend) { m_backend = WTFMove(backend); }