<!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>[172443] 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/172443">172443</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-12 04:29:43 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dont allocate GCond in VideoSinkGStreamer.cpp dynamically.
Rubber-stamped by Carlos Garcia Campos.
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
(_WebKitVideoSinkPrivate::_WebKitVideoSinkPrivate): Move the
g_cond_init() and gst_video_info_init() calls here.
(_WebKitVideoSinkPrivate::~_WebKitVideoSinkPrivate): Move the
g_cond_clear() call here.
(webkit_video_sink_init):
(webkitVideoSinkTimeoutCallback):
(webkitVideoSinkRender):
(unlockBufferMutex):
(webkit_video_sink_class_init):
(webkitVideoSinkDispose): Deleted. Not required anymore.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172442 => 172443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 10:55:46 UTC (rev 172442)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 11:29:43 UTC (rev 172443)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-08-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Dont allocate GCond in VideoSinkGStreamer.cpp dynamically.
+
+ Rubber-stamped by Carlos Garcia Campos.
+
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ (_WebKitVideoSinkPrivate::_WebKitVideoSinkPrivate): Move the
+ g_cond_init() and gst_video_info_init() calls here.
+ (_WebKitVideoSinkPrivate::~_WebKitVideoSinkPrivate): Move the
+ g_cond_clear() call here.
+ (webkit_video_sink_init):
+ (webkitVideoSinkTimeoutCallback):
+ (webkitVideoSinkRender):
+ (unlockBufferMutex):
+ (webkit_video_sink_class_init):
+ (webkitVideoSinkDispose): Deleted. Not required anymore.
+
+2014-08-12 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Clean up GMutexLocker
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135833
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (172442 => 172443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2014-08-12 10:55:46 UTC (rev 172442)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2014-08-12 11:29:43 UTC (rev 172443)
</span><span class="lines">@@ -77,17 +77,20 @@
</span><span class="cx"> _WebKitVideoSinkPrivate()
</span><span class="cx"> {
</span><span class="cx"> g_mutex_init(&bufferMutex);
</span><ins>+ g_cond_init(&dataCondition);
+ gst_video_info_init(&info);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~_WebKitVideoSinkPrivate()
</span><span class="cx"> {
</span><span class="cx"> g_mutex_clear(&bufferMutex);
</span><ins>+ g_cond_clear(&dataCondition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GstBuffer* buffer;
</span><span class="cx"> GMainLoopSource timeoutSource;
</span><span class="cx"> GMutex bufferMutex;
</span><del>- GCond* dataCondition;
</del><ins>+ GCond dataCondition;
</ins><span class="cx">
</span><span class="cx"> GstVideoInfo info;
</span><span class="cx">
</span><span class="lines">@@ -112,10 +115,6 @@
</span><span class="cx"> {
</span><span class="cx"> sink->priv = G_TYPE_INSTANCE_GET_PRIVATE(sink, WEBKIT_TYPE_VIDEO_SINK, WebKitVideoSinkPrivate);
</span><span class="cx"> new (sink->priv) WebKitVideoSinkPrivate();
</span><del>- sink->priv->dataCondition = new GCond;
- g_cond_init(sink->priv->dataCondition);
-
- gst_video_info_init(&sink->priv->info);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitVideoSinkTimeoutCallback(WebKitVideoSink* sink)
</span><span class="lines">@@ -127,13 +126,13 @@
</span><span class="cx"> priv->buffer = 0;
</span><span class="cx">
</span><span class="cx"> if (!buffer || priv->unlocked || UNLIKELY(!GST_IS_BUFFER(buffer))) {
</span><del>- g_cond_signal(priv->dataCondition);
</del><ins>+ g_cond_signal(&priv->dataCondition);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> g_signal_emit(sink, webkitVideoSinkSignals[REPAINT_REQUESTED], 0, buffer);
</span><span class="cx"> gst_buffer_unref(buffer);
</span><del>- g_cond_signal(priv->dataCondition);
</del><ins>+ g_cond_signal(&priv->dataCondition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static GstFlowReturn webkitVideoSinkRender(GstBaseSink* baseSink, GstBuffer* buffer)
</span><span class="lines">@@ -228,24 +227,10 @@
</span><span class="cx"> priv->timeoutSource.schedule("[WebKit] webkitVideoSinkTimeoutCallback", std::function<void()>(std::bind(webkitVideoSinkTimeoutCallback, sink)), G_PRIORITY_DEFAULT,
</span><span class="cx"> [sink] { gst_object_unref(sink); });
</span><span class="cx">
</span><del>- g_cond_wait(priv->dataCondition, &priv->bufferMutex);
</del><ins>+ g_cond_wait(&priv->dataCondition, &priv->bufferMutex);
</ins><span class="cx"> return GST_FLOW_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void webkitVideoSinkDispose(GObject* object)
-{
- WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(object);
- WebKitVideoSinkPrivate* priv = sink->priv;
-
- if (priv->dataCondition) {
- g_cond_clear(priv->dataCondition);
- delete priv->dataCondition;
- priv->dataCondition = 0;
- }
-
- G_OBJECT_CLASS(parent_class)->dispose(object);
-}
-
</del><span class="cx"> static void webkitVideoSinkFinalize(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> WEBKIT_VIDEO_SINK(object)->priv->~WebKitVideoSinkPrivate();
</span><span class="lines">@@ -281,7 +266,7 @@
</span><span class="cx">
</span><span class="cx"> priv->unlocked = true;
</span><span class="cx">
</span><del>- g_cond_signal(priv->dataCondition);
</del><ins>+ g_cond_signal(&priv->dataCondition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gboolean webkitVideoSinkUnlock(GstBaseSink* baseSink)
</span><span class="lines">@@ -377,7 +362,6 @@
</span><span class="cx">
</span><span class="cx"> g_type_class_add_private(klass, sizeof(WebKitVideoSinkPrivate));
</span><span class="cx">
</span><del>- gobjectClass->dispose = webkitVideoSinkDispose;
</del><span class="cx"> gobjectClass->finalize = webkitVideoSinkFinalize;
</span><span class="cx"> gobjectClass->get_property = webkitVideoSinkGetProperty;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>