Changeset 268586 in webkit

Timestamp:

Oct 16, 2020 6:21:27 AM (4 years ago)

Author:

Philippe Normand

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerRegistryScanner.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-16  Philippe Normand  <pnormand@igalia.com>
+
+        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  <andresg_22@apple.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp

@@ -172 +172 @@
     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;
         }
 
@@ -210 +193 @@
             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));
         }
     }