VideoEncoder does not call output callback on FullHD configuration

https://bugs.webkit.org/show_bug.cgi?id=258669 rdar://111685821 Reviewed by Eric Carlson. Extract the profile level id from the codec string for H.264 and send it to GPUProcess for proper initialization. * LayoutTests/platform/glib/TestExpectations: * LayoutTests/http/wpt/webcodecs/videoFrame-colorSpace-expected.txt: * LayoutTests/http/wpt/webcodecs/videoFrame-colorSpace.html: * Source/WebKit/WebProcess/GPU/media/RemoteVideoCodecFactory.cpp: (WebKit::RemoteVideoCodecFactory::createEncoder): Canonical link: https://commits.webkit.org/265792@main
WebKit · Jul 6, 2023 · 9879838 · 9879838
1 parent 1e1eecd
commit 9879838
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/LayoutTests/http/wpt/webcodecs/videoFrame-colorSpace-expected.txt b/LayoutTests/http/wpt/webcodecs/videoFrame-colorSpace-expected.txt
@@ -2,4 +2,5 @@
 PASS VP8 decoded frame color space
 PASS VP9 decoded frame color space
 PASS H.264 decoded frame color space
+PASS H.264 high profile decoded frame color space
 
diff --git a/LayoutTests/http/wpt/webcodecs/videoFrame-colorSpace.html b/LayoutTests/http/wpt/webcodecs/videoFrame-colorSpace.html
@@ -62,11 +62,11 @@
   return promise;
 }
 
-function doTest(codec, title)
+function doTest(codec, title, width = 320, height = 200)
 {
   const config = { codec };
-  config.width = 320;
-  config.height = 200;
+  config.width = width;
+  config.height = height;
   config.bitrate = 1000000;
   config.framerate = 30;
 
@@ -81,6 +81,7 @@
 doTest('vp8', "VP8 decoded frame color space");
 doTest('vp09.00.10.08', "VP9 decoded frame color space");
 doTest('avc1.42001E', "H.264 decoded frame color space");
+doTest('avc1.64000b', "H.264 high profile decoded frame color space", 1000, 1000);
 </script>
 </body>
 </html>
diff --git a/LayoutTests/platform/glib/TestExpectations b/LayoutTests/platform/glib/TestExpectations
@@ -1129,6 +1129,8 @@ imported/w3c/web-platform-tests/webcodecs/temporal-svc-encoding.https.any.html?v
 
 imported/w3c/web-platform-tests/webcodecs/videoFrame-createImageBitmap.any.worker.html [ Pass ]
 
+http/wpt/webcodecs/videoFrame-colorSpace.html [ Skip ]
+
 # Likely bugs related with dav1ddec.
 imported/w3c/web-platform-tests/webcodecs/videoDecoder-codec-specific.https.any.html?av1 [ Failure ]
 imported/w3c/web-platform-tests/webcodecs/videoDecoder-codec-specific.https.any.worker.html?av1 [ Failure ]

diff --git a/Source/WebKit/WebProcess/GPU/media/RemoteVideoCodecFactory.cpp b/Source/WebKit/WebProcess/GPU/media/RemoteVideoCodecFactory.cpp
@@ -160,7 +160,15 @@ void RemoteVideoCodecFactory::createEncoder(const String& codec, const WebCore::
         return;
     }
 
-    WebProcess::singleton().libWebRTCCodecs().createEncoderAndWaitUntilReady(*type, { }, config.isRealtime, config.useAnnexB, [config, createCallback = WTFMove(createCallback), descriptionCallback = WTFMove(descriptionCallback), outputCallback = WTFMove(outputCallback), postTaskCallback = WTFMove(postTaskCallback)](auto& internalEncoder) mutable {
+    std::map<std::string, std::string> parameters;
+    if (type == VideoCodecType::H264) {
+        if (auto position = codec.find('.');position != notFound && position != codec.length()) {
+            auto profileLevelId = StringView(codec).substring(position + 1);
+            parameters["profile-level-id"] = std::string(reinterpret_cast<const char*>(profileLevelId.characters8()), profileLevelId.length());
+        }
+    }
+
+    WebProcess::singleton().libWebRTCCodecs().createEncoderAndWaitUntilReady(*type, parameters, config.isRealtime, config.useAnnexB, [config, createCallback = WTFMove(createCallback), descriptionCallback = WTFMove(descriptionCallback), outputCallback = WTFMove(outputCallback), postTaskCallback = WTFMove(postTaskCallback)](auto& internalEncoder) mutable {
         auto callbacks = RemoteVideoEncoderCallbacks::create(WTFMove(descriptionCallback), WTFMove(outputCallback), WTFMove(postTaskCallback));
         UniqueRef<VideoEncoder> encoder = makeUniqueRef<RemoteVideoEncoder>(internalEncoder, config, callbacks.copyRef());
         callbacks->postTask([createCallback = WTFMove(createCallback), encoder = WTFMove(encoder)]() mutable {