Title: [226446] trunk/Source/WebCore
- Revision
- 226446
- Author
- [email protected]
- Date
- 2018-01-05 06:01:15 -0800 (Fri, 05 Jan 2018)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (226445 => 226446)
--- trunk/Source/WebCore/ChangeLog 2018-01-05 13:50:57 UTC (rev 226445)
+++ trunk/Source/WebCore/ChangeLog 2018-01-05 14:01:15 UTC (rev 226446)
@@ -1,3 +1,15 @@
+2018-01-04 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
[Cairo] Canvas: Path::clear should clear its transform
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (226445 => 226446)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-01-05 13:50:57 UTC (rev 226445)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2018-01-05 14:01:15 UTC (rev 226446)
@@ -1023,20 +1023,17 @@
}
}
#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);
- }
+ 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
+ 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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
