Changeset 78571 in webkit

Timestamp:

Feb 15, 2011 8:59:06 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-02-15 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

[GStreamer] Video player sets system volume to 100%
​https://bugs.webkit.org/show_bug.cgi?id=54140

Don't explicitely set volume at startup and use the
GstStreamVolume interface with cubic volume scale when
updating/retrieving the volume value. This gives a much better
user-experience.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-15  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GStreamer] Video player sets system volume to 100%
+        https://bugs.webkit.org/show_bug.cgi?id=54140
+
+        Don't explicitely set volume at startup and use the
+        GstStreamVolume interface with cubic volume scale when
+        updating/retrieving the volume value. This gives a much better
+        user-experience.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+
 2011-02-15  Adam Barth  <abarth@webkit.org>
 

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

@@ -47 +47 @@
 #include <GOwnPtr.h>
 #include <gst/gst.h>
+#include <gst/interfaces/streamvolume.h>
 #include <gst/video/video.h>
 #include <limits>
@@ -641 +642 @@
         return;
 
-    g_object_set(m_playBin, "volume", static_cast<double>(volume), NULL);
+    gst_stream_volume_set_volume(GST_STREAM_VOLUME(m_playBin), GST_STREAM_VOLUME_FORMAT_CUBIC,
+                                 static_cast<double>(volume));
 }
 
@@ -651 +653 @@
         return;
     double volume;
-    g_object_get(m_playBin, "volume", &volume, NULL);
+    volume = gst_stream_volume_get_volume(GST_STREAM_VOLUME(m_playBin), GST_STREAM_VOLUME_FORMAT_CUBIC);
+    // get_volume() can return values superior to 1.0 if the user
+    // applies software user gain via third party application (GNOME
+    // volume control for instance).
+    volume = CLAMP(volume, 0.0, 1.0);
     m_player->volumeChanged(static_cast<float>(volume));
 }
@@ -1562 +1568 @@
     gst_object_unref(bus);
 
-    g_object_set(m_playBin, "mute", m_player->muted(), "volume", m_player->volume(), NULL);
+    g_object_set(m_playBin, "mute", m_player->muted(), NULL);
 
     g_signal_connect(m_playBin, "notify::volume", G_CALLBACK(mediaPlayerPrivateVolumeChangedCallback), this);