Changeset 181540 in webkit

Timestamp:

Mar 16, 2015, 4:13:42 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r181449 - Stop using single-include headers that are only available since GStreamer >= 1.2.

​https://bugs.webkit.org/show_bug.cgi?id=142537

Patch by Sebastian Dröge <​sebastian@centricular.com> on 2015-03-12
Reviewed by Philippe Normand.

• platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
• platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
• platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
• platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
• platform/graphics/gstreamer/GStreamerUtilities.cpp:
• platform/graphics/gstreamer/GStreamerUtilities.h:
• platform/graphics/gstreamer/ImageGStreamer.h:

Instead of using single-include headers for the GStreamer libraries,
directly include the headers we need. The single-include headers were
only added in 1.2, and this would be the only reason why we would
depend on 1.2.

Location:

releases/WebKitGTK/webkit-2.8/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/gstreamer/AudioDestinationGStreamer.cpp (modified) (1 diff)
• platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (modified) (1 diff)
• platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp (modified) (1 diff)
• platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerUtilities.cpp (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerUtilities.h (modified) (1 diff)
• platform/graphics/gstreamer/ImageGStreamer.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-12  Sebastian Dröge  <sebastian@centricular.com>
+
+        Stop using single-include headers that are only available since GStreamer >= 1.2.
+
+        https://bugs.webkit.org/show_bug.cgi?id=142537
+
+        Reviewed by Philippe Normand.
+
+        * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
+        * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+        * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
+        * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+        * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+        * platform/graphics/gstreamer/GStreamerUtilities.h:
+        * platform/graphics/gstreamer/ImageGStreamer.h:
+        Instead of using single-include headers for the GStreamer libraries,
+        directly include the headers we need. The single-include headers were
+        only added in 1.2, and this would be the only reason why we would
+        depend on 1.2.
+
 2015-03-11  Geoffrey Garen  <ggaren@apple.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp

@@ -30 +30 @@
 #include "WebKitWebAudioSourceGStreamer.h"
 #include <gst/gst.h>
-#include <gst/pbutils/pbutils.h>
 #include <wtf/gobject/GUniquePtr.h>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp

@@ -28 +28 @@
 #include <gio/gio.h>
 #include <gst/app/gstappsink.h>
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
 #include <gst/gst.h>
-#include <gst/pbutils/pbutils.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/gobject/GRefPtr.h>

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp

@@ -25 +25 @@
 #include "AudioSourceProviderClient.h"
 #include <gst/app/gstappsink.h>
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
 #include <gst/base/gstadapter.h>
 #include <wtf/gobject/GMutexLocker.h>

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp

@@ -28 +28 @@
 #include "GRefPtrGStreamer.h"
 #include "GStreamerUtilities.h"
-#include <gst/app/app.h>
-#include <gst/audio/audio.h>
-#include <gst/pbutils/pbutils.h>
+#include <gst/app/gstappsrc.h>
+#include <gst/audio/audio-info.h>
+#include <gst/pbutils/missing-plugins.h>
 #include <wtf/gobject/GUniquePtr.h>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp

@@ -25 +25 @@
 #include "IntSize.h"
 
-#include <gst/audio/audio.h>
+#include <gst/audio/audio-info.h>
 #include <gst/gst.h>
+#include <gst/video/video-info.h>
 #include <wtf/MathExtras.h>
 #include <wtf/gobject/GUniquePtr.h>

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h

@@ -20 +20 @@
 
 #include <gst/gst.h>
-#include <gst/video/video.h>
+#include <gst/video/video-format.h>
 
 #define LOG_MEDIA_MESSAGE(...) do { \

releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/gstreamer/ImageGStreamer.h

@@ -28 +28 @@
 
 #include <gst/gst.h>
-#include <gst/video/video.h>
+#include <gst/video/video-frame.h>
 
 #include <wtf/PassRefPtr.h>