Changeset 283369 in webkit

Timestamp:

Oct 1, 2021, 8:34:21 AM (5 years ago)

Author:

youenn@apple.com

Message:

Attribute IOSurfaces created by camera and decoders to responsible WebProcess
​https://bugs.webkit.org/show_bug.cgi?id=231075

Reviewed by Chris Dumez.

Source/WebCore:

Manually tested.

• platform/graphics/RemoteVideoSample.h:

Source/WebKit:

Make sure to mark camera and decoder generated IOSurfaces as owned by the responsible WebProcess.

• GPUProcess/GPUConnectionToWebProcess.cpp:
• GPUProcess/webrtc/LibWebRTCCodecsProxy.mm:
• UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
• UIProcess/Cocoa/UserMediaCaptureManagerProxy.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/RemoteVideoSample.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/GPUProcess/GPUConnectionToWebProcess.cpp (modified) (1 diff)
• WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm (modified) (4 diffs)
• WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp (modified) (4 diffs)
• WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-01  Youenn Fablet  <youenn@apple.com>
+
+        Attribute IOSurfaces created by camera and decoders to responsible WebProcess
+        https://bugs.webkit.org/show_bug.cgi?id=231075
+
+        Reviewed by Chris Dumez.
+
+        Manually tested.
+
+        * platform/graphics/RemoteVideoSample.h:
+
 2021-10-01  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/RemoteVideoSample.h

@@ -48 +48 @@
     WEBCORE_EXPORT static std::unique_ptr<RemoteVideoSample> create(RetainPtr<CVPixelBufferRef>&&, MediaTime&& presentationTime, MediaSample::VideoRotation = MediaSample::VideoRotation::None);
     WEBCORE_EXPORT IOSurfaceRef surface() const;
+
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+    void setOwnershipIdentity(task_id_token_t newOwner);
+#endif
 
     const MediaTime& time() const { return m_time; }
@@ -116 +120 @@
 };
 
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+inline void RemoteVideoSample::setOwnershipIdentity(task_id_token_t newOwner)
+{
+    if (m_ioSurface)
+        m_ioSurface->setOwnershipIdentity(newOwner);
+}
+#endif
+
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-01  Youenn Fablet  <youenn@apple.com>
+
+        Attribute IOSurfaces created by camera and decoders to responsible WebProcess
+        https://bugs.webkit.org/show_bug.cgi?id=231075
+
+        Reviewed by Chris Dumez.
+
+        Make sure to mark camera and decoder generated IOSurfaces as owned by the responsible WebProcess.
+
+        * GPUProcess/GPUConnectionToWebProcess.cpp:
+        * GPUProcess/webrtc/LibWebRTCCodecsProxy.mm:
+        * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
+        * UIProcess/Cocoa/UserMediaCaptureManagerProxy.h:
+
 2021-10-01  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp

@@ -189 +189 @@
     }
 
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+    std::optional<task_id_token_t> webProcessIdentityToken() const final
+    {
+        return m_process.webProcessIdentityToken();
+    }
+#endif
+
     GPUConnectionToWebProcess& m_process;
 };

trunk/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm

@@ -75 +75 @@
 }
 
+static Function<void(CVPixelBufferRef pixelBuffer, uint32_t timeStampNs, uint32_t timeStamp)> createDecoderCallback(RTCDecoderIdentifier identifier, GPUConnectionToWebProcess& gpuConnectionToWebProcess)
+{
+    return [connection = Ref { gpuConnectionToWebProcess.connection() },
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+        token = gpuConnectionToWebProcess.webProcessIdentityToken(),
+#endif
+        identifier](CVPixelBufferRef pixelBuffer, uint32_t timeStampNs, uint32_t timeStamp) {
+        if (auto sample = WebCore::RemoteVideoSample::create(pixelBuffer, MediaTime(timeStampNs, 1))) {
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+            sample->setOwnershipIdentity(token);
+#endif
+            connection->send(Messages::LibWebRTCCodecs::CompletedDecoding { identifier, timeStamp, *sample }, 0);
+        }
+    };
+}
+
 void LibWebRTCCodecsProxy::createH264Decoder(RTCDecoderIdentifier identifier)
 {
@@ -80 +96 @@
     Locker locker { m_lock };
     ASSERT(!m_decoders.contains(identifier));
-    m_decoders.add(identifier, webrtc::createLocalH264Decoder(makeBlockPtr([connection = Ref { m_gpuConnectionToWebProcess.connection() }, identifier](CVPixelBufferRef pixelBuffer, uint32_t timeStampNs, uint32_t timeStamp) {
-        if (auto sample = WebCore::RemoteVideoSample::create(pixelBuffer, MediaTime(timeStampNs, 1)))
-            connection->send(Messages::LibWebRTCCodecs::CompletedDecoding { identifier, timeStamp, *sample }, 0);
-    }).get()));
+    m_decoders.add(identifier, webrtc::createLocalH264Decoder(makeBlockPtr(createDecoderCallback(identifier, m_gpuConnectionToWebProcess)).get()));
 }
 
@@ -91 +104 @@
     Locker locker { m_lock };
     ASSERT(!m_decoders.contains(identifier));
-    m_decoders.add(identifier, webrtc::createLocalH265Decoder(makeBlockPtr([connection = Ref { m_gpuConnectionToWebProcess.connection() }, identifier](CVPixelBufferRef pixelBuffer, uint32_t timeStampNs, uint32_t timeStamp) {
-        if (auto sample = WebCore::RemoteVideoSample::create(pixelBuffer, MediaTime(timeStampNs, 1)))
-            connection->send(Messages::LibWebRTCCodecs::CompletedDecoding { identifier, timeStamp, *sample }, 0);
-    }).get()));
+    m_decoders.add(identifier, webrtc::createLocalH265Decoder(makeBlockPtr(createDecoderCallback(identifier, m_gpuConnectionToWebProcess)).get()));
 }
 
@@ -102 +112 @@
     Locker locker { m_lock };
     ASSERT(!m_decoders.contains(identifier));
-    m_decoders.add(identifier, webrtc::createLocalVP9Decoder(makeBlockPtr([connection = Ref { m_gpuConnectionToWebProcess.connection() }, identifier](CVPixelBufferRef pixelBuffer, uint32_t timeStampNs, uint32_t timeStamp) {
-        if (auto sample = WebCore::RemoteVideoSample::create(pixelBuffer, MediaTime(timeStampNs, 1)))
-            connection->send(Messages::LibWebRTCCodecs::CompletedDecoding { identifier, timeStamp, *sample }, 0);
-    }).get()));
+    m_decoders.add(identifier, webrtc::createLocalVP9Decoder(makeBlockPtr(createDecoderCallback(identifier, m_gpuConnectionToWebProcess)).get()));
 }
 

trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp

@@ -126 +126 @@
 
     void setShouldApplyRotation(bool shouldApplyRotation) { m_shouldApplyRotation = true; }
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+    void setWebProcessIdentityToken(std::optional<task_id_token_t> token) { m_webProcessIdentityToken = token;}
+#endif
 
 private:
@@ -185 +188 @@
         } else
             remoteSample = RemoteVideoSample::create(sample);
-        if (remoteSample)
+        if (remoteSample) {
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+            if (m_webProcessIdentityToken)
+                remoteSample->setOwnershipIdentity(*m_webProcessIdentityToken);
+#endif
             m_connection->send(Messages::RemoteCaptureSampleManager::VideoSampleAvailable(m_id, WTFMove(*remoteSample)), 0);
+        }
     }
 
@@ -250 +258 @@
     MediaTime m_startTime;
     bool m_shouldReset { false };
+#if HAVE(TASK_IDENTITY_TOKEN)
+    std::optional<task_id_token_t> m_webProcessIdentityToken;
+#endif
 };
 
@@ -313 +324 @@
 
         ASSERT(!m_proxies.contains(id));
-        m_proxies.add(id, makeUnique<SourceProxy>(id, m_connectionProxy->connection(), WTFMove(source)));
+        auto proxy = makeUnique<SourceProxy>(id, m_connectionProxy->connection(), WTFMove(source));
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+        if (device.type() != WebCore::CaptureDevice::DeviceType::Microphone)
+            proxy->setWebProcessIdentityToken(m_connectionProxy->webProcessIdentityToken());
+#endif
+
+        m_proxies.add(id, WTFMove(proxy));
     } else
         invalidConstraints = WTFMove(sourceOrError.errorMessage);
-
 
     completionHandler(succeeded, invalidConstraints, WTFMove(settings), WTFMove(capabilities), WTFMove(presets), size, frameRate);

trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.h

@@ -59 +59 @@
         virtual Logger& logger() = 0;
         virtual bool setCaptureAttributionString() { return true; }
+#if HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
+        virtual std::optional<task_id_token_t> webProcessIdentityToken() const { return { }; };
+#endif
     };
     explicit UserMediaCaptureManagerProxy(UniqueRef<ConnectionProxy>&&);