Changeset 284102 in webkit

Timestamp:

Oct 13, 2021, 10:28:28 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

WebGL video texture upload is very slow due to excessive transfer of the video pixel buffer
​https://bugs.webkit.org/show_bug.cgi?id=231425

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-10-13
Reviewed by Youenn Fablet.

Typical WebGL content requests the videos to be uploaded to a texture
once per render loop update, even though the video has not changed.
The video pixel buffer is slow to transfer across IPC. It should be transferred
only when it has changed.

MediaPlayerPrivateAVFoundationObjC and MediaPlayerPrivateMediaSourceAVFObjC hold
the last requested pixel buffer ref. They will update it or discard it only
when pixelBufferForCurrentTime() is called.

Cache the pixel buffer to MediaPlayerPrivateRemote (GPUP side proxy)
Cache the pixel buffer to RemoteMediaPlayerProxy (WebP side proxy)

The caches increase the total memory use only during the duration
of the call, since after the ref has been updated, it refers
to the one always held in the original objects (MediaPlayerPrivateAVFoundationObjC
and MediaPlayerPrivateMediaSourceAVFObjC)

No new tests, fixes a perf regression wrt GPUP media.

• GPUProcess/media/RemoteMediaPlayerProxy.cpp:

(WebKit::RemoteMediaPlayerProxy::invalidate):

• GPUProcess/media/RemoteMediaPlayerProxy.h:
• GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
• GPUProcess/media/cocoa/RemoteMediaPlayerProxyCocoa.mm:

(WebKit::RemoteMediaPlayerProxy::nativeImageForCurrentTime):
(WebKit::RemoteMediaPlayerProxy::pixelBufferForCurrentTimeIfChanged):
(WebKit::RemoteMediaPlayerProxy::pixelBufferForCurrentTime): Deleted.

• WebProcess/GPU/media/MediaPlayerPrivateRemote.h:
• WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm:

(WebKit::MediaPlayerPrivateRemote::pixelBufferForCurrentTime):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/media/RemoteMediaPlayerProxy.cpp (modified) (1 diff)
• GPUProcess/media/RemoteMediaPlayerProxy.h (modified) (2 diffs)
• GPUProcess/media/RemoteMediaPlayerProxy.messages.in (modified) (1 diff)
• GPUProcess/media/cocoa/RemoteMediaPlayerProxyCocoa.mm (modified) (1 diff)
• WebProcess/GPU/media/MediaPlayerPrivateRemote.h (modified) (1 diff)
• WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-13  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        WebGL video texture upload is very slow due to excessive transfer of the video pixel buffer
+        https://bugs.webkit.org/show_bug.cgi?id=231425
+
+        Reviewed by Youenn Fablet.
+
+        Typical WebGL content requests the videos to be uploaded to a texture
+        once per render loop update, even though the video has not changed.
+        The video pixel buffer is slow to transfer across IPC. It should be transferred
+        only when it has changed.
+
+        MediaPlayerPrivateAVFoundationObjC and MediaPlayerPrivateMediaSourceAVFObjC hold
+        the last requested pixel buffer ref. They will update it or discard it only
+        when pixelBufferForCurrentTime() is called.
+
+        Cache the pixel buffer to MediaPlayerPrivateRemote (GPUP side proxy)
+        Cache the pixel buffer to RemoteMediaPlayerProxy (WebP side proxy)
+
+        The caches increase the total memory use only during the duration
+        of the call, since after the ref has been updated, it refers
+        to the one always held in the original objects (MediaPlayerPrivateAVFoundationObjC
+        and MediaPlayerPrivateMediaSourceAVFObjC)
+
+        No new tests, fixes a perf regression wrt GPUP media.
+
+        * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
+        (WebKit::RemoteMediaPlayerProxy::invalidate):
+        * GPUProcess/media/RemoteMediaPlayerProxy.h:
+        * GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
+        * GPUProcess/media/cocoa/RemoteMediaPlayerProxyCocoa.mm:
+        (WebKit::RemoteMediaPlayerProxy::nativeImageForCurrentTime):
+        (WebKit::RemoteMediaPlayerProxy::pixelBufferForCurrentTimeIfChanged):
+        (WebKit::RemoteMediaPlayerProxy::pixelBufferForCurrentTime): Deleted.
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.h:
+        * WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm:
+        (WebKit::MediaPlayerPrivateRemote::pixelBufferForCurrentTime):
+
 2021-10-13  Per Arne Vollan <pvollan@apple.com>
 

trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp

@@ -107 +107 @@
     }
     m_renderingResourcesRequest = { };
+#if USE(AVFOUNDATION)
+    m_pixelBufferForCurrentTime = nullptr;
+#endif
 }
 

trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h

@@ -315 +315 @@
 #endif
 #if USE(AVFOUNDATION)
-    void pixelBufferForCurrentTime(CompletionHandler<void(RetainPtr<CVPixelBufferRef>&&)>&&);
+    void pixelBufferForCurrentTimeIfChanged(CompletionHandler<void(std::optional<RetainPtr<CVPixelBufferRef>>&&)>&&);
 #endif
 
@@ -370 +370 @@
 
     bool m_observingTimeChanges { false };
-
+#if USE(AVFOUNDATION)
+    RetainPtr<CVPixelBufferRef> m_pixelBufferForCurrentTime;
+#endif
 #if !RELEASE_LOG_DISABLED
     const Logger& m_logger;

trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in

@@ -127 +127 @@
 #endif
 #if USE(AVFOUNDATION)
-    PixelBufferForCurrentTime() -> (RetainPtr<CVPixelBufferRef> pixelBuffer) Synchronous
+    PixelBufferForCurrentTimeIfChanged() -> (std::optional<RetainPtr<CVPixelBufferRef>> pixelBuffer) Synchronous
 #endif
 

trunk/Source/WebKit/GPUProcess/media/cocoa/RemoteMediaPlayerProxyCocoa.mm

@@ -112 +112 @@
 }
 
-void RemoteMediaPlayerProxy::pixelBufferForCurrentTime(CompletionHandler<void(RetainPtr<CVPixelBufferRef>&&)>&& completionHandler)
+#if USE(AVFOUNDATION)
+void RemoteMediaPlayerProxy::pixelBufferForCurrentTimeIfChanged(CompletionHandler<void(std::optional<RetainPtr<CVPixelBufferRef>>&&)>&& completionHandler)
 {
-    RetainPtr<CVPixelBufferRef> result;
+    std::optional<RetainPtr<CVPixelBufferRef>> result;
+    RetainPtr<CVPixelBufferRef> pixelBuffer;
     if (m_player)
-        result = m_player->pixelBufferForCurrentTime();
+        pixelBuffer = m_player->pixelBufferForCurrentTime();
+    if (m_pixelBufferForCurrentTime != pixelBuffer) {
+        result = pixelBuffer;
+        m_pixelBufferForCurrentTime = WTFMove(pixelBuffer);
+    }
     completionHandler(WTFMove(result));
 }
+#endif
 
 } // namespace WebKit

trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h

@@ -446 +446 @@
     bool m_timeIsProgressing { false };
     bool m_renderingCanBeAccelerated { false };
+#if USE(AVFOUNDATION)
+    RetainPtr<CVPixelBufferRef> m_pixelBufferForCurrentTime;
+#endif
 };
 

trunk/Source/WebKit/WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm

@@ -67 +67 @@
 }
 
+#if USE(AVFOUNDATION)
 RetainPtr<CVPixelBufferRef> MediaPlayerPrivateRemote::pixelBufferForCurrentTime()
 {
-
-    RetainPtr<CVPixelBufferRef> result;
-    if (!connection().sendSync(Messages::RemoteMediaPlayerProxy::PixelBufferForCurrentTime(), Messages::RemoteMediaPlayerProxy::PixelBufferForCurrentTime::Reply(result), m_id))
+    std::optional<RetainPtr<CVPixelBufferRef>> result;
+    if (!connection().sendSync(Messages::RemoteMediaPlayerProxy::PixelBufferForCurrentTimeIfChanged(), Messages::RemoteMediaPlayerProxy::PixelBufferForCurrentTimeIfChanged::Reply(result), m_id))
         return nullptr;
-    return result;
+    if (result)
+        m_pixelBufferForCurrentTime = WTFMove(*result);
+    return m_pixelBufferForCurrentTime;
 }
+#endif
 
 } // namespace WebKit