<!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>[168681] 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/168681">168681</a></dd>
<dt>Author</dt> <dd>calvaris@igalia.com</dd>
<dt>Date</dt> <dd>2014-05-13 08:20:19 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Move toGstClockTime to utilities
https://bugs.webkit.org/show_bug.cgi?id=132702
Reviewed by Philippe Normand.
toGstClockTime should be in GStreamerUtilities and corrected typo
in getGstPlayFlag.
No new tests needed.
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
(WebCore::getGstPlayFlag): Renamed from getGstPlaysFlag.
(WebCore::toGstClockTime): Moved from MediaPlayerPrivateGStreamer.
(WebCore::getGstPlaysFlag): Deleted.
* platform/graphics/gstreamer/GStreamerUtilities.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::setDownloadBuffering):
Corrected getGstPlayFlag typo.
(WebCore::toGstClockTime): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp">trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiesh">trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168680 => 168681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-13 14:44:50 UTC (rev 168680)
+++ trunk/Source/WebCore/ChangeLog 2014-05-13 15:20:19 UTC (rev 168681)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-13 Xabier Rodriguez Calvar <calvaris@igalia.com>
+
+ [GStreamer] Move toGstClockTime to utilities
+ https://bugs.webkit.org/show_bug.cgi?id=132702
+
+ Reviewed by Philippe Normand.
+
+ toGstClockTime should be in GStreamerUtilities and corrected typo
+ in getGstPlayFlag.
+
+ No new tests needed.
+
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ (WebCore::getGstPlayFlag): Renamed from getGstPlaysFlag.
+ (WebCore::toGstClockTime): Moved from MediaPlayerPrivateGStreamer.
+ (WebCore::getGstPlaysFlag): Deleted.
+ * platform/graphics/gstreamer/GStreamerUtilities.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::setDownloadBuffering):
+ Corrected getGstPlayFlag typo.
+ (WebCore::toGstClockTime): Deleted.
+
</ins><span class="cx"> 2014-05-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Make a few icon database improvements
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (168680 => 168681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2014-05-13 14:44:50 UTC (rev 168680)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2014-05-13 15:20:19 UTC (rev 168681)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> return gstInitialized;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned getGstPlaysFlag(const char* nick)
</del><ins>+unsigned getGstPlayFlag(const char* nick)
</ins><span class="cx"> {
</span><span class="cx"> static GFlagsClass* flagsClass = static_cast<GFlagsClass*>(g_type_class_ref(g_type_from_name("GstPlayFlags")));
</span><span class="cx"> ASSERT(flagsClass);
</span><span class="lines">@@ -146,6 +146,18 @@
</span><span class="cx"> return flag->value;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+GstClockTime toGstClockTime(float time)
+{
+ // Extract the integer part of the time (seconds) and the fractional part (microseconds). Attempt to
+ // round the microseconds so no floating point precision is lost and we can perform an accurate seek.
+ float seconds;
+ float microSeconds = modff(time, &seconds) * 1000000;
+ GTimeVal timeValue;
+ timeValue.tv_sec = static_cast<glong>(seconds);
+ timeValue.tv_usec = static_cast<glong>(roundf(microSeconds / 10000) * 10000);
+ return GST_TIMEVAL_TO_TIME(timeValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif // USE(GSTREAMER)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h (168680 => 168681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2014-05-13 14:44:50 UTC (rev 168680)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.h 2014-05-13 15:20:19 UTC (rev 168681)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> void mapGstBuffer(GstBuffer*);
</span><span class="cx"> void unmapGstBuffer(GstBuffer*);
</span><span class="cx"> bool initializeGStreamer();
</span><del>-unsigned getGstPlaysFlag(const char* nick);
</del><ins>+unsigned getGstPlayFlag(const char* nick);
+GstClockTime toGstClockTime(float time);
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (168680 => 168681)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-05-13 14:44:50 UTC (rev 168680)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-05-13 15:20:19 UTC (rev 168681)
</span><span class="lines">@@ -124,18 +124,6 @@
</span><span class="cx"> player->handlePluginInstallerResult(result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static GstClockTime toGstClockTime(float time)
-{
- // Extract the integer part of the time (seconds) and the fractional part (microseconds). Attempt to
- // round the microseconds so no floating point precision is lost and we can perform an accurate seek.
- float seconds;
- float microSeconds = modf(time, &seconds) * 1000000;
- GTimeVal timeValue;
- timeValue.tv_sec = static_cast<glong>(seconds);
- timeValue.tv_usec = static_cast<glong>(roundf(microSeconds / 10000) * 10000);
- return GST_TIMEVAL_TO_TIME(timeValue);
-}
-
</del><span class="cx"> void MediaPlayerPrivateGStreamer::setAudioStreamProperties(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> if (g_strcmp0(G_OBJECT_TYPE_NAME(object), "GstPulseSink"))
</span><span class="lines">@@ -1769,7 +1757,7 @@
</span><span class="cx"> unsigned flags;
</span><span class="cx"> g_object_get(m_playBin.get(), "flags", &flags, NULL);
</span><span class="cx">
</span><del>- unsigned flagDownload = getGstPlaysFlag("download");
</del><ins>+ unsigned flagDownload = getGstPlayFlag("download");
</ins><span class="cx">
</span><span class="cx"> // We don't want to stop downloading if we already started it.
</span><span class="cx"> if (flags & flagDownload && m_readyState > MediaPlayer::HaveNothing && !m_resetPipeline)
</span></span></pre>
</div>
</div>
</body>
</html>