Changeset 283975 in webkit

Timestamp:

Oct 12, 2021, 2:45:17 AM (5 years ago)

Author:

youenn@apple.com

Message:

Error the encoder in case we cannot create a RemoteVideoSample
​https://bugs.webkit.org/show_bug.cgi?id=231505
<rdar://83975229>

Reviewed by Eric Carlson.

• WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp:

(WebKit::LibWebRTCCodecs::encodeFrame):
RemoteVideoSample::create can return nullptr if we cannot get an IOSurface from the pixel buffer or if pixel buffer is null
due to VTPixelBufferConformerCopyConformedPixelBuffer failing.
In that case, we error the encoder instead of trying to encode the frame.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-12  Youenn Fablet  <youenn@apple.com>
+
+        Error the encoder in case we cannot create a RemoteVideoSample
+        https://bugs.webkit.org/show_bug.cgi?id=231505
+        <rdar://83975229>
+
+        Reviewed by Eric Carlson.
+
+        * WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp:
+        (WebKit::LibWebRTCCodecs::encodeFrame):
+        RemoteVideoSample::create can return nullptr if we cannot get an IOSurface from the pixel buffer or if pixel buffer is null
+        due to VTPixelBufferConformerCopyConformedPixelBuffer failing.
+        In that case, we error the encoder instead of trying to encode the frame.
+
 2021-10-11  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp

@@ -32 +32 @@
 #include "LibWebRTCCodecsMessages.h"
 #include "LibWebRTCCodecsProxyMessages.h"
+#include "Logging.h"
 #include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
@@ -448 +449 @@
         // FIXME: Optimize this code path, currently we have non BGRA for muted frames at least.
         sample = RemoteVideoSample::create(convertToBGRA(pixelBuffer.get()), MediaTime(frame.timestamp_us() * 1000, 1000000), toMediaSampleVideoRotation(frame.rotation()));
+        if (!sample) {
+            RELEASE_LOG_ERROR(WebRTC, "Unable to convert remote video sample");
+            return WEBRTC_VIDEO_CODEC_ERROR;
+        }
     }