Changeset 259802 in webkit

Timestamp:

Apr 9, 2020, 8:24:53 AM (6 years ago)

Author:

youenn@apple.com

Message:

Source/WebKit:
[MacOS] REGRESSION (r253275): Stopping a cloned audio capture track should not stop the original audio track
​https://bugs.webkit.org/show_bug.cgi?id=210259
<rdar://problem/61466486>

Reviewed by Eric Carlson.

We changed video track cloning so that each cloned track would get its own source.
The source is getting video sample from the real capture source.
The real capture source will get stopped if all its client sources are stopped.

For audio, we are still using the same audio source for each track.
We should thus not close the source until all its tracks are stopped.
To do so, we reuse RealtimeMediaSource::requestToEnd instead of directly sending
the order to stop observing the remote audio source.

Test: fast/mediastream/mediastreamtrack-audio-clone.html

• WebProcess/cocoa/UserMediaCaptureManager.cpp:

(WebKit::UserMediaCaptureManager::Source::requestToEnd):
(WebKit::UserMediaCaptureManager::Source::stopBeingObserved): Deleted.

LayoutTests:
[MacOS] Stopping a cloned audio capture track should not stop the original audio track
​https://bugs.webkit.org/show_bug.cgi?id=210259
<rdar://problem/61466486>

Reviewed by Eric Carlson.

• fast/mediastream/mediastreamtrack-audio-clone-expected.txt: Added.
• fast/mediastream/mediastreamtrack-audio-clone.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/mediastreamtrack-audio-clone-expected.txt (added)
• LayoutTests/fast/mediastream/mediastreamtrack-audio-clone.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-09  Youenn Fablet  <youenn@apple.com>
+
+        [MacOS] Stopping a cloned audio capture track should not stop the original audio track
+        https://bugs.webkit.org/show_bug.cgi?id=210259
+        <rdar://problem/61466486>
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/mediastreamtrack-audio-clone-expected.txt: Added.
+        * fast/mediastream/mediastreamtrack-audio-clone.html: Added.
+
 2020-04-09  Jason Lawrence  <lawrence.j@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-09  Youenn Fablet  <youenn@apple.com>
+
+        [MacOS] REGRESSION (r253275): Stopping a cloned audio capture track should not stop the original audio track
+        https://bugs.webkit.org/show_bug.cgi?id=210259
+        <rdar://problem/61466486>
+
+        Reviewed by Eric Carlson.
+
+        We changed video track cloning so that each cloned track would get its own source.
+        The source is getting video sample from the real capture source.
+        The real capture source will get stopped if all its client sources are stopped.
+
+        For audio, we are still using the same audio source for each track.
+        We should thus not close the source until all its tracks are stopped.
+        To do so, we reuse RealtimeMediaSource::requestToEnd instead of directly sending
+        the order to stop observing the remote audio source.
+
+        Test: fast/mediastream/mediastreamtrack-audio-clone.html
+
+        * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+        (WebKit::UserMediaCaptureManager::Source::requestToEnd):
+        (WebKit::UserMediaCaptureManager::Source::stopBeingObserved): Deleted.
+
 2020-04-09  Claudio Saavedra  <csaavedra@igalia.com>
 

trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp

@@ -251 +251 @@
     void commitConfiguration() final { }
     bool setShouldApplyRotation(bool /* shouldApplyRotation */) final;
-
-
     void applyConstraints(const WebCore::MediaConstraints&, ApplyConstraintsHandler&&) final;
-
-    void requestToEnd(RealtimeMediaSource::Observer&) { stopBeingObserved(); }
-    void stopBeingObserved();
+    void requestToEnd(Observer&) final;
+    void stopBeingObserved() final;
 
     RealtimeMediaSourceIdentifier m_id;
@@ -505 +502 @@
 }
 
+void UserMediaCaptureManager::Source::requestToEnd(Observer& observer)
+{
+    switch (type()) {
+    case Type::Audio:
+        RealtimeMediaSource::requestToEnd(observer);
+        break;
+    case Type::Video:
+        stopBeingObserved();
+        break;
+    case Type::None:
+        ASSERT_NOT_REACHED();
+    }
+}
+
 CaptureSourceOrError UserMediaCaptureManager::AudioFactory::createAudioCaptureSource(const CaptureDevice& device, String&& hashSalt, const MediaConstraints* constraints)
 {