Title: [171339] trunk
- Revision
- 171339
- Author
- commit-qu...@webkit.org
- Date
- 2014-07-22 01:50:51 -0700 (Tue, 22 Jul 2014)
Log Message
[GStreamer] [GTK] WebKit does not build with GStreamer 1.4
https://bugs.webkit.org/show_bug.cgi?id=135114
.:
Fix build with GStreamer 1.4
Patch by Adrian Perez de Castro <ape...@igalia.com> on 2014-07-22
Reviewed by Philippe Normand.
* Source/cmake/FindGStreamer.cmake: Check version 1.4.0 for the
gst-mpegts component instead of the unstable 1.3.x verstions.
Source/WebCore:
Patch by Adrian Perez de Castro <ape...@igalia.com> on 2014-07-22
Reviewed by Philippe Normand.
Fix build with GStreamer 1.4
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
Change GstMpegTs-prefixed types to use the GstMpegts prefix.
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
(WebCore::MediaPlayerPrivateGStreamer::processMpegTsSection):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (171338 => 171339)
--- trunk/ChangeLog 2014-07-22 06:12:13 UTC (rev 171338)
+++ trunk/ChangeLog 2014-07-22 08:50:51 UTC (rev 171339)
@@ -1,3 +1,15 @@
+2014-07-22 Adrian Perez de Castro <ape...@igalia.com>
+
+ [GStreamer] [GTK] WebKit does not build with GStreamer 1.4
+ https://bugs.webkit.org/show_bug.cgi?id=135114
+
+ Fix build with GStreamer 1.4
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/FindGStreamer.cmake: Check version 1.4.0 for the
+ gst-mpegts component instead of the unstable 1.3.x verstions.
+
2014-07-21 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Simplify make-dist command line arguments
Modified: trunk/Source/WebCore/ChangeLog (171338 => 171339)
--- trunk/Source/WebCore/ChangeLog 2014-07-22 06:12:13 UTC (rev 171338)
+++ trunk/Source/WebCore/ChangeLog 2014-07-22 08:50:51 UTC (rev 171339)
@@ -1,3 +1,19 @@
+2014-07-22 Adrian Perez de Castro <ape...@igalia.com>
+
+ [GStreamer] [GTK] WebKit does not build with GStreamer 1.4
+ https://bugs.webkit.org/show_bug.cgi?id=135114
+
+ Reviewed by Philippe Normand.
+
+ Fix build with GStreamer 1.4
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ Change GstMpegTs-prefixed types to use the GstMpegts prefix.
+ (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+ (WebCore::MediaPlayerPrivateGStreamer::processMpegTsSection):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ Ditto.
+
2014-07-21 Benjamin Poulain <bpoul...@apple.com>
[iOS][WK2] Improve event throttling for Scroll Events
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (171338 => 171339)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-07-22 06:12:13 UTC (rev 171338)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-07-22 08:50:51 UTC (rev 171339)
@@ -1002,7 +1002,7 @@
}
#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
else {
- GstMpegTsSection* section = gst_message_parse_mpegts_section(message);
+ GstMpegtsSection* section = gst_message_parse_mpegts_section(message);
if (section) {
processMpegTsSection(section);
gst_mpegts_section_unref(section);
@@ -1044,15 +1044,15 @@
}
#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
-void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegTsSection* section)
+void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegtsSection* section)
{
ASSERT(section);
if (section->section_type == GST_MPEGTS_SECTION_PMT) {
- const GstMpegTsPMT* pmt = gst_mpegts_section_get_pmt(section);
+ const GstMpegtsPMT* pmt = gst_mpegts_section_get_pmt(section);
m_metadataTracks.clear();
for (guint i = 0; i < pmt->streams->len; ++i) {
- const GstMpegTsPMTStream* stream = static_cast<const GstMpegTsPMTStream*>(g_ptr_array_index(pmt->streams, i));
+ const GstMpegtsPMTStream* stream = static_cast<const GstMpegtsPMTStream*>(g_ptr_array_index(pmt->streams, i));
if (stream->stream_type == 0x05 || stream->stream_type >= 0x80) {
AtomicString pid = String::number(stream->pid);
RefPtr<InbandMetadataTextTrackPrivateGStreamer> track = InbandMetadataTextTrackPrivateGStreamer::create(
@@ -1071,7 +1071,7 @@
String inbandMetadataTrackDispatchType;
appendUnsignedAsHexFixedSize(stream->stream_type, inbandMetadataTrackDispatchType, 2);
for (guint j = 0; j < stream->descriptors->len; ++j) {
- const GstMpegTsDescriptor* descriptor = static_cast<const GstMpegTsDescriptor*>(g_ptr_array_index(stream->descriptors, j));
+ const GstMpegtsDescriptor* descriptor = static_cast<const GstMpegtsDescriptor*>(g_ptr_array_index(stream->descriptors, j));
for (guint k = 0; k < descriptor->length; ++k)
appendByteAsHex(descriptor->data[k], inbandMetadataTrackDispatchType);
}
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (171338 => 171339)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-07-22 06:12:13 UTC (rev 171338)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-07-22 08:50:51 UTC (rev 171339)
@@ -46,7 +46,7 @@
typedef struct _GstBuffer GstBuffer;
typedef struct _GstMessage GstMessage;
typedef struct _GstElement GstElement;
-typedef struct _GstMpegTsSection GstMpegTsSection;
+typedef struct _GstMpegtsSection GstMpegtsSection;
namespace WebCore {
@@ -151,7 +151,7 @@
void setDownloadBuffering();
void processBufferingStats(GstMessage*);
#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
- void processMpegTsSection(GstMpegTsSection*);
+ void processMpegTsSection(GstMpegtsSection*);
#endif
#if ENABLE(VIDEO_TRACK)
void processTableOfContents(GstMessage*);
Modified: trunk/Source/cmake/FindGStreamer.cmake (171338 => 171339)
--- trunk/Source/cmake/FindGStreamer.cmake 2014-07-22 06:12:13 UTC (rev 171338)
+++ trunk/Source/cmake/FindGStreamer.cmake 2014-07-22 08:50:51 UTC (rev 171339)
@@ -106,7 +106,7 @@
FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
-FIND_GSTREAMER_COMPONENT(GSTREAMER_MPEGTS gstreamer-mpegts-1.0>=1.3.0 gst/mpegts/mpegts.h gstmpegts-1.0)
+FIND_GSTREAMER_COMPONENT(GSTREAMER_MPEGTS gstreamer-mpegts-1.0>=1.4.0 gst/mpegts/mpegts.h gstmpegts-1.0)
FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
FIND_GSTREAMER_COMPONENT(GSTREAMER_TAG gstreamer-tag-1.0 gst/tag/tag.h gsttag-1.0)
FIND_GSTREAMER_COMPONENT(GSTREAMER_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
