Changeset 256856 in webkit

Timestamp:

Feb 18, 2020 2:52:38 PM (4 years ago)

Author:

Peng Liu

Message:

MediaSource.isTypeSupported() says "video/mp4;codecs=\"avc3.42C015\"" is not supported, but it is
​https://bugs.webkit.org/show_bug.cgi?id=207622

Reviewed by Eric Carlson.

Revert the behavior change of MediaPlayerPrivateMediaSourceAVFObjC::supportsType() in r253952.

• platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:

(WebCore::AVAssetMIMETypeCache::canDecodeExtendedType):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-18  Peng Liu  <peng.liu6@apple.com>
+
+        MediaSource.isTypeSupported() says "video/mp4;codecs=\"avc3.42C015\"" is not supported, but it is
+        https://bugs.webkit.org/show_bug.cgi?id=207622
+
+        Reviewed by Eric Carlson.
+
+        Revert the behavior change of MediaPlayerPrivateMediaSourceAVFObjC::supportsType() in r253952.
+
+        * platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm:
+        (WebCore::AVAssetMIMETypeCache::canDecodeExtendedType):
+
 2020-02-18  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm

@@ -60 +60 @@
     ASSERT(isAvailable());
 
-    String outputCodecs = type.parameter(ContentType::codecsParameter());
-    ASSERT(!outputCodecs.isEmpty());
-    if ([PAL::getAVStreamDataParserClass() respondsToSelector:@selector(outputMIMECodecParameterForInputMIMECodecParameter:)])
-        outputCodecs = [PAL::getAVStreamDataParserClass() outputMIMECodecParameterForInputMIMECodecParameter:outputCodecs];
-
-    String extendedType = makeString(type.containerType(), "; codecs=\"", outputCodecs, "\"");
     if ([PAL::getAVStreamDataParserClass() respondsToSelector:@selector(canParseExtendedMIMEType:)])
-        return [PAL::getAVStreamDataParserClass() canParseExtendedMIMEType:extendedType];
+        return [PAL::getAVStreamDataParserClass() canParseExtendedMIMEType:type.raw()];
 
     // FIXME(rdar://50502771) AVStreamDataParser does not have an -canParseExtendedMIMEType: method on this system,

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm

@@ -254 +254 @@
         return MediaPlayer::SupportsType::IsNotSupported;
 
+    String extendedType = parameters.type.raw();
+    String outputCodecs = parameters.type.parameter(ContentType::codecsParameter());
+    if (!outputCodecs.isEmpty() && [PAL::getAVStreamDataParserClass() respondsToSelector:@selector(outputMIMECodecParameterForInputMIMECodecParameter:)]) {
+        outputCodecs = [PAL::getAVStreamDataParserClass() outputMIMECodecParameterForInputMIMECodecParameter:outputCodecs];
+        extendedType = makeString(parameters.type.containerType(), "; codecs=\"", outputCodecs, "\"");
+    }
+
     auto supported = MediaPlayer::SupportsType::IsNotSupported;
     auto& streamDataParserCache = AVStreamDataParserMIMETypeCache::singleton();
     if (streamDataParserCache.isAvailable())
-        supported = streamDataParserCache.canDecodeType(parameters.type.raw());
+        supported = streamDataParserCache.canDecodeType(extendedType);
     else {
         auto& assetCache = AVAssetMIMETypeCache::singleton();
         if (assetCache.isAvailable())
-            supported = assetCache.canDecodeType(parameters.type.raw());
+            supported = assetCache.canDecodeType(extendedType);
     }