Changeset 284831 in webkit

Timestamp:

Oct 25, 2021, 2:51:00 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r283975. rdar://problem/84630618

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.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@283975 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612-branch/Source/WebKit

Files:

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

branches/safari-612-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-25  Null  <null@apple.com>
+
+        Cherry-pick r283975. rdar://problem/84630618
+
+    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.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-25  Null  <null@apple.com>
 

branches/safari-612-branch/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;
+        }
     }