Changeset 175945 in webkit

Timestamp:

Nov 11, 2014, 9:32:40 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175526 - [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:

Location:

releases/WebKitGTK/webkit-2.6/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/MediaPlayer.cpp (modified) (1 diff)
• platform/graphics/MediaPlayerPrivate.h (modified) (2 diffs)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (modified) (1 diff)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (4 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (modified) (2 diffs)
• platform/graphics/mac/MediaPlayerPrivateQTKit.h (modified) (1 diff)
• platform/graphics/mac/MediaPlayerPrivateQTKit.mm (modified) (1 diff)

releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2014-11-04  Nikos Andronikos  <nikos.andronikos-webkit@cisra.canon.com.au>
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -131 +131 @@
     virtual std::unique_ptr<PlatformTimeRanges> buffered() const { return PlatformTimeRanges::create(); }
 
-    virtual unsigned totalBytes() const { return 0; }
+    virtual unsigned long long totalBytes() const { return 0; }
     virtual bool didLoadingProgress() const { return false; }
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

@@ -131 +131 @@
     virtual std::unique_ptr<PlatformTimeRanges> buffered() const = 0;
 
+    virtual unsigned long long totalBytes() const { return 0; }
     virtual bool didLoadingProgress() const = 0;
 
@@ -243 +244 @@
     virtual String languageOfPrimaryAudioTrack() const { return emptyString(); }
 
-    virtual size_t extraMemoryCost() const { return 0; }
-    
+    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);
+    }
+
     virtual unsigned long long fileSize() const { return 0; }
 

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

@@ -948 +948 @@
 }
 
-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);
-}
-
 void MediaPlayerPrivateAVFoundation::clearTextTracks()
 {

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h

@@ -293 +293 @@
     virtual String engineDescription() const { return "AVFoundation"; }
 
-    virtual size_t extraMemoryCost() const override;
-
     virtual void trackModeChanged() override;
 #if ENABLE(AVF_CAPTIONS)

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -212 +212 @@
     , m_hasVideo(false)
     , m_hasAudio(false)
-    , m_totalBytes(-1)
+    , m_totalBytes(0)
     , m_preservesPitch(false)
     , m_requestedState(GST_STATE_VOID_PENDING)
@@ -1229 +1229 @@
 }
 
-unsigned MediaPlayerPrivateGStreamer::totalBytes() const
+unsigned long long MediaPlayerPrivateGStreamer::totalBytes() const
 {
     if (m_errorOccured)
         return 0;
 
-    if (m_totalBytes != -1)
+    if (m_totalBytes)
         return m_totalBytes;
 
@@ -1244 +1244 @@
     if (gst_element_query_duration(m_source.get(), fmt, &length)) {
         INFO_MEDIA_MESSAGE("totalBytes %" G_GINT64_FORMAT, length);
-        m_totalBytes = static_cast<unsigned>(length);
+        m_totalBytes = static_cast<unsigned long long>(length);
         m_isStreaming = !length;
         return m_totalBytes;
@@ -1279 +1279 @@
 
     INFO_MEDIA_MESSAGE("totalBytes %" G_GINT64_FORMAT, length);
-    m_totalBytes = static_cast<unsigned>(length);
+    m_totalBytes = static_cast<unsigned long long>(length);
     m_isStreaming = !length;
     return m_totalBytes;

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

@@ -93 +93 @@
     float maxTimeSeekable() const;
     bool didLoadingProgress() const;
-    unsigned totalBytes() const;
+    unsigned long long totalBytes() const;
     float maxTimeLoaded() const;
 
@@ -208 +208 @@
     GThreadSafeMainLoopSource m_videoCapsTimerHandler;
     GThreadSafeMainLoopSource m_readyTimerHandler;
-    mutable long m_totalBytes;
+    mutable unsigned long long m_totalBytes;
     URL m_url;
     bool m_preservesPitch;

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h

@@ -124 +124 @@
     MediaTime maxMediaTimeSeekable() const;
     bool didLoadingProgress() const;
-    unsigned totalBytes() const;
+    unsigned long long totalBytes() const;
     
     void setVisible(bool);

releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm

@@ -979 +979 @@
 }
 
-unsigned MediaPlayerPrivateQTKit::totalBytes() const
+unsigned long long MediaPlayerPrivateQTKit::totalBytes() const
 {
     if (!metaDataAvailable())
         return 0;
-    return [[m_qtMovie.get() attributeForKey:QTMovieDataSizeAttribute] intValue];
+    return [[m_qtMovie.get() attributeForKey:QTMovieDataSizeAttribute] longLongValue];
 }