<!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>[192019] 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/192019">192019</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-04 02:13:27 -0800 (Wed, 04 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Use RunLoop::Timer for ready state timer in MediaPlayerPrivateGStreamer
https://bugs.webkit.org/show_bug.cgi?id=150836
Reviewed by Philippe Normand.
We don't really need a GThreadSafeMainLoopSource for this simple timer.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::readyTimerFired):
(WebCore::MediaPlayerPrivateGStreamer::changePipelineState):
(WebCore::MediaPlayerPrivateGStreamer::loadingFailed):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192018 => 192019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-04 09:34:37 UTC (rev 192018)
+++ trunk/Source/WebCore/ChangeLog 2015-11-04 10:13:27 UTC (rev 192019)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-11-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GStreamer] Use RunLoop::Timer for ready state timer in MediaPlayerPrivateGStreamer
+ https://bugs.webkit.org/show_bug.cgi?id=150836
+
+ Reviewed by Philippe Normand.
+
+ We don't really need a GThreadSafeMainLoopSource for this simple timer.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
+ (WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer):
+ (WebCore::MediaPlayerPrivateGStreamer::readyTimerFired):
+ (WebCore::MediaPlayerPrivateGStreamer::changePipelineState):
+ (WebCore::MediaPlayerPrivateGStreamer::loadingFailed):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
</ins><span class="cx"> 2015-11-04 Frederic Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Add support for the USE_TYPO_METRICS flag on iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (192018 => 192019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-11-04 09:34:37 UTC (rev 192018)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-11-04 10:13:27 UTC (rev 192019)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><del>-#include <wtf/RunLoop.h>
</del><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -70,10 +69,6 @@
</span><span class="cx"> #include "AudioSourceProviderGStreamer.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// Max interval in seconds to stay in the READY state on manual
-// state change requests.
-static const unsigned gReadyStateTimerInterval = 60;
-
</del><span class="cx"> GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug);
</span><span class="cx"> #define GST_CAT_DEFAULT webkit_media_player_debug
</span><span class="cx">
</span><span class="lines">@@ -202,6 +197,7 @@
</span><span class="cx"> , m_volumeAndMuteInitialized(false)
</span><span class="cx"> , m_hasVideo(false)
</span><span class="cx"> , m_hasAudio(false)
</span><ins>+ , m_readyTimerHandler(RunLoop::main(), this, &MediaPlayerPrivateGStreamer::readyTimerFired)
</ins><span class="cx"> , m_totalBytes(0)
</span><span class="cx"> , m_preservesPitch(false)
</span><span class="cx"> #if ENABLE(WEB_AUDIO)
</span><span class="lines">@@ -209,6 +205,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_requestedState(GST_STATE_VOID_PENDING)
</span><span class="cx"> {
</span><ins>+#if USE(GLIB) && !PLATFORM(EFL)
+ m_readyTimerHandler.setPriority(G_PRIORITY_DEFAULT_IDLE);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer()
</span><span class="lines">@@ -235,7 +234,7 @@
</span><span class="cx"> g_signal_handlers_disconnect_by_func(G_OBJECT(m_autoAudioSink.get()),
</span><span class="cx"> reinterpret_cast<gpointer>(setAudioStreamPropertiesCallback), this);
</span><span class="cx">
</span><del>- m_readyTimerHandler.cancel();
</del><ins>+ m_readyTimerHandler.stop();
</ins><span class="cx"> if (m_missingPluginsCallback) {
</span><span class="cx"> m_missingPluginsCallback->invalidate();
</span><span class="cx"> m_missingPluginsCallback = nullptr;
</span><span class="lines">@@ -366,6 +365,11 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateGStreamer::readyTimerFired()
+{
+ changePipelineState(GST_STATE_NULL);
+}
+
</ins><span class="cx"> bool MediaPlayerPrivateGStreamer::changePipelineState(GstState newState)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pipeline);
</span><span class="lines">@@ -393,12 +397,13 @@
</span><span class="cx"> // if we stay for too long on READY.
</span><span class="cx"> // Also lets remove the timer if we request a state change for any state other than READY.
</span><span class="cx"> // See also https://bugs.webkit.org/show_bug.cgi?id=117354
</span><del>- if (newState == GST_STATE_READY && !m_readyTimerHandler.isScheduled()) {
- m_readyTimerHandler.scheduleAfterDelay("[WebKit] mediaPlayerPrivateReadyStateTimeoutCallback", std::function<void()>([this] { changePipelineState(GST_STATE_NULL); }),
- std::chrono::seconds(gReadyStateTimerInterval));
- } else if (newState != GST_STATE_READY && m_readyTimerHandler.isScheduled()) {
- m_readyTimerHandler.cancel();
- }
</del><ins>+ if (newState == GST_STATE_READY && !m_readyTimerHandler.isActive()) {
+ // Max interval in seconds to stay in the READY state on manual
+ // state change requests.
+ static const double readyStateTimerDelay = 60;
+ m_readyTimerHandler.startOneShot(readyStateTimerDelay);
+ } else if (newState != GST_STATE_READY)
+ m_readyTimerHandler.stop();
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1687,7 +1692,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Loading failed, remove ready timer.
</span><del>- m_readyTimerHandler.cancel();
</del><ins>+ m_readyTimerHandler.stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashSet<String> mimeTypeCache()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (192018 => 192019)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-11-04 09:34:37 UTC (rev 192018)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-11-04 10:13:27 UTC (rev 192019)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/pbutils/install-plugins.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx"> #include <wtf/glib/GThreadSafeMainLoopSource.h>
</span><span class="cx">
</span><span class="lines">@@ -188,6 +189,8 @@
</span><span class="cx"> MediaTime totalFrameDelay() override { return MediaTime::zeroTime(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void readyTimerFired();
+
</ins><span class="cx"> WeakPtrFactory<MediaPlayerPrivateGStreamer> m_weakPtrFactory;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GstElement> m_source;
</span><span class="lines">@@ -229,7 +232,7 @@
</span><span class="cx"> GThreadSafeMainLoopSource m_textTimerHandler;
</span><span class="cx"> GThreadSafeMainLoopSource m_videoTimerHandler;
</span><span class="cx"> GThreadSafeMainLoopSource m_videoCapsTimerHandler;
</span><del>- GThreadSafeMainLoopSource m_readyTimerHandler;
</del><ins>+ RunLoop::Timer<MediaPlayerPrivateGStreamer> m_readyTimerHandler;
</ins><span class="cx"> mutable unsigned long long m_totalBytes;
</span><span class="cx"> URL m_url;
</span><span class="cx"> bool m_preservesPitch;
</span></span></pre>
</div>
</div>
</body>
</html>