Title: [268586] trunk/Source/WebCore
- Revision
- 268586
- Author
- [email protected]
- Date
- 2020-10-16 06:21:27 -0700 (Fri, 16 Oct 2020)
Log Message
Unreviewed, follow-up to r268576
Revert a chunk of r268576 that introduced a regression in audio-related tests.
* platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:
(WebCore::GStreamerRegistryScanner::fillMimeTypeSetFromCapsMapping): Add an ASSERT and
modify mime-type and codec hashmaps in-place.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (268585 => 268586)
--- trunk/Source/WebCore/ChangeLog 2020-10-16 13:03:49 UTC (rev 268585)
+++ trunk/Source/WebCore/ChangeLog 2020-10-16 13:21:27 UTC (rev 268586)
@@ -1,3 +1,13 @@
+2020-10-16 Philippe Normand <[email protected]>
+
+ Unreviewed, follow-up to r268576
+
+ Revert a chunk of r268576 that introduced a regression in audio-related tests.
+
+ * platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:
+ (WebCore::GStreamerRegistryScanner::fillMimeTypeSetFromCapsMapping): Add an ASSERT and
+ modify mime-type and codec hashmaps in-place.
+
2020-10-16 Andres Gonzalez <[email protected]>
Refactor [WebAccessibilityObjectWrapper convertRectToSpace] so that the platform-specific code is in their corresponding AX object platform implementations.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp (268585 => 268586)
--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp 2020-10-16 13:03:49 UTC (rev 268585)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp 2020-10-16 13:21:27 UTC (rev 268586)
@@ -171,51 +171,34 @@
{
for (auto& current : mapping) {
GList* factories;
- HashSet<String, ASCIICaseInsensitiveHash> mimeTypeSet;
- HashMap<AtomString, bool> codecMap;
switch (current.elementType) {
case Demuxer:
factories = m_demuxerFactories;
- codecMap = m_decoderCodecMap;
- mimeTypeSet = m_decoderMimeTypeSet;
break;
case AudioDecoder:
factories = m_audioDecoderFactories;
- codecMap = m_decoderCodecMap;
- mimeTypeSet = m_decoderMimeTypeSet;
break;
case VideoDecoder:
factories = m_videoDecoderFactories;
- codecMap = m_decoderCodecMap;
- mimeTypeSet = m_decoderMimeTypeSet;
break;
case Muxer:
- factories = m_muxerFactories;
- codecMap = m_encoderCodecMap;
- mimeTypeSet = m_encoderMimeTypeSet;
- break;
case AudioEncoder:
- factories = m_audioEncoderFactories;
- codecMap = m_encoderCodecMap;
- mimeTypeSet = m_encoderMimeTypeSet;
- break;
case VideoEncoder:
- factories = m_videoEncoderFactories;
- codecMap = m_encoderCodecMap;
- mimeTypeSet = m_encoderMimeTypeSet;
- break;
+ // This method is currently used only for Decoders and Demuxers.
+ ASSERT_NOT_REACHED();
+ return;
}
if (hasElementForMediaType(factories, current.capsString)) {
if (!current.webkitCodecPatterns.isEmpty()) {
for (const auto& pattern : current.webkitCodecPatterns)
- codecMap.add(pattern, false);
+ m_decoderCodecMap.add(pattern, false);
}
if (!current.webkitMimeTypes.isEmpty()) {
for (const auto& mimeType : current.webkitMimeTypes)
- mimeTypeSet.add(mimeType);
+ m_decoderMimeTypeSet.add(mimeType);
} else
- mimeTypeSet.add(AtomString(current.capsString));
+ m_decoderMimeTypeSet.add(AtomString(current.capsString));
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
