Changeset 238909 in webkit

Timestamp:

Dec 5, 2018 2:32:26 PM (5 years ago)

Author:

youenn@apple.com

Message:

Enable the possibility to do video capture in UIProcess
​https://bugs.webkit.org/show_bug.cgi?id=192394

Reviewed by Eric Carlson.

Source/WebCore:

Create IOSurface-backed sample buffers so that we can easily send them through IPC.
Manually tested.

• platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::setSizeAndFrameRateWithPreset):

Source/WebKit:

Add two web preferences to toggle audio/video capture in UIProcess or WebProcess.
Add mechanism for video capture that was not implemented yet.

• Shared/WebPreferences.yaml:
• Shared/WebPreferencesDefaultValues.h:
• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:
• UIProcess/API/APIProcessPoolConfiguration.h:
• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetCaptureAudioInUIProcessEnabled):
(WKPreferencesGetCaptureAudioInUIProcessEnabled):
(WKPreferencesSetCaptureVideoInUIProcessEnabled):
(WKPreferencesGetCaptureVideoInUIProcessEnabled):

• UIProcess/API/C/WKPreferencesRef.h:
• UIProcess/WebPreferences.cpp:

(WebKit::WebPreferences::updateBoolValueForInternalDebugFeatureKey):

• UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::initializeNewWebProcess):
(WebKit::WebProcessPool::createWebPage):

• WebProcess/cocoa/UserMediaCaptureManager.cpp:

(WebKit::UserMediaCaptureManager::initialize):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebPreferences.yaml (modified) (1 diff)
• WebKit/Shared/WebPreferencesDefaultValues.h (modified) (1 diff)
• WebKit/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• WebKit/UIProcess/API/APIProcessPoolConfiguration.h (modified) (2 diffs)
• WebKit/UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• WebKit/UIProcess/API/C/WKPreferencesRef.h (modified) (1 diff)
• WebKit/UIProcess/WebPreferences.cpp (modified) (1 diff)
• WebKit/UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-05  Youenn Fablet  <youenn@apple.com>
+
+        Enable the possibility to do video capture in UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=192394
+
+        Reviewed by Eric Carlson.
+
+        Create IOSurface-backed sample buffers so that we can easily send them through IPC.
+        Manually tested.
+
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::AVVideoCaptureSource::setSizeAndFrameRateWithPreset):
+
 2018-12-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm

@@ -343 +343 @@
                     (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey: @(avVideoCapturePixelBufferFormat()),
                     (__bridge NSString *)kCVPixelBufferWidthKey: @(avPreset->size.width()),
-                    (__bridge NSString *)kCVPixelBufferHeightKey: @(avPreset->size.height())
+                    (__bridge NSString *)kCVPixelBufferHeightKey: @(avPreset->size.height()),
+                    (__bridge NSString *)kCVPixelBufferIOSurfacePropertiesKey : @{ }
                 };
                 [m_videoOutput setVideoSettings:settingsDictionary];

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-05  Youenn Fablet  <youenn@apple.com>
+
+        Enable the possibility to do video capture in UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=192394
+
+        Reviewed by Eric Carlson.
+
+        Add two web preferences to toggle audio/video capture in UIProcess or WebProcess.
+        Add mechanism for video capture that was not implemented yet.
+
+        * Shared/WebPreferences.yaml:
+        * Shared/WebPreferencesDefaultValues.h:
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode const):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetCaptureAudioInUIProcessEnabled):
+        (WKPreferencesGetCaptureAudioInUIProcessEnabled):
+        (WKPreferencesSetCaptureVideoInUIProcessEnabled):
+        (WKPreferencesGetCaptureVideoInUIProcessEnabled):
+        * UIProcess/API/C/WKPreferencesRef.h:
+        * UIProcess/WebPreferences.cpp:
+        (WebKit::WebPreferences::updateBoolValueForInternalDebugFeatureKey):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::initializeNewWebProcess):
+        (WebKit::WebProcessPool::createWebPage):
+        * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+        (WebKit::UserMediaCaptureManager::initialize):
+
 2018-12-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Shared/WebPreferences.yaml

@@ -1475 +1475 @@
   condition: ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+CaptureAudioInUIProcessEnabled:
+  type: bool
+  defaultValue: DEFAULT_CAPTURE_AUDIO_IN_UIPROCESS
+  humanReadableName: "Capture audio in UIProcess"
+  humanReadableDescription: "Enable audio capture in UIProcess"
+  category: internal
+  webcoreBinding: none
+  condition: ENABLE(MEDIA_STREAM)
+
+CaptureVideoInUIProcessEnabled:
+  type: bool
+  defaultValue: false
+  humanReadableName: "Capture video in UIProcess"
+  humanReadableDescription: "Enable video capture in UIProcess"
+  category: internal
+  webcoreBinding: none
+  condition: ENABLE(MEDIA_STREAM)

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h

@@ -224 +224 @@
 bool defaultCustomPasteboardDataEnabled();
 
+#if PLATFORM(MAC)
+#define DEFAULT_CAPTURE_AUDIO_IN_UIPROCESS true
+#else
+#define DEFAULT_CAPTURE_AUDIO_IN_UIPROCESS false
+#endif
+
 #if PLATFORM(WATCHOS)
 #define DEFAULT_INPUT_TYPE_COLOR_ENABLED false

trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp

@@ -70 +70 @@
     encoder << audioCaptureExtensionHandle;
     encoder << shouldCaptureAudioInUIProcess;
+    encoder << shouldCaptureVideoInUIProcess;
     encoder << shouldCaptureDisplayInUIProcess;
 #endif
@@ -262 +263 @@
     if (!decoder.decode(parameters.shouldCaptureAudioInUIProcess))
         return false;
+    if (!decoder.decode(parameters.shouldCaptureVideoInUIProcess))
+        return false;
     if (!decoder.decode(parameters.shouldCaptureDisplayInUIProcess))
         return false;

trunk/Source/WebKit/Shared/WebProcessCreationParameters.h

@@ -94 +94 @@
     SandboxExtension::Handle audioCaptureExtensionHandle;
     bool shouldCaptureAudioInUIProcess { false };
+    bool shouldCaptureVideoInUIProcess { false };
     bool shouldCaptureDisplayInUIProcess { false };
 #endif

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

@@ -139 +139 @@
     void setShouldCaptureAudioInUIProcess(bool shouldCaptureAudioInUIProcess) { m_shouldCaptureAudioInUIProcess = shouldCaptureAudioInUIProcess; }
 
+    bool shouldCaptureVideoInUIProcess() const { return m_shouldCaptureVideoInUIProcess; }
+    void setShouldCaptureVideoInUIProcess(bool shouldCaptureVideoInUIProcess) { m_shouldCaptureVideoInUIProcess = shouldCaptureVideoInUIProcess; }
+
     bool shouldCaptureDisplayInUIProcess() const { return m_shouldCaptureDisplayInUIProcess; }
     void setShouldCaptureDisplayInUIProcess(bool shouldCaptureDisplayInUIProcess) { m_shouldCaptureDisplayInUIProcess = shouldCaptureDisplayInUIProcess; }
@@ -207 +210 @@
     bool m_shouldTakeUIBackgroundAssertion { true };
     bool m_shouldCaptureAudioInUIProcess { false };
+    bool m_shouldCaptureVideoInUIProcess { false };
     bool m_shouldCaptureDisplayInUIProcess { DEFAULT_CAPTURE_DISPLAY_IN_UI_PROCESS };
     ProcessID m_presentingApplicationPID { getCurrentProcessID() };

trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp

@@ -2080 +2080 @@
     return toImpl(preferencesRef)->webSQLDisabled();
 }
+
+void WKPreferencesSetCaptureAudioInUIProcessEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+    toImpl(preferencesRef)->setCaptureAudioInUIProcessEnabled(flag);
+}
+
+bool WKPreferencesGetCaptureAudioInUIProcessEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->captureAudioInUIProcessEnabled();
+}
+
+void WKPreferencesSetCaptureVideoInUIProcessEnabled(WKPreferencesRef preferencesRef, bool flag)
+{
+    toImpl(preferencesRef)->setCaptureVideoInUIProcessEnabled(flag);
+}
+
+bool WKPreferencesGetCaptureVideoInUIProcessEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->captureVideoInUIProcessEnabled();
+}

trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h

@@ -333 +333 @@
 WK_EXPORT void WKPreferencesSetWebSQLDisabled(WKPreferencesRef preferencesRef, bool enabled);
 
+WK_EXPORT void WKPreferencesSetCaptureAudioInUIProcessEnabled(WKPreferencesRef preferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetCaptureAudioInUIProcessEnabled(WKPreferencesRef preferencesRef);
+WK_EXPORT void WKPreferencesSetCaptureVideoInUIProcessEnabled(WKPreferencesRef preferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetCaptureVideoInUIProcessEnabled(WKPreferencesRef preferencesRef);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit/UIProcess/WebPreferences.cpp

@@ -140 +140 @@
         return;
     }
+    if (key == WebPreferencesKey::captureAudioInUIProcessEnabledKey()) {
+        for (auto* page : m_pages)
+            page->process().processPool().configuration().setShouldCaptureAudioInUIProcess(value);
+
+        return;
+    }
+    if (key == WebPreferencesKey::captureVideoInUIProcessEnabledKey()) {
+        for (auto* page : m_pages)
+            page->process().processPool().configuration().setShouldCaptureVideoInUIProcess(value);
+
+        return;
+    }
 
     update(); // FIXME: Only send over the changed key and value.

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -920 +920 @@
 #if ENABLE(MEDIA_STREAM)
     parameters.shouldCaptureAudioInUIProcess = m_configuration->shouldCaptureAudioInUIProcess();
+    parameters.shouldCaptureVideoInUIProcess = m_configuration->shouldCaptureVideoInUIProcess();
     parameters.shouldCaptureDisplayInUIProcess = m_configuration->shouldCaptureDisplayInUIProcess();
 #endif
@@ -1147 +1148 @@
     auto page = process->createWebPage(pageClient, WTFMove(pageConfiguration));
     m_configuration->setProcessSwapsOnNavigationFromExperimentalFeatures(page->preferences().processSwapOnCrossSiteNavigationEnabled());
+    m_configuration->setShouldCaptureAudioInUIProcess(page->preferences().captureAudioInUIProcessEnabled());
+    m_configuration->setShouldCaptureVideoInUIProcess(page->preferences().captureVideoInUIProcessEnabled());
 
     return page;

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

@@ -220 +220 @@
     if (parameters.shouldCaptureAudioInUIProcess)
         RealtimeMediaSourceCenter::setAudioFactory(*this);
+    if (parameters.shouldCaptureVideoInUIProcess)
+        RealtimeMediaSourceCenter::setVideoFactory(*this);
     if (parameters.shouldCaptureDisplayInUIProcess)
         RealtimeMediaSourceCenter::setDisplayCaptureFactory(*this);