Title: [268590] trunk/Source/WebCore
Revision
268590
Author
[email protected]
Date
2020-10-16 08:22:48 -0700 (Fri, 16 Oct 2020)

Log Message

[GStreamer] Remove unused ElementType values from the registry scanner
https://bugs.webkit.org/show_bug.cgi?id=217824

Patch by Philippe Normand <[email protected]> on 2020-10-16
Reviewed by Xabier Rodriguez-Calvar.

r268576 introduced new values in the ElementType enum but they were unused and introduced
inconsistency in in fillMimeTypeSetFromCapsMapping(). If this function needs to be used for
encoding configurations it will need to be refactored but that's not a scenario I foresee,
so for now, remove unused enum values.

* platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:
(WebCore::GStreamerRegistryScanner::fillMimeTypeSetFromCapsMapping):
* platform/graphics/gstreamer/GStreamerRegistryScanner.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (268589 => 268590)


--- trunk/Source/WebCore/ChangeLog	2020-10-16 14:46:00 UTC (rev 268589)
+++ trunk/Source/WebCore/ChangeLog	2020-10-16 15:22:48 UTC (rev 268590)
@@ -1,3 +1,19 @@
+2020-10-16  Philippe Normand  <[email protected]>
+
+        [GStreamer] Remove unused ElementType values from the registry scanner
+        https://bugs.webkit.org/show_bug.cgi?id=217824
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        r268576 introduced new values in the ElementType enum but they were unused and introduced
+        inconsistency in in fillMimeTypeSetFromCapsMapping(). If this function needs to be used for
+        encoding configurations it will need to be refactored but that's not a scenario I foresee,
+        so for now, remove unused enum values.
+
+        * platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:
+        (WebCore::GStreamerRegistryScanner::fillMimeTypeSetFromCapsMapping):
+        * platform/graphics/gstreamer/GStreamerRegistryScanner.h:
+
 2020-10-16  Michael Catanzaro  <[email protected]>
 
         REGRESSION(r267727): Warning spam from JSC_DECLARE_CUSTOM_GETTER

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp (268589 => 268590)


--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp	2020-10-16 14:46:00 UTC (rev 268589)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp	2020-10-16 15:22:48 UTC (rev 268590)
@@ -181,12 +181,6 @@
         case VideoDecoder:
             factories = m_videoDecoderFactories;
             break;
-        case Muxer:
-        case AudioEncoder:
-        case VideoEncoder:
-            // This method is currently used only for Decoders and Demuxers.
-            ASSERT_NOT_REACHED();
-            return;
         }
 
         if (hasElementForMediaType(factories, current.capsString)) {

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h (268589 => 268590)


--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h	2020-10-16 14:46:00 UTC (rev 268589)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h	2020-10-16 15:22:48 UTC (rev 268590)
@@ -72,11 +72,9 @@
     enum ElementType {
         AudioDecoder = 0,
         VideoDecoder,
-        Demuxer,
-        AudioEncoder,
-        VideoEncoder,
-        Muxer
+        Demuxer
     };
+
     struct GstCapsWebKitMapping {
         ElementType elementType;
         const char* capsString;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to