<!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>[160375] trunk/Source/WebCore</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/160375">160375</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-10 10:54:40 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][GStreamer] media/video-preload.html is flakily crashing on WK2
https://bugs.webkit.org/show_bug.cgi?id=125411
Patch by Brendan Long <b.long@cablelabs.com> on 2013-12-10
Reviewed by Philippe Normand.
No new tests because this fixes flakeyness in existing tests (media/video-preload.html, and various tests in media/track/{audio,in-band,video}).
* platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
(webkitTextCombinerPadGetProperty): Copy tag list to prevent concurrent modification problems.
(webkitTextCombinerPadEvent): Add locking.
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
(WebCore::TrackPrivateBaseGStreamer::TrackPrivateBaseGStreamer): Call tagsChanged() because we need it to setup m_tags.
(WebCore::TrackPrivateBaseGStreamer::disconnect): Clear m_tags.
(WebCore::TrackPrivateBaseGStreamer::tagsChanged): Lookup the tags while we're in this callback, because it's the only time we can guarantee that the input-selector won't unref them.
(WebCore::TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged): Use m_tags.
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h: Add m_tags and a mutex.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTextCombinerGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160374 => 160375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-10 18:53:51 UTC (rev 160374)
+++ trunk/Source/WebCore/ChangeLog 2013-12-10 18:54:40 UTC (rev 160375)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-10 Brendan Long <b.long@cablelabs.com>
+
+ [GTK][GStreamer] media/video-preload.html is flakily crashing on WK2
+ https://bugs.webkit.org/show_bug.cgi?id=125411
+
+ Reviewed by Philippe Normand.
+
+ No new tests because this fixes flakeyness in existing tests (media/video-preload.html, and various tests in media/track/{audio,in-band,video}).
+
+ * platform/graphics/gstreamer/TextCombinerGStreamer.cpp:
+ (webkitTextCombinerPadGetProperty): Copy tag list to prevent concurrent modification problems.
+ (webkitTextCombinerPadEvent): Add locking.
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ (WebCore::TrackPrivateBaseGStreamer::TrackPrivateBaseGStreamer): Call tagsChanged() because we need it to setup m_tags.
+ (WebCore::TrackPrivateBaseGStreamer::disconnect): Clear m_tags.
+ (WebCore::TrackPrivateBaseGStreamer::tagsChanged): Lookup the tags while we're in this callback, because it's the only time we can guarantee that the input-selector won't unref them.
+ (WebCore::TrackPrivateBaseGStreamer::notifyTrackOfTagsChanged): Use m_tags.
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h: Add m_tags and a mutex.
+
</ins><span class="cx"> 2013-12-10 László Langó <lango@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> PageConsole::addMessage should automatically determine column number alongside line number
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTextCombinerGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp (160374 => 160375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp 2013-12-10 18:53:51 UTC (rev 160374)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp 2013-12-10 18:54:40 UTC (rev 160375)
</span><span class="lines">@@ -111,7 +111,8 @@
</span><span class="cx"> switch (propertyId) {
</span><span class="cx"> case PROP_PAD_TAGS:
</span><span class="cx"> GST_OBJECT_LOCK(object);
</span><del>- g_value_set_boxed(value, pad->tags);
</del><ins>+ if (pad->tags)
+ g_value_take_boxed(value, gst_tag_list_copy(pad->tags));
</ins><span class="cx"> GST_OBJECT_UNLOCK(object);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -202,10 +203,13 @@
</span><span class="cx"> gst_event_parse_tag(event, &tags);
</span><span class="cx"> ASSERT(tags);
</span><span class="cx">
</span><ins>+ GST_OBJECT_LOCK(pad);
</ins><span class="cx"> if (!combinerPad->tags)
</span><span class="cx"> combinerPad->tags = gst_tag_list_copy(tags);
</span><span class="cx"> else
</span><span class="cx"> gst_tag_list_insert(combinerPad->tags, tags, GST_TAG_MERGE_REPLACE);
</span><ins>+ GST_OBJECT_UNLOCK(pad);
+
</ins><span class="cx"> g_object_notify(G_OBJECT(pad), "tags");
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (160374 => 160375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2013-12-10 18:53:51 UTC (rev 160374)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2013-12-10 18:54:40 UTC (rev 160375)
</span><span class="lines">@@ -75,7 +75,9 @@
</span><span class="cx"> g_signal_connect(m_pad.get(), "notify::active", G_CALLBACK(trackPrivateActiveChangedCallback), this);
</span><span class="cx"> g_signal_connect(m_pad.get(), "notify::tags", G_CALLBACK(trackPrivateTagsChangedCallback), this);
</span><span class="cx">
</span><del>- notifyTrackOfTagsChanged();
</del><ins>+ // We can't call notifyTrackOfTagsChanged() directly, because we need tagsChanged()
+ // to setup m_tags.
+ tagsChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TrackPrivateBaseGStreamer::~TrackPrivateBaseGStreamer()
</span><span class="lines">@@ -100,6 +102,7 @@
</span><span class="cx"> g_source_remove(m_tagTimerHandler);
</span><span class="cx">
</span><span class="cx"> m_pad.clear();
</span><ins>+ m_tags.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TrackPrivateBaseGStreamer::activeChanged()
</span><span class="lines">@@ -114,6 +117,14 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_tagTimerHandler)
</span><span class="cx"> g_source_remove(m_tagTimerHandler);
</span><ins>+
+ GRefPtr<GstTagList> tags;
+ g_object_get(m_pad.get(), "tags", &tags.outPtr(), NULL);
+ {
+ MutexLocker lock(m_tagMutex);
+ m_tags.swap(tags);
+ }
+
</ins><span class="cx"> m_tagTimerHandler = g_timeout_add(0,
</span><span class="cx"> reinterpret_cast<GSourceFunc>(trackPrivateTagsChangeTimeoutCallback), this);
</span><span class="cx"> }
</span><span class="lines">@@ -149,7 +160,10 @@
</span><span class="cx">
</span><span class="cx"> TrackPrivateBaseClient* client = m_owner->client();
</span><span class="cx"> GRefPtr<GstTagList> tags;
</span><del>- g_object_get(m_pad.get(), "tags", &tags.outPtr(), NULL);
</del><ins>+ {
+ MutexLocker lock(m_tagMutex);
+ tags.swap(m_tags);
+ }
</ins><span class="cx"> if (!tags)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h (160374 => 160375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2013-12-10 18:53:51 UTC (rev 160374)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2013-12-10 18:54:40 UTC (rev 160375)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="cx"> #include "GRefPtrGStreamer.h"
</span><ins>+#include <wtf/ThreadingPrimitives.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -67,6 +68,9 @@
</span><span class="cx"> TrackPrivateBase* m_owner;
</span><span class="cx"> guint m_activeTimerHandler;
</span><span class="cx"> guint m_tagTimerHandler;
</span><ins>+
+ Mutex m_tagMutex;
+ GRefPtr<GstTagList> m_tags;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>