[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
kov at webkit.org
kov at webkit.org
Thu Apr 8 02:18:44 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 75fb4b955ff43d88d599189972a85eb1b6fc32c4
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 10 18:59:41 2010 +0000
2010-03-10 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Roll-out r55657, as Xan noticed a bad degradation in playing
youtube HTML5 videos with it, that is fixed with it
reverted. Looks like we'll need to work a bit more on this.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
(WebCore::MediaPlayerPrivate::~MediaPlayerPrivate):
(WebCore::MediaPlayerPrivate::volumeChangedTimerFired):
(WebCore::MediaPlayerPrivate::volumeChanged):
(WebCore::MediaPlayerPrivate::processBufferingStats):
(WebCore::MediaPlayerPrivate::fillTimerFired):
(WebCore::MediaPlayerPrivate::maxTimeLoaded):
(WebCore::MediaPlayerPrivate::updateStates):
(WebCore::MediaPlayerPrivate::muteChangedTimerFired):
(WebCore::MediaPlayerPrivate::muteChanged):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55789 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7790fc1..faf2e2b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,24 @@
2010-03-10 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+ Roll-out r55657, as Xan noticed a bad degradation in playing
+ youtube HTML5 videos with it, that is fixed with it
+ reverted. Looks like we'll need to work a bit more on this.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+ (WebCore::MediaPlayerPrivate::~MediaPlayerPrivate):
+ (WebCore::MediaPlayerPrivate::volumeChangedTimerFired):
+ (WebCore::MediaPlayerPrivate::volumeChanged):
+ (WebCore::MediaPlayerPrivate::processBufferingStats):
+ (WebCore::MediaPlayerPrivate::fillTimerFired):
+ (WebCore::MediaPlayerPrivate::maxTimeLoaded):
+ (WebCore::MediaPlayerPrivate::updateStates):
+ (WebCore::MediaPlayerPrivate::muteChangedTimerFired):
+ (WebCore::MediaPlayerPrivate::muteChanged):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
+2010-03-10 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
Rubber-stamped by Xan Lopez.
Fix ready state when buffering under PLAYING. We should not go
@@ -1139,29 +1158,6 @@
(WebCore::Settings::Settings):
* page/Settings.h:
-2010-03-04 Philippe Normand <pnormand at igalia.com>
-
- Reviewed by Eric Seidel.
-
- [GStreamer] replace g_idle_add / g_timeout_add calls with Timers in the gstreamer player
- https://bugs.webkit.org/show_bug.cgi?id=35735
-
- Replaced g_idle_add calls with Timers immediately started once
- only. The g_timeout_add was replaced by a periodic Timer.
-
- * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
- (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
- (WebCore::MediaPlayerPrivate::~MediaPlayerPrivate):
- (WebCore::MediaPlayerPrivate::volumeChangedTimerFired):
- (WebCore::MediaPlayerPrivate::volumeChanged):
- (WebCore::MediaPlayerPrivate::processBufferingStats):
- (WebCore::MediaPlayerPrivate::fillTimerFired):
- (WebCore::MediaPlayerPrivate::maxTimeLoaded):
- (WebCore::MediaPlayerPrivate::updateStates):
- (WebCore::MediaPlayerPrivate::muteChangedTimerFired):
- (WebCore::MediaPlayerPrivate::muteChanged):
- * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
-
2010-03-07 David Levin <levin at chromium.org>
Chromium Linux build fix.
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index e683ee3..2acf149 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -177,6 +177,13 @@ void mediaPlayerPrivateVolumeChangedCallback(GObject *element, GParamSpec *pspec
mp->volumeChanged();
}
+gboolean notifyVolumeIdleCallback(gpointer data)
+{
+ MediaPlayerPrivate* mp = reinterpret_cast<MediaPlayerPrivate*>(data);
+ mp->volumeChangedCallback();
+ return FALSE;
+}
+
void mediaPlayerPrivateMuteChangedCallback(GObject *element, GParamSpec *pspec, gpointer data)
{
// This is called when playbin receives the notify::mute signal.
@@ -184,6 +191,19 @@ void mediaPlayerPrivateMuteChangedCallback(GObject *element, GParamSpec *pspec,
mp->muteChanged();
}
+gboolean notifyMuteIdleCallback(gpointer data)
+{
+ MediaPlayerPrivate* mp = reinterpret_cast<MediaPlayerPrivate*>(data);
+ mp->muteChangedCallback();
+ return FALSE;
+}
+
+gboolean bufferingTimeoutCallback(gpointer data)
+{
+ MediaPlayerPrivate* mp = reinterpret_cast<MediaPlayerPrivate*>(data);
+ return mp->queryBufferingStats();
+}
+
static float playbackPosition(GstElement* playbin)
{
@@ -287,9 +307,11 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
, m_buffering(false)
, m_playbackRate(1)
, m_errorOccured(false)
+ , m_volumeIdleId(0)
, m_mediaDuration(0)
+ , m_muteIdleId(0)
, m_startedBuffering(false)
- , m_fillTimer(this, &MediaPlayerPrivate::fillTimerFired)
+ , m_fillTimeoutId(0)
, m_maxTimeLoaded(0)
, m_bufferingPercentage(0)
{
@@ -299,8 +321,20 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
MediaPlayerPrivate::~MediaPlayerPrivate()
{
- if (m_fillTimer.isActive())
- m_fillTimer.stop();
+ if (m_fillTimeoutId) {
+ g_source_remove(m_fillTimeoutId);
+ m_fillTimeoutId = 0;
+ }
+
+ if (m_volumeIdleId) {
+ g_source_remove(m_volumeIdleId);
+ m_volumeIdleId = 0;
+ }
+
+ if (m_muteIdleId) {
+ g_source_remove(m_muteIdleId);
+ m_muteIdleId = 0;
+ }
if (m_buffer)
gst_buffer_unref(m_buffer);
@@ -560,7 +594,7 @@ void MediaPlayerPrivate::setVolume(float volume)
g_object_set(m_playBin, "volume", static_cast<double>(volume), NULL);
}
-void MediaPlayerPrivate::volumeChangedTimerFired(Timer<MediaPlayerPrivate>*)
+void MediaPlayerPrivate::volumeChangedCallback()
{
double volume;
g_object_get(m_playBin, "volume", &volume, NULL);
@@ -569,8 +603,9 @@ void MediaPlayerPrivate::volumeChangedTimerFired(Timer<MediaPlayerPrivate>*)
void MediaPlayerPrivate::volumeChanged()
{
- Timer<MediaPlayerPrivate> volumeChangedTimer(this, &MediaPlayerPrivate::volumeChangedTimerFired);
- volumeChangedTimer.startOneShot(0);
+ if (m_volumeIdleId)
+ g_source_remove(m_volumeIdleId);
+ m_volumeIdleId = g_idle_add((GSourceFunc) notifyVolumeIdleCallback, this);
}
void MediaPlayerPrivate::setRate(float rate)
@@ -669,20 +704,20 @@ void MediaPlayerPrivate::processBufferingStats(GstMessage* message)
m_startedBuffering = true;
- if (m_fillTimer.isActive())
- m_fillTimer.stop();
+ if (m_fillTimeoutId > 0)
+ g_source_remove(m_fillTimeoutId);
- m_fillTimer.startRepeating(0.2);
+ m_fillTimeoutId = g_timeout_add(200, (GSourceFunc) bufferingTimeoutCallback, this);
}
}
-void MediaPlayerPrivate::fillTimerFired(Timer<MediaPlayerPrivate>*)
+bool MediaPlayerPrivate::queryBufferingStats()
{
GstQuery* query = gst_query_new_buffering(GST_FORMAT_PERCENT);
if (!gst_element_query(m_playBin, query)) {
gst_query_unref(query);
- return;
+ return TRUE;
}
gint64 start, stop;
@@ -708,15 +743,16 @@ void MediaPlayerPrivate::fillTimerFired(Timer<MediaPlayerPrivate>*)
if (fillStatus != 100.0) {
updateStates();
- return;
+ return TRUE;
}
// Media is now fully loaded. It will play even if network
// connection is cut. Buffering is done, remove the fill source
// from the main loop.
- m_fillTimer.stop();
+ m_fillTimeoutId = 0;
m_startedBuffering = false;
updateStates();
+ return FALSE;
}
float MediaPlayerPrivate::maxTimeSeekable() const
@@ -738,7 +774,7 @@ float MediaPlayerPrivate::maxTimeLoaded() const
return 0.0;
float loaded = m_maxTimeLoaded;
- if (!loaded && !m_fillTimer.isActive())
+ if (!loaded && !m_fillTimeoutId)
loaded = duration();
LOG_VERBOSE(Media, "maxTimeLoaded: %f", loaded);
return loaded;
@@ -863,7 +899,8 @@ void MediaPlayerPrivate::updateStates()
m_paused = true;
// Is on-disk buffering in progress?
- if (m_fillTimer.isActive())
+
+ if (m_fillTimeoutId)
m_networkState = MediaPlayer::Loading;
if (m_changingRate) {
@@ -1105,7 +1142,7 @@ void MediaPlayerPrivate::setMuted(bool muted)
g_object_set(m_playBin, "mute", muted, NULL);
}
-void MediaPlayerPrivate::muteChangedTimerFired(Timer<MediaPlayerPrivate>*)
+void MediaPlayerPrivate::muteChangedCallback()
{
gboolean muted;
g_object_get(m_playBin, "mute", &muted, NULL);
@@ -1114,8 +1151,10 @@ void MediaPlayerPrivate::muteChangedTimerFired(Timer<MediaPlayerPrivate>*)
void MediaPlayerPrivate::muteChanged()
{
- Timer<MediaPlayerPrivate> muteChangedTimer(this, &MediaPlayerPrivate::muteChangedTimerFired);
- muteChangedTimer.startOneShot(0);
+ if (m_muteIdleId)
+ g_source_remove(m_muteIdleId);
+
+ m_muteIdleId = g_idle_add((GSourceFunc) notifyMuteIdleCallback, this);
}
void MediaPlayerPrivate::loadingFailed(MediaPlayer::NetworkState error)
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
index 6ef9ad1..8f3166e 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
@@ -80,15 +80,15 @@ class MediaPlayerPrivate : public MediaPlayerPrivateInterface {
void setVolume(float);
void volumeChanged();
- void volumeChangedTimerFired(Timer<MediaPlayerPrivate>*);
+ void volumeChangedCallback();
bool supportsMuting() const;
void setMuted(bool);
void muteChanged();
- void muteChangedTimerFired(Timer<MediaPlayerPrivate>*);
+ void muteChangedCallback();
void setPreload(MediaPlayer::Preload);
- void fillTimerFired(Timer<MediaPlayerPrivate>*);
+ bool queryBufferingStats();
MediaPlayer::NetworkState networkState() const;
MediaPlayer::ReadyState readyState() const;
@@ -160,9 +160,11 @@ class MediaPlayerPrivate : public MediaPlayerPrivateInterface {
bool m_buffering;
float m_playbackRate;
bool m_errorOccured;
- float m_mediaDuration;
+ guint m_volumeIdleId;
+ gfloat m_mediaDuration;
+ guint m_muteIdleId;
bool m_startedBuffering;
- Timer<MediaPlayerPrivate> m_fillTimer;
+ guint m_fillTimeoutId;
float m_maxTimeLoaded;
int m_bufferingPercentage;
};
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list