Title: [256828] trunk/Source/WebCore
- Revision
- 256828
- Author
- [email protected]
- Date
- 2020-02-18 07:55:39 -0800 (Tue, 18 Feb 2020)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (256827 => 256828)
--- trunk/Source/WebCore/ChangeLog 2020-02-18 14:57:53 UTC (rev 256827)
+++ trunk/Source/WebCore/ChangeLog 2020-02-18 15:55:39 UTC (rev 256828)
@@ -1,3 +1,17 @@
+2020-02-18 Jacob Uphoff <[email protected]>
+
+ 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 <[email protected]>
[LFC][TreeBuilding] Take createLineBreakBox's return value
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm (256827 => 256828)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm 2020-02-18 14:57:53 UTC (rev 256827)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm 2020-02-18 15:55:39 UTC (rev 256828)
@@ -59,8 +59,14 @@
#if ENABLE(VIDEO) && USE(AVFOUNDATION)
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,
// so just replace the container type with a valid one from AVAssetMIMETypeCache and ask that cache if it
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (256827 => 256828)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2020-02-18 14:57:53 UTC (rev 256827)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2020-02-18 15:55:39 UTC (rev 256828)
@@ -253,20 +253,14 @@
if (!parameters.isMediaSource)
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());
}
if (supported != MediaPlayer::SupportsType::IsSupported)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
