Changeset 256828 in webkit

Timestamp:

Feb 18, 2020 7:55:39 AM (4 years ago)

Author:

Jacob Uphoff

Message:

Unreviewed, rolling out r256804.

This broke 50+ media tests on mac debug

Reverted changeset:

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

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  Jacob Uphoff  <jacob_uphoff@apple.com>
+
+        Unreviewed, rolling out r256804.
+
+        This broke 50+ media tests on mac debug
+
+        Reverted changeset:
+
+        "MediaSource.isTypeSupported() says
+        "video/mp4;codecs=\"avc3.42C015\"" is not supported, but it
+        is"
+        https://bugs.webkit.org/show_bug.cgi?id=207622
+        https://trac.webkit.org/changeset/256804
+
 2020-02-18  Zalan Bujtas  <zalan@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:type.raw()];
+        return [PAL::getAVStreamDataParserClass() canParseExtendedMIMEType:extendedType];
 
     // 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 outputCodecs = parameters.type.parameter(ContentType::codecsParameter());
-    ASSERT(!outputCodecs.isEmpty());
-    if ([PAL::getAVStreamDataParserClass() respondsToSelector:@selector(outputMIMECodecParameterForInputMIMECodecParameter:)])
-        outputCodecs = [PAL::getAVStreamDataParserClass() outputMIMECodecParameterForInputMIMECodecParameter:outputCodecs];
-
-    String extendedType = makeString(parameters.type.containerType(), "; codecs=\"", outputCodecs, "\"");
     auto supported = MediaPlayer::SupportsType::IsNotSupported;
     auto& streamDataParserCache = AVStreamDataParserMIMETypeCache::singleton();
     if (streamDataParserCache.isAvailable())
-        supported = streamDataParserCache.canDecodeType(extendedType);
+        supported = streamDataParserCache.canDecodeType(parameters.type.raw());
     else {
         auto& assetCache = AVAssetMIMETypeCache::singleton();
         if (assetCache.isAvailable())
-            supported = assetCache.canDecodeType(extendedType);
+            supported = assetCache.canDecodeType(parameters.type.raw());
     }