VideoDecoder.configure should not throw on unsupported codecs

https://bugs.webkit.org/show_bug.cgi?id=260622 rdar://114336853 Reviewed by Eric Carlson. Make sure isConfigSupported resolves the promise with unsupported = true in this case. Ditto for VideoDecoder.configure. To do this, we add additional checks in LibWebRTCCodecsProxy to better validate codec string support in GPUProcess. Since decoder creation may now fail, we update IPC code like for encoders to return the failure to WebProcess. We add specific checks for VP9, H264 and H265. * LayoutTests/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.js: (validButUnsupportedConfigs.forEach.entry.promise_test.async t): (validConfigs.forEach.entry.promise_test.async t): * LayoutTests/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.worker-expected.txt: * LayoutTests/platform/glib/TestExpectations: * Source/WebCore/Modules/webcodecs/WebCodecsVideoDecoder.cpp: (WebCore::isSupportedDecoderCodec): (WebCore::isValidDecoderConfig): (WebCore::WebCodecsVideoDecoder::configure): (WebCore::WebCodecsVideoDecoder::isConfigSupported): * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/platform/graphics/HEVCUtilities.cpp: (WebCore::parseAVCCodecParameters): * Source/WebCore/platform/graphics/cocoa/HEVCUtilitiesCocoa.h: * Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.h: * Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in: * Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm: (WebKit::validateCodecString): (WebKit::LibWebRTCCodecsProxy::createDecoder): (WebKit::LibWebRTCCodecsProxy::releaseDecoder): (WebKit::LibWebRTCCodecsProxy::doDecoderTask): * Source/WebKit/WebProcess/GPU/media/RemoteVideoCodecFactory.cpp: (WebKit::RemoteVideoCodecFactory::createDecoder): * Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp: (WebKit::LibWebRTCCodecs::videoCodecTypeFromWebCodec): (WebKit::createRemoteDecoder): (WebKit::LibWebRTCCodecs::createDecoder): (WebKit::LibWebRTCCodecs::createDecoderAndWaitUntilReady): (WebKit::LibWebRTCCodecs::createDecoderInternal): (WebKit::LibWebRTCCodecs::gpuProcessConnectionDidClose): * Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.h: Canonical link: https://commits.webkit.org/267272@main
WebKit · Aug 25, 2023 · a7b3c2e · a7b3c2e
1 parent 7b938d0
commit a7b3c2e
Show file tree

Hide file tree

Showing 14 changed files with 251 additions and 66 deletions.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any-expected.txt
@@ -1,13 +1,26 @@
 
+PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Missing codec
 PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Empty codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Unrecognized codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Audio codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Ambiguous codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Codec with MIME type
+PASS Test that VideoDecoder.configure() rejects invalid config:Missing codec
 PASS Test that VideoDecoder.configure() rejects invalid config:Empty codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Unrecognized codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Audio codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Ambiguous codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Codec with MIME type
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Unrecognized codec
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Unrecognized codec with dataview description
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Audio codec
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Ambiguous codec
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Codec with MIME type
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future H264 codec string
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future HEVC codec string
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future VP9 codec string
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future AV1 codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Unrecognized codec
+PASS Test that VideoDecoder.configure() doesn't support config: Unrecognized codec with dataview description
+PASS Test that VideoDecoder.configure() doesn't support config: Audio codec
+PASS Test that VideoDecoder.configure() doesn't support config: Ambiguous codec
+PASS Test that VideoDecoder.configure() doesn't support config: Codec with MIME type
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future H264 codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future HEVC codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future VP9 codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future AV1 codec string
 PASS Test VideoDecoder construction
+PASS Test that VideoDecoder.isConfigSupported() accepts config:valid codec with spaces
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.js b/LayoutTests/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.js
@@ -2,14 +2,54 @@
 // META: script=/webcodecs/utils.js
 
 const invalidConfigs = [
+  {
+    comment: 'Missing codec',
+    config: {},
+  },
   {
     comment: 'Empty codec',
     config: {codec: ''},
   },
+];  // invalidConfigs
+
+invalidConfigs.forEach(entry => {
+  promise_test(
+      t => {
+        return promise_rejects_js(
+            t, TypeError, VideoDecoder.isConfigSupported(entry.config));
+      },
+      'Test that VideoDecoder.isConfigSupported() rejects invalid config:' +
+          entry.comment);
+});
+
+invalidConfigs.forEach(entry => {
+  async_test(
+      t => {
+        let codec = new VideoDecoder(getDefaultCodecInit(t));
+        assert_throws_js(TypeError, () => {
+          codec.configure(entry.config);
+        });
+        t.done();
+      },
+      'Test that VideoDecoder.configure() rejects invalid config:' +
+          entry.comment);
+});
+
+const arrayBuffer = new ArrayBuffer(12583);
+const arrayBufferView = new DataView(arrayBuffer);
+
+const validButUnsupportedConfigs = [
   {
     comment: 'Unrecognized codec',
     config: {codec: 'bogus'},
   },
+  {
+    comment: 'Unrecognized codec with dataview description',
+    config: {
+      codec: '7󠎢ﷺ۹.9',
+      description: arrayBufferView,
+    },
+  },
   {
     comment: 'Audio codec',
     config: {codec: 'vorbis'},
@@ -22,28 +62,54 @@ const invalidConfigs = [
     comment: 'Codec with MIME type',
     config: {codec: 'video/webm; codecs="vp8"'},
   },
-];  //  invalidConfigs
+  {
+    comment: 'Possible future H264 codec string',
+    config: {codec: 'avc1.FF000b'},
+  },
+  {
+    comment: 'Possible future HEVC codec string',
+    config: {codec: 'hvc1.C99.6FFFFFF.L93'},
+  },
+  {
+    comment: 'Possible future VP9 codec string',
+    config: {codec: 'vp09.99.99.08'},
+  },
+  {
+    comment: 'Possible future AV1 codec string',
+    config: {codec: 'av01.9.99M.08'},
+  },
+];  //  validButUnsupportedConfigs
 
-invalidConfigs.forEach(entry => {
+validButUnsupportedConfigs.forEach(entry => {
   promise_test(
       t => {
-        return promise_rejects_js(
-            t, TypeError, VideoDecoder.isConfigSupported(entry.config));
+        return VideoDecoder.isConfigSupported(entry.config).then(support => {
+          assert_false(support.supported);
+        });
       },
-      'Test that VideoDecoder.isConfigSupported() rejects invalid config:' +
+      'Test that VideoDecoder.isConfigSupported() doesn\'t support config: ' +
           entry.comment);
 });
 
-invalidConfigs.forEach(entry => {
-  async_test(
-      t => {
-        let codec = new VideoDecoder(getDefaultCodecInit(t));
-        assert_throws_js(TypeError, () => {
-          codec.configure(entry.config);
+validButUnsupportedConfigs.forEach(entry => {
+  promise_test(
+    async t => {
+        const callbacks = {
+          output: t.unreached_func('unexpected output'),
+        };
+        const error = new Promise(resolve => callbacks.error = e => {
+          resolve(e);
         });
+        let codec = new VideoDecoder(callbacks);
+        codec.configure(entry.config);
+        let e = await error;
+        assert_true(e instanceof DOMException);
+        assert_equals(e.name, 'NotSupportedError');
+        assert_equals(codec.state, 'closed', 'state');
+
         t.done();
       },
-      'Test that VideoDecoder.configure() rejects invalid config:' +
+      'Test that VideoDecoder.configure() doesn\'t support config: ' +
           entry.comment);
 });
 
@@ -62,3 +128,23 @@ promise_test(t => {
 
   return endAfterEventLoopTurn();
 }, 'Test VideoDecoder construction');
+
+const validConfigs = [
+  {
+    comment: 'valid codec with spaces',
+    config: {codec: '  vp09.00.10.08  '},
+  },
+];  // validConfigs
+
+validConfigs.forEach(entry => {
+  promise_test(
+    async t => {
+      try {
+        await VideoDecoder.isConfigSupported(entry.config);
+      } catch (e) {
+        assert_true(false, entry.comment + ' should not throw');
+      }
+    },
+    'Test that VideoDecoder.isConfigSupported() accepts config:' +
+        entry.comment);
+});
diff --git a/...sts/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.worker-expected.txt b/...sts/imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.worker-expected.txt
@@ -1,13 +1,26 @@
 
+PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Missing codec
 PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Empty codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Unrecognized codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Audio codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Ambiguous codec
-PASS Test that VideoDecoder.isConfigSupported() rejects invalid config:Codec with MIME type
+PASS Test that VideoDecoder.configure() rejects invalid config:Missing codec
 PASS Test that VideoDecoder.configure() rejects invalid config:Empty codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Unrecognized codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Audio codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Ambiguous codec
-PASS Test that VideoDecoder.configure() rejects invalid config:Codec with MIME type
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Unrecognized codec
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Unrecognized codec with dataview description
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Audio codec
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Ambiguous codec
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Codec with MIME type
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future H264 codec string
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future HEVC codec string
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future VP9 codec string
+PASS Test that VideoDecoder.isConfigSupported() doesn't support config: Possible future AV1 codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Unrecognized codec
+PASS Test that VideoDecoder.configure() doesn't support config: Unrecognized codec with dataview description
+PASS Test that VideoDecoder.configure() doesn't support config: Audio codec
+PASS Test that VideoDecoder.configure() doesn't support config: Ambiguous codec
+PASS Test that VideoDecoder.configure() doesn't support config: Codec with MIME type
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future H264 codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future HEVC codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future VP9 codec string
+PASS Test that VideoDecoder.configure() doesn't support config: Possible future AV1 codec string
 PASS Test VideoDecoder construction
+PASS Test that VideoDecoder.isConfigSupported() accepts config:valid codec with spaces
 
diff --git a/LayoutTests/platform/glib/TestExpectations b/LayoutTests/platform/glib/TestExpectations
@@ -1149,6 +1149,10 @@ imported/w3c/web-platform-tests/webcodecs/videoFrame-createImageBitmap.any.worke
 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 ]
 
+# Detection of bad HEVC codec string
+imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.html [ Skip ]
+imported/w3c/web-platform-tests/webcodecs/video-decoder.https.any.worker.html [ Skip ]
+
 # This test is flaky crashing with the current GStreamer version of the SDK (1.22), raising a
 # critical warning in GStreamer, but the issue is not happening with GStreamer 1.23. So this test is
 # expected to pass again once we update to GStreamer 1.24.

diff --git a/Source/WebCore/Modules/webcodecs/WebCodecsVideoDecoder.cpp b/Source/WebCore/Modules/webcodecs/WebCodecsVideoDecoder.cpp
@@ -38,6 +38,7 @@
 #include "WebCodecsErrorCallback.h"
 #include "WebCodecsVideoFrame.h"
 #include "WebCodecsVideoFrameOutputCallback.h"
+#include <wtf/ASCIICType.h>
 #include <wtf/IsoMallocInlines.h>
 
 namespace WebCore {
@@ -62,10 +63,17 @@ WebCodecsVideoDecoder::~WebCodecsVideoDecoder()
 {
 }
 
-static bool isValidDecoderConfig(const WebCodecsVideoDecoderConfig& config, const Settings::Values& settings)
+static bool isSupportedDecoderCodec(const String& codec, const Settings::Values& settings)
 {
-    // FIXME: Check codec more accurately.
-    if (!config.codec.startsWith("vp8"_s) && !config.codec.startsWith("vp09."_s) && !config.codec.startsWith("avc1."_s) && !(config.codec.startsWith("hev1."_s) && settings.webCodecsHEVCEnabled) && !(config.codec.startsWith("hvc1."_s) && settings.webCodecsHEVCEnabled) && !(config.codec.startsWith("av01."_s) && settings.webCodecsAV1Enabled))
+    return codec.startsWith("vp8"_s) || codec.startsWith("vp09.0"_s) || codec.startsWith("avc1."_s)
+        || (codec.startsWith("hev1."_s) && settings.webCodecsHEVCEnabled)
+        || (codec.startsWith("hvc1."_s) && settings.webCodecsHEVCEnabled)
+        || (codec.startsWith("av01.0"_s) && settings.webCodecsAV1Enabled);
+}
+
+static bool isValidDecoderConfig(const WebCodecsVideoDecoderConfig& config)
+{
+    if (StringView(config.codec).trim(isASCIIWhitespace<UChar>).isEmpty())
         return false;
 
     if (!!config.codedWidth != !!config.codedHeight)
@@ -108,7 +116,7 @@ static VideoDecoder::Config createVideoDecoderConfig(const WebCodecsVideoDecoder
 
 ExceptionOr<void> WebCodecsVideoDecoder::configure(ScriptExecutionContext& context, WebCodecsVideoDecoderConfig&& config)
 {
-    if (!isValidDecoderConfig(config, context.settingsValues()))
+    if (!isValidDecoderConfig(config))
         return Exception { TypeError, "Config is not valid"_s };
 
     if (m_state == WebCodecsCodecState::Closed || !scriptExecutionContext())
@@ -117,7 +125,8 @@ ExceptionOr<void> WebCodecsVideoDecoder::configure(ScriptExecutionContext& conte
     m_state = WebCodecsCodecState::Configured;
     m_isKeyChunkRequired = true;
 
-    queueControlMessageAndProcess([this, config = WTFMove(config), identifier = scriptExecutionContext()->identifier()]() mutable {
+    bool isSupportedCodec = isSupportedDecoderCodec(config.codec, context.settingsValues());
+    queueControlMessageAndProcess([this, config = WTFMove(config), isSupportedCodec, identifier = scriptExecutionContext()->identifier()]() mutable {
         m_isMessageQueueBlocked = true;
         VideoDecoder::PostTaskCallback postTaskCallback = [identifier, weakThis = WeakPtr { *this }](auto&& task) {
             ScriptExecutionContext::postTaskTo(identifier, [weakThis, task = WTFMove(task)](auto&) mutable {
@@ -129,6 +138,11 @@ ExceptionOr<void> WebCodecsVideoDecoder::configure(ScriptExecutionContext& conte
             });
         };
 
+        if (!isSupportedCodec) {
+            closeDecoder(Exception { NotSupportedError, "Codec is not supported"_s });
+            return;
+        }
+
         VideoDecoder::create(config.codec, createVideoDecoderConfig(config), [this](auto&& result) {
             if (!result.has_value()) {
                 closeDecoder(Exception { NotSupportedError, WTFMove(result.error()) });
@@ -219,11 +233,16 @@ ExceptionOr<void> WebCodecsVideoDecoder::close()
 
 void WebCodecsVideoDecoder::isConfigSupported(ScriptExecutionContext& context, WebCodecsVideoDecoderConfig&& config, Ref<DeferredPromise>&& promise)
 {
-    if (!isValidDecoderConfig(config, context.settingsValues())) {
+    if (!isValidDecoderConfig(config)) {
         promise->reject(Exception { TypeError, "Config is not valid"_s });
         return;
     }
 
+    if (!isSupportedDecoderCodec(config.codec, context.settingsValues())) {
+        promise->template resolve<IDLDictionary<WebCodecsVideoDecoderSupport>>(WebCodecsVideoDecoderSupport { false, WTFMove(config) });
+        return;
+    }
+
     auto* promisePtr = promise.ptr();
     context.addDeferredPromise(WTFMove(promise));
 

diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -5063,8 +5063,8 @@
 		CDA29A171CBDA56C00901CCF /* PlaybackSessionInterfaceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A151CBDA56C00901CCF /* PlaybackSessionInterfaceMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA29A2F1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.mm */; };
 		CDA29A321CC01A9500901CCF /* PlaybackSessionInterfaceAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA29A2E1CBF73FC00901CCF /* PlaybackSessionInterfaceAVKit.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		CDA595932146DEC300A84185 /* HEVCUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA595912146DEC300A84185 /* HEVCUtilities.h */; };
-		CDA595982146DF7800A84185 /* HEVCUtilitiesCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA595962146DF7800A84185 /* HEVCUtilitiesCocoa.h */; };
+		CDA595932146DEC300A84185 /* HEVCUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA595912146DEC300A84185 /* HEVCUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		CDA595982146DF7800A84185 /* HEVCUtilitiesCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA595962146DF7800A84185 /* HEVCUtilitiesCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CDA79827170A279100D45C55 /* AudioSessionIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDA79825170A279000D45C55 /* AudioSessionIOS.mm */; };
 		CDA7982A170A3D0000D45C55 /* AudioSession.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA79821170A22DC00D45C55 /* AudioSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CDA9593524123CB800910EEF /* MediaSessionHelperIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD875A752411B79800B09F58 /* MediaSessionHelperIOS.mm */; };

diff --git a/Source/WebCore/platform/graphics/HEVCUtilities.cpp b/Source/WebCore/platform/graphics/HEVCUtilities.cpp
@@ -64,9 +64,9 @@ std::optional<AVCParameters> parseAVCCodecParameters(StringView codecString)
     auto profileFlagsAndLevel = parseInteger<uint32_t>(*nextElement, 16);
     if (!profileFlagsAndLevel)
         return std::nullopt;
-    parameters.profileIDC = (*profileFlagsAndLevel & 0xF00) >> 16;
-    parameters.constraintsFlags = (*profileFlagsAndLevel & 0xF0) >> 8;
-    parameters.levelIDC = *profileFlagsAndLevel & 0xF;
+    parameters.profileIDC = (*profileFlagsAndLevel >> 16) & 0xFF;
+    parameters.constraintsFlags = (*profileFlagsAndLevel >> 8) & 0xFF;
+    parameters.levelIDC = *profileFlagsAndLevel & 0xFF;
 
     return parameters;
 }

diff --git a/Source/WebCore/platform/graphics/cocoa/HEVCUtilitiesCocoa.h b/Source/WebCore/platform/graphics/cocoa/HEVCUtilitiesCocoa.h
@@ -33,7 +33,7 @@ namespace WebCore {
 
 struct MediaCapabilitiesInfo;
 
-std::optional<MediaCapabilitiesInfo> validateHEVCParameters(const HEVCParameters&, bool hasAlphaChannel, bool hdrSupport);
+WEBCORE_EXPORT std::optional<MediaCapabilitiesInfo> validateHEVCParameters(const HEVCParameters&, bool hasAlphaChannel, bool hdrSupport);
 std::optional<MediaCapabilitiesInfo> validateDoViParameters(const DoViParameters&, bool hasAlphaChannel, bool hdrSupport);
 
 }

diff --git a/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.h b/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.h
@@ -82,7 +82,7 @@ class LibWebRTCCodecsProxy final : public IPC::WorkQueueMessageReceiver {
     // IPC::WorkQueueMessageReceiver overrides.
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
 
-    void createDecoder(VideoDecoderIdentifier, VideoCodecType, bool useRemoteFrames, bool enableAdditionalLogging);
+    void createDecoder(VideoDecoderIdentifier, VideoCodecType, const String& codecString, bool useRemoteFrames, bool enableAdditionalLogging, CompletionHandler<void(bool)>&&);
     void releaseDecoder(VideoDecoderIdentifier);
     void flushDecoder(VideoDecoderIdentifier);
     void setDecoderFormatDescription(VideoDecoderIdentifier, const IPC::DataReference&, uint16_t width, uint16_t height);

diff --git a/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in b/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in
@@ -24,7 +24,7 @@
 #if USE(LIBWEBRTC) && PLATFORM(COCOA) && ENABLE(GPU_PROCESS)
 
 messages -> LibWebRTCCodecsProxy NotRefCounted {
-    CreateDecoder(WebKit::VideoDecoderIdentifier id, enum:uint8_t WebKit::VideoCodecType codecType, bool useRemoteFrames, bool enableAdditionalLogging)
+    CreateDecoder(WebKit::VideoDecoderIdentifier id, enum:uint8_t WebKit::VideoCodecType codecType, String codecString, bool useRemoteFrames, bool enableAdditionalLogging) -> (bool success);
     ReleaseDecoder(WebKit::VideoDecoderIdentifier id)
     FlushDecoder(WebKit::VideoDecoderIdentifier id)
     SetDecoderFormatDescription(WebKit::VideoDecoderIdentifier id, IPC::DataReference description, uint16_t width, uint16_t height)