<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[171339] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/171339">171339</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-22 01:50:51 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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 <aperez@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 <aperez@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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#trunkSourcecmakeFindGStreamercmake">trunk/Source/cmake/FindGStreamer.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (171338 => 171339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-07-22 06:12:13 UTC (rev 171338)
+++ trunk/ChangeLog 2014-07-22 08:50:51 UTC (rev 171339)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-22 Adrian Perez de Castro <aperez@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.
+
</ins><span class="cx"> 2014-07-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Simplify make-dist command line arguments
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171338 => 171339)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-22 Adrian Perez de Castro <aperez@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.
+
</ins><span class="cx"> 2014-07-21 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] Improve event throttling for Scroll Events
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (171338 => 171339)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1002,7 +1002,7 @@
</span><span class="cx"> }
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
</span><span class="cx"> else {
</span><del>- GstMpegTsSection* section = gst_message_parse_mpegts_section(message);
</del><ins>+ GstMpegtsSection* section = gst_message_parse_mpegts_section(message);
</ins><span class="cx"> if (section) {
</span><span class="cx"> processMpegTsSection(section);
</span><span class="cx"> gst_mpegts_section_unref(section);
</span><span class="lines">@@ -1044,15 +1044,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
</span><del>-void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegTsSection* section)
</del><ins>+void MediaPlayerPrivateGStreamer::processMpegTsSection(GstMpegtsSection* section)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(section);
</span><span class="cx">
</span><span class="cx"> if (section->section_type == GST_MPEGTS_SECTION_PMT) {
</span><del>- const GstMpegTsPMT* pmt = gst_mpegts_section_get_pmt(section);
</del><ins>+ const GstMpegtsPMT* pmt = gst_mpegts_section_get_pmt(section);
</ins><span class="cx"> m_metadataTracks.clear();
</span><span class="cx"> for (guint i = 0; i < pmt->streams->len; ++i) {
</span><del>- const GstMpegTsPMTStream* stream = static_cast<const GstMpegTsPMTStream*>(g_ptr_array_index(pmt->streams, i));
</del><ins>+ const GstMpegtsPMTStream* stream = static_cast<const GstMpegtsPMTStream*>(g_ptr_array_index(pmt->streams, i));
</ins><span class="cx"> if (stream->stream_type == 0x05 || stream->stream_type >= 0x80) {
</span><span class="cx"> AtomicString pid = String::number(stream->pid);
</span><span class="cx"> RefPtr<InbandMetadataTextTrackPrivateGStreamer> track = InbandMetadataTextTrackPrivateGStreamer::create(
</span><span class="lines">@@ -1071,7 +1071,7 @@
</span><span class="cx"> String inbandMetadataTrackDispatchType;
</span><span class="cx"> appendUnsignedAsHexFixedSize(stream->stream_type, inbandMetadataTrackDispatchType, 2);
</span><span class="cx"> for (guint j = 0; j < stream->descriptors->len; ++j) {
</span><del>- const GstMpegTsDescriptor* descriptor = static_cast<const GstMpegTsDescriptor*>(g_ptr_array_index(stream->descriptors, j));
</del><ins>+ const GstMpegtsDescriptor* descriptor = static_cast<const GstMpegtsDescriptor*>(g_ptr_array_index(stream->descriptors, j));
</ins><span class="cx"> for (guint k = 0; k < descriptor->length; ++k)
</span><span class="cx"> appendByteAsHex(descriptor->data[k], inbandMetadataTrackDispatchType);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (171338 => 171339)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> typedef struct _GstBuffer GstBuffer;
</span><span class="cx"> typedef struct _GstMessage GstMessage;
</span><span class="cx"> typedef struct _GstElement GstElement;
</span><del>-typedef struct _GstMpegTsSection GstMpegTsSection;
</del><ins>+typedef struct _GstMpegtsSection GstMpegtsSection;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> void setDownloadBuffering();
</span><span class="cx"> void processBufferingStats(GstMessage*);
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
</span><del>- void processMpegTsSection(GstMpegTsSection*);
</del><ins>+ void processMpegTsSection(GstMpegtsSection*);
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> void processTableOfContents(GstMessage*);
</span></span></pre></div>
<a id="trunkSourcecmakeFindGStreamercmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/FindGStreamer.cmake (171338 => 171339)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> FIND_GSTREAMER_COMPONENT(GSTREAMER_APP gstreamer-app-1.0 gst/app/gstappsink.h gstapp-1.0)
</span><span class="cx"> FIND_GSTREAMER_COMPONENT(GSTREAMER_AUDIO gstreamer-audio-1.0 gst/audio/audio.h gstaudio-1.0)
</span><span class="cx"> FIND_GSTREAMER_COMPONENT(GSTREAMER_FFT gstreamer-fft-1.0 gst/fft/gstfft.h gstfft-1.0)
</span><del>-FIND_GSTREAMER_COMPONENT(GSTREAMER_MPEGTS gstreamer-mpegts-1.0>=1.3.0 gst/mpegts/mpegts.h gstmpegts-1.0)
</del><ins>+FIND_GSTREAMER_COMPONENT(GSTREAMER_MPEGTS gstreamer-mpegts-1.0>=1.4.0 gst/mpegts/mpegts.h gstmpegts-1.0)
</ins><span class="cx"> FIND_GSTREAMER_COMPONENT(GSTREAMER_PBUTILS gstreamer-pbutils-1.0 gst/pbutils/pbutils.h gstpbutils-1.0)
</span><span class="cx"> FIND_GSTREAMER_COMPONENT(GSTREAMER_TAG gstreamer-tag-1.0 gst/tag/tag.h gsttag-1.0)
</span><span class="cx"> FIND_GSTREAMER_COMPONENT(GSTREAMER_VIDEO gstreamer-video-1.0 gst/video/video.h gstvideo-1.0)
</span></span></pre>
</div>
</div>
</body>
</html>