[EME][GStreamer] Fix wrong ifdef
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Jan 2018 14:01:15 +0000 (14:01 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Jan 2018 14:01:15 +0000 (14:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=181289

Reviewed by Alex Christensen.

* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::handleMessage): Remove the
ENCRYPTED_MEDIA ifdef from the VIDEO_TRACK ifdef block. Both have
nothing to do together.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

index 6e19e83..d7c5ac1 100644 (file)
@@ -1,3 +1,15 @@
+2018-01-04  Philippe Normand  <pnormand@igalia.com>
+
+        [EME][GStreamer] Fix wrong ifdef
+        https://bugs.webkit.org/show_bug.cgi?id=181289
+
+        Reviewed by Alex Christensen.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::handleMessage): Remove the
+        ENCRYPTED_MEDIA ifdef from the VIDEO_TRACK ifdef block. Both have
+        nothing to do together.
+
 2018-01-05  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         [Cairo] Canvas: Path::clear should clear its transform
index 833a75b..c9ac187 100644 (file)
@@ -1023,20 +1023,17 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
             }
         }
 #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
-        else {
-            GstMpegtsSection* section = gst_message_parse_mpegts_section(message);
-            if (section) {
-                processMpegTsSection(section);
-                gst_mpegts_section_unref(section);
-            }
-#if ENABLE(ENCRYPTED_MEDIA)
-            else if (gst_structure_has_name(structure, "drm-key-needed")) {
-                GST_DEBUG("drm-key-needed message from %s", GST_MESSAGE_SRC_NAME(message));
-                GRefPtr<GstEvent> event;
-                gst_structure_get(structure, "event", GST_TYPE_EVENT, &event.outPtr(), nullptr);
-                handleProtectionEvent(event.get());
-            }
+        else if (GstMpegtsSection* section = gst_message_parse_mpegts_section(message)) {
+            processMpegTsSection(section);
+            gst_mpegts_section_unref(section);
+        }
 #endif
+#if ENABLE(ENCRYPTED_MEDIA)
+        else if (gst_structure_has_name(structure, "drm-key-needed")) {
+            GST_DEBUG("drm-key-needed message from %s", GST_MESSAGE_SRC_NAME(message));
+            GRefPtr<GstEvent> event;
+            gst_structure_get(structure, "event", GST_TYPE_EVENT, &event.outPtr(), nullptr);
+            handleProtectionEvent(event.get());
         }
 #endif
         break;