[EME] Check support for full content type (including codecs)

https://bugs.webkit.org/show_bug.cgi?id=310709

Reviewed by NOBODY (OOPS!).

When evaluating media capabilities for requestMediaKeySystemAccess,
we use pass ParsedContentType's m_mimeType to the MediaSource,
which omits parameters of the MIME type like codecs.

The right field to use here is m_contentType, so MediaSource
can check support against the full MIME type, rather than just
its container type.

* LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess-expected.txt:
* LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html: Add test with supported type but unknown codec.
* LayoutTests/platform/glib/TestExpectations: Unflag mock-navigator-requestMediaKeySystemAccess.html.
* LayoutTests/platform/ios/TestExpectations: Ditto.
* LayoutTests/platform/mac/TestExpectations: Ditto.
* Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp:
(WebCore::CDMPrivate::getSupportedCapabilitiesForAudioVideoType): Use full contentType for MediaEngineSupportParameters.
* Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::MockMediaPlayerMediaSource::supportsType): Return NotSupported if codec is 'unknown' or 'invalid'.
* Source/WebCore/platform/network/ParsedContentType.h:
(WebCore::ParsedContentType::contentType const): Added, returns m_contentType.

Original author: Andrzej Surdej <Andrzej_Surdej@comcast.com>
See: WebPlatformForEmbedded/WPEWebKit#1643

Author: vivienne-w

LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess-expected.txt

@@ -13,6 +13,11 @@ EXPECTED (access.getConfiguration().sessionTypes[0] == 'temporary') OK
 EXPECTED (access.getConfiguration().distinctiveIdentifier == 'not-allowed') OK
 EXPECTED (access.getConfiguration().persistentState == 'not-allowed') OK
 
+SET capabilities = '[ { "initDataTypes": [ "mock" ], "videoCapabilities": [ { "contentType": "video/mock; codecs=\"unknown\"" } ] } ]'
+RUN(promise = navigator.requestMediaKeySystemAccess("org.webkit.mock", capabilities))
+Promise rejected correctly OK
+EXPECTED (exceptionCode.name == 'NotSupportedError') OK
+
 SET capabilities = '[ { "initDataTypes": [ "mock" ], "videoCapabilities": [ { "contentType": "unknown/mime; codecs=\"unknown\"" } ] } ]'
 RUN(promise = navigator.requestMediaKeySystemAccess("org.webkit.mock", capabilities))
 Promise rejected correctly OK

LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html

@@ -66,6 +66,17 @@
                 });
         },
 
+        function() {
+            failingTestWithCapabilities([{
+                    initDataTypes: ['mock'],
+                    videoCapabilities: [{ contentType: 'video/mock; codecs="unknown"' }]
+                }],
+                exceptionCode => {
+                    window.exceptionCode = exceptionCode;
+                    testExpected('exceptionCode.name', 'NotSupportedError');
+                });
+        },
+
         function() {
             failingTestWithCapabilities([{
                     initDataTypes: ['mock'],

LayoutTests/platform/glib/TestExpectations

@@ -3450,7 +3450,6 @@ webkit.org/b/189345 http/tests/media/clearkey/collect-webkit-media-session.html
 
 media/encrypted-media [ Pass ]
 
-webkit.org/b/205857 media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html [ Skip ]
 webkit.org/b/205860 media/encrypted-media/mock-MediaKeySession-remove.html [ Skip ]
 
 

LayoutTests/platform/ios/TestExpectations

@@ -2777,9 +2777,6 @@ webkit.org/b/245610 http/tests/security/xss-DENIED-xsl-external-entity.xml [ Fai
 # Form validation popover does not obey minimum font size setting on iOS but Dynamic Type instead.
 fast/forms/validation-message-minimum-font-size.html [ Skip ]
 
-# New Encrypted Media API not enabled on iOS
-media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html [ Skip ]
-
 webkit.org/b/166736 fast/scrolling/page-cache-back-overflow-scroll-restore.html [ Skip ]
 
 # Requires changes to QuickLook.framework tracked by rdar://problem/28544527

LayoutTests/platform/mac/TestExpectations

@@ -1018,7 +1018,6 @@ webkit.org/b/165530 compositing/layer-creation/fixed-position-out-of-view-scaled
 webkit.org/b/165874 streams/pipe-to.html [ Pass Failure ]
 
 # New Encrypted Media API not enabled on Mac
-media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html [ Skip ]
 media/encrypted-media/mock-MediaKeySystemAccess.html [ Skip ]
 media/encrypted-media/mock-MediaKeys-setServerCertificate.html [ Skip ]
 media/encrypted-media/mock-MediaKeys-createSession.html [ Skip ]

Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp

@@ -422,7 +422,7 @@ std::optional<Vector<CDMMediaCapability>> CDMPrivate::getSupportedCapabilitiesFo
         // 3.13. If the user agent and implementation definitely support playback of encrypted media data for the
         //       combination of container, media types, robustness and local accumulated configuration in combination
         //       with restrictions:
-        MediaEngineSupportParameters parameters { .type = ContentType(contentType->mimeType()) };
+        MediaEngineSupportParameters parameters { .type = ContentType(contentType->contentType()) };
         if (MediaPlayer::supportsType(parameters) == MediaPlayer::SupportsType::IsNotSupported) {
             // Try with Media Source:
             parameters.platformType = PlatformMediaDecodingType::MediaSource;

Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp

@@ -98,6 +98,9 @@ MediaPlayer::SupportsType MockMediaPlayerMediaSource::supportsType(const MediaEn
     if (codecs == "mock"_s || codecs == "kcom"_s)
         return MediaPlayer::SupportsType::IsSupported;
 
+    if (codecs == "unknown"_s || codecs == "invalid"_s)
+        return MediaPlayer::SupportsType::IsNotSupported;
+
     return MediaPlayer::SupportsType::MayBeSupported;
 }
 

Source/WebCore/platform/network/ParsedContentType.h

@@ -44,6 +44,7 @@ class ParsedContentType {
     ParsedContentType(ParsedContentType&&) = default;
 
     String mimeType() const { return m_mimeType; }
+    String contentType() const { return m_contentType; }
     String charset() const;
     void setCharset(String&&);