Changeset 55717 in webkit

Timestamp:

Mar 9, 2010 1:01:54 AM (14 years ago)

Author:

Philippe Normand

Message:

2010-03-09 Philippe Normand <​pnormand@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GStreamer] player code cleanups
​https://bugs.webkit.org/show_bug.cgi?id=35868

Cleaned up the private instance variables of the player.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivate::MediaPlayerPrivate): (WebCore::MediaPlayerPrivate::fillTimerFired): (WebCore::MediaPlayerPrivate::mediaLocationChanged):
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (5 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-09  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GStreamer] player code cleanups
+        https://bugs.webkit.org/show_bug.cgi?id=35868
+
+        Cleaned up the private instance variables of the player.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::fillTimerFired):
+        (WebCore::MediaPlayerPrivate::mediaLocationChanged):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
 2010-03-09  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -292 +292 @@
     , m_fillTimer(this, &MediaPlayerPrivate::fillTimerFired)
     , m_maxTimeLoaded(0)
-    , m_fillStatus(0)
 {
     if (doGstInit())
@@ -671 +670 @@
 
     gint64 start, stop;
+    gdouble fillStatus = 100.0;
 
     gst_query_parse_buffering_range(query, 0, &start, &stop, 0);
@@ -676 +676 @@
 
     if (stop != -1)
-        m_fillStatus = 100.0 * stop / GST_FORMAT_PERCENT_MAX;
-    else
-        m_fillStatus = 100.0;
-
-    LOG_VERBOSE(Media, "Download buffer filled up to %f%%", m_fillStatus);
+        fillStatus = 100.0 * stop / GST_FORMAT_PERCENT_MAX;
+
+    LOG_VERBOSE(Media, "Download buffer filled up to %f%%", fillStatus);
 
     if (!m_mediaDuration)
@@ -688 +686 @@
     // available. Otherwise we can't compute it.
     if (m_mediaDuration) {
-        m_maxTimeLoaded = static_cast<float>((m_fillStatus * m_mediaDuration) / 100.0);
+        m_maxTimeLoaded = static_cast<float>((fillStatus * m_mediaDuration) / 100.0);
         LOG_VERBOSE(Media, "Updated maxTimeLoaded: %f", m_maxTimeLoaded);
     }
 
-    if (m_fillStatus != 100.0) {
+    if (fillStatus != 100.0) {
         updateStates();
         return;
@@ -935 +933 @@
 
         if (locations)
-            m_mediaLocationCurrentIndex = gst_value_list_get_size(locations) -1;
+            m_mediaLocationCurrentIndex = static_cast<int>(gst_value_list_get_size(locations)) -1;
 
         loadNextLocation();

trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

@@ -155 +155 @@
             GstBuffer* m_buffer;
             GstStructure* m_mediaLocations;
-            gint m_mediaLocationCurrentIndex;
+            int m_mediaLocationCurrentIndex;
             bool m_resetPipeline;
             bool m_paused;
@@ -161 +161 @@
             float m_playbackRate;
             bool m_errorOccured;
-            gfloat m_mediaDuration;
+            float m_mediaDuration;
             bool m_startedBuffering;
             Timer<MediaPlayerPrivate> m_fillTimer;
             float m_maxTimeLoaded;
-            gdouble m_fillStatus;
     };
 }