<!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>[175526] 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/175526">175526</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-04 01:29:13 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[LEAK] [GStreamer] Removing video element will not free assigned memory
https://bugs.webkit.org/show_bug.cgi?id=46560
Reviewed by Eric Carlson.
Moved the ::extraMemoryCost() implementation to the
MediaPlayerPivateInterface base class. This default implementation
is now shared between the various MediaPlayerPrivate backends,
excepted the AVF MediaSource player which still reports no extra
memory cost.
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::totalBytes): Make
totalBytes() part of the MediaPlayerPrivate interface.
(WebCore::MediaPlayerPrivateInterface::extraMemoryCost): Default
implementation.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::extraMemoryCost): Deleted.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h</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="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/ChangeLog 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-11-03 Philippe Normand <pnormand@igalia.com>
+
+ [LEAK] [GStreamer] Removing video element will not free assigned memory
+ https://bugs.webkit.org/show_bug.cgi?id=46560
+
+ Reviewed by Eric Carlson.
+
+ Moved the ::extraMemoryCost() implementation to the
+ MediaPlayerPivateInterface base class. This default implementation
+ is now shared between the various MediaPlayerPrivate backends,
+ excepted the AVF MediaSource player which still reports no extra
+ memory cost.
+
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::totalBytes): Make
+ totalBytes() part of the MediaPlayerPrivate interface.
+ (WebCore::MediaPlayerPrivateInterface::extraMemoryCost): Default
+ implementation.
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::extraMemoryCost): Deleted.
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
</ins><span class="cx"> 2014-11-04 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> Fix animation of orient attribute on marker element
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> virtual double minTimeSeekable() const { return 0; }
</span><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> buffered() const { return PlatformTimeRanges::create(); }
</span><span class="cx">
</span><del>- virtual unsigned totalBytes() const { return 0; }
</del><ins>+ virtual unsigned long long totalBytes() const { return 0; }
</ins><span class="cx"> virtual bool didLoadingProgress() const { return false; }
</span><span class="cx">
</span><span class="cx"> virtual void setSize(const IntSize&) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> virtual MediaTime minMediaTimeSeekable() const { return MediaTime::createWithDouble(minTimeSeekable()); }
</span><span class="cx"> virtual std::unique_ptr<PlatformTimeRanges> buffered() const = 0;
</span><span class="cx">
</span><ins>+ virtual unsigned long long totalBytes() const { return 0; }
</ins><span class="cx"> virtual bool didLoadingProgress() const = 0;
</span><span class="cx">
</span><span class="cx"> virtual void setSize(const IntSize&) = 0;
</span><span class="lines">@@ -240,8 +241,16 @@
</span><span class="cx">
</span><span class="cx"> virtual String languageOfPrimaryAudioTrack() const { return emptyString(); }
</span><span class="cx">
</span><del>- virtual size_t extraMemoryCost() const { return 0; }
-
</del><ins>+ virtual size_t extraMemoryCost() const
+ {
+ MediaTime duration = this->durationMediaTime();
+ if (!duration)
+ return 0;
+
+ unsigned long long extra = totalBytes() * buffered()->totalDuration().toDouble() / duration.toDouble();
+ return static_cast<unsigned>(extra);
+ }
+
</ins><span class="cx"> virtual unsigned long long fileSize() const { return 0; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -945,16 +945,6 @@
</span><span class="cx"> scheduleMainThreadNotification(Notification::InbandTracksNeedConfiguration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-size_t MediaPlayerPrivateAVFoundation::extraMemoryCost() const
-{
- MediaTime duration = this->durationMediaTime();
- if (!duration)
- return 0;
-
- unsigned long long extra = totalBytes() * buffered()->totalDuration().toDouble() / duration.toDouble();
- return static_cast<unsigned>(extra);
-}
-
</del><span class="cx"> void MediaPlayerPrivateAVFoundation::clearTextTracks()
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < m_textTracks.size(); ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -292,8 +292,6 @@
</span><span class="cx">
</span><span class="cx"> virtual String engineDescription() const { return "AVFoundation"; }
</span><span class="cx">
</span><del>- virtual size_t extraMemoryCost() const override;
-
</del><span class="cx"> virtual void trackModeChanged() override;
</span><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><span class="cx"> virtual void notifyTrackModeChanged() { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> , m_volumeAndMuteInitialized(false)
</span><span class="cx"> , m_hasVideo(false)
</span><span class="cx"> , m_hasAudio(false)
</span><del>- , m_totalBytes(-1)
</del><ins>+ , m_totalBytes(0)
</ins><span class="cx"> , m_preservesPitch(false)
</span><span class="cx"> , m_requestedState(GST_STATE_VOID_PENDING)
</span><span class="cx"> , m_missingPlugins(false)
</span><span class="lines">@@ -1227,12 +1227,12 @@
</span><span class="cx"> return didLoadingProgress;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned MediaPlayerPrivateGStreamer::totalBytes() const
</del><ins>+unsigned long long MediaPlayerPrivateGStreamer::totalBytes() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_errorOccured)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (m_totalBytes != -1)
</del><ins>+ if (m_totalBytes)
</ins><span class="cx"> return m_totalBytes;
</span><span class="cx">
</span><span class="cx"> if (!m_source)
</span><span class="lines">@@ -1242,7 +1242,7 @@
</span><span class="cx"> gint64 length = 0;
</span><span class="cx"> if (gst_element_query_duration(m_source.get(), fmt, &length)) {
</span><span class="cx"> INFO_MEDIA_MESSAGE("totalBytes %" G_GINT64_FORMAT, length);
</span><del>- m_totalBytes = static_cast<unsigned>(length);
</del><ins>+ m_totalBytes = static_cast<unsigned long long>(length);
</ins><span class="cx"> m_isStreaming = !length;
</span><span class="cx"> return m_totalBytes;
</span><span class="cx"> }
</span><span class="lines">@@ -1277,7 +1277,7 @@
</span><span class="cx"> gst_iterator_free(iter);
</span><span class="cx">
</span><span class="cx"> INFO_MEDIA_MESSAGE("totalBytes %" G_GINT64_FORMAT, length);
</span><del>- m_totalBytes = static_cast<unsigned>(length);
</del><ins>+ m_totalBytes = static_cast<unsigned long long>(length);
</ins><span class="cx"> m_isStreaming = !length;
</span><span class="cx"> return m_totalBytes;
</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 (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> std::unique_ptr<PlatformTimeRanges> buffered() const;
</span><span class="cx"> float maxTimeSeekable() const;
</span><span class="cx"> bool didLoadingProgress() const;
</span><del>- unsigned totalBytes() const;
</del><ins>+ unsigned long long totalBytes() const;
</ins><span class="cx"> float maxTimeLoaded() const;
</span><span class="cx">
</span><span class="cx"> void loadStateChanged();
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> GThreadSafeMainLoopSource m_videoTimerHandler;
</span><span class="cx"> GThreadSafeMainLoopSource m_videoCapsTimerHandler;
</span><span class="cx"> GThreadSafeMainLoopSource m_readyTimerHandler;
</span><del>- mutable long m_totalBytes;
</del><ins>+ mutable unsigned long long m_totalBytes;
</ins><span class="cx"> URL m_url;
</span><span class="cx"> bool m_preservesPitch;
</span><span class="cx"> GstState m_requestedState;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> std::unique_ptr<PlatformTimeRanges> buffered() const;
</span><span class="cx"> MediaTime maxMediaTimeSeekable() const;
</span><span class="cx"> bool didLoadingProgress() const;
</span><del>- unsigned totalBytes() const;
</del><ins>+ unsigned long long totalBytes() const;
</ins><span class="cx">
</span><span class="cx"> void setVisible(bool);
</span><span class="cx"> void setSize(const IntSize&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (175525 => 175526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-11-04 09:20:52 UTC (rev 175525)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2014-11-04 09:29:13 UTC (rev 175526)
</span><span class="lines">@@ -871,11 +871,11 @@
</span><span class="cx"> return didLoadingProgress;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned MediaPlayerPrivateQTKit::totalBytes() const
</del><ins>+unsigned long long MediaPlayerPrivateQTKit::totalBytes() const
</ins><span class="cx"> {
</span><span class="cx"> if (!metaDataAvailable())
</span><span class="cx"> return 0;
</span><del>- return [[m_qtMovie.get() attributeForKey:QTMovieDataSizeAttribute] intValue];
</del><ins>+ return [[m_qtMovie.get() attributeForKey:QTMovieDataSizeAttribute] longLongValue];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateQTKit::cancelLoad()
</span></span></pre>
</div>
</div>
</body>
</html>