Bug 196555 – [MediaStream] Host should be able to mute screen capture and camera/microphone independently

• Status: RESOLVED
• Resolution: FIXED
• Component: WebRTC

[Eric Carlson]

Host should be able to mute screen capture and camera/microphone independently

[Eric Carlson]

<rdar://problem/47303865>

[Eric Carlson]

Created attachment 366637 [details]
Patch

[youenn fablet]

Comment on attachment 366637 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=366637&action=review

> Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:186
> +    case CaptureDevice::DeviceType::Window:

Probably DeviceType::Window and DeviceType::Screen should use ScreenCaptureIsMuted.

> Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:409
> +        if (source().interrupted() && !(pageMutedState & AudioAndVideoCaptureIsMuted))

Could we do:
if (source().interrupted() && !source().muted())

> Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:418
> +        if (source().interrupted() && !(pageMutedState & MediaStreamCaptureIsMuted))

Ditto here.

[EWS Watchlist]

Comment on attachment 366637 [details]
Patch

Attachment 366637 [details] did not pass mac-wk2-ews (mac-wk2):
Output: https://webkit-queues.webkit.org/results/11755588

New failing tests:
imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
fast/mediastream/media-stream-track-muted.html
imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addTransceiver.https.html
imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html
fast/mediastream/RTCPeerConnection-add-removeTrack.html

[EWS Watchlist]

Created attachment 366653 [details]
Archive of layout-test-results from ews105 for mac-highsierra-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: ews105  Port: mac-highsierra-wk2  Platform: Mac OS X 10.13.6

[EWS Watchlist]

Comment on attachment 366637 [details]
Patch

Attachment 366637 [details] did not pass ios-sim-ews (ios-simulator-wk2):
Output: https://webkit-queues.webkit.org/results/11755682

New failing tests:
imported/w3c/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-addTransceiver.https.html
imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-transceivers.https.html
fast/mediastream/RTCPeerConnection-add-removeTrack.html

[EWS Watchlist]

Created attachment 366660 [details]
Archive of layout-test-results from ews126 for ios-simulator-wk2

The attached test failures were seen while running run-webkit-tests on the ios-sim-ews.
Bot: ews126  Port: ios-simulator-wk2  Platform: Mac OS X 10.13.6

[Eric Carlson]

Created attachment 366707 [details]
Patch

[EWS Watchlist]

Comment on attachment 366707 [details]
Patch

Attachment 366707 [details] did not pass mac-wk2-ews (mac-wk2):
Output: https://webkit-queues.webkit.org/results/11763936

New failing tests:
fast/mediastream/media-stream-track-interrupted.html

[EWS Watchlist]

Created attachment 366711 [details]
Archive of layout-test-results from ews107 for mac-highsierra-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: ews107  Port: mac-highsierra-wk2  Platform: Mac OS X 10.13.6

[Eric Carlson]

Created attachment 366722 [details]
Patch

[youenn fablet]

Comment on attachment 366722 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=366722&action=review

> Source/WebCore/Modules/mediastream/MediaStream.cpp:120
> +        setCaptureTracksMuted(document()->page()->mutedState());

Can probably remove these lines.

> Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:71
> +    if (auto document = this->document()) {

This if check is probably not needed.
document() should return a valid pointer here anyway.
See also the document()->logger call.

As a future refactoring, we could make constructor take a Document& instead.

> Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:464
> +        AtomicString eventType = muted() ? eventNames().muteEvent : eventNames().unmuteEvent;

let's capture muted state in the lambda.

> Source/WebCore/testing/Internals.cpp:4062
> +            state |= MediaProducer::ScreenCaptureIsMuted;

It would be nice to setPageMuted through testRunner and WebView API.

> Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h:56
> +    _WKMediaScreenCaptureMuted =  1 << 2,

s/  / /

> Source/WebKit/UIProcess/WebPageProxy.cpp:5344
> +    bool hasMutedCaptureStreams = m_mediaState & (WebCore::MediaProducer::MutedCaptureMask);

No need for ()

[Eric Carlson]

Created attachment 366732 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 366732 [details]
Patch

Clearing flags on attachment: 366732

Committed r243899: <https://trac.webkit.org/changeset/243899>