Changeset 188956 in webkit

Timestamp:

Aug 26, 2015 1:04:25 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r188472 - [GStreamer] Handle missing plugins better at runtime
​https://bugs.webkit.org/show_bug.cgi?id=146999

Reviewed by Carlos Garcia Campos.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::createAudioSink): Warn the
user if autoaudiosink wasn't found at runtime. In that case
playbin will try to be smart by itself, hopefully. Also moved a
couple GST_WARNING calls to WARN_MEDIA_MESSAGE.
(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Use
WARN_MEDIA_MESSAGE here as well.

Location:

releases/WebKitGTK/webkit-2.10/Source/WebCore

Files:

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

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

@@ +1 @@
+2015-08-14  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Handle missing plugins better at runtime
+        https://bugs.webkit.org/show_bug.cgi?id=146999
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createAudioSink): Warn the
+        user if autoaudiosink wasn't found at runtime. In that case
+        playbin will try to be smart by itself, hopefully. Also moved a
+        couple GST_WARNING calls to WARN_MEDIA_MESSAGE.
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Use
+        WARN_MEDIA_MESSAGE here as well.
+
 2015-08-24  Jinyoung Hur  <hur.ims@navercorp.com>
 

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

@@ -1859 +1859 @@
 {
     m_autoAudioSink = gst_element_factory_make("autoaudiosink", 0);
+    if (!m_autoAudioSink) {
+        WARN_MEDIA_MESSAGE("GStreamer's autoaudiosink not found. Please check your gst-plugins-good installation");
+        return nullptr;
+    }
+
     g_signal_connect(m_autoAudioSink.get(), "child-added", G_CALLBACK(setAudioStreamPropertiesCallback), this);
 
@@ -1878 +1883 @@
         GstElement* scale = gst_element_factory_make("scaletempo", nullptr);
         if (!scale) {
-            GST_WARNING("Failed to create scaletempo");
+            WARN_MEDIA_MESSAGE("Failed to create scaletempo");
             return m_autoAudioSink.get();
         }
@@ -1896 +1901 @@
 
         if (!gst_element_link_many(scale, convert, resample, m_autoAudioSink.get(), nullptr)) {
-            GST_WARNING("Failed to link audio sink elements");
+            WARN_MEDIA_MESSAGE("Failed to link audio sink elements");
             gst_object_unref(audioSinkBin);
             return m_autoAudioSink.get();
@@ -1910 +1915 @@
 #endif
     ASSERT_NOT_REACHED();
-    return 0;
+    return nullptr;
 }
 
@@ -1968 +1973 @@
 
         if (!scale)
-            GST_WARNING("Failed to create scaletempo");
+            WARN_MEDIA_MESSAGE("Failed to create scaletempo");
         else
             g_object_set(m_pipeline.get(), "audio-filter", scale, nullptr);