GNOME.org
 

[empathy] Drop support for gstreamer 0.10

commit e3cbf70a3ca4aba15a65ae170c0a0d54573b7649
Author: Xavier Claessens <xavier claessens collabora co uk>
Date:   Tue Oct 1 14:31:58 2013 -0400

    Drop support for gstreamer 0.10
    
    GStreamer 1.0 is now mandatory.

 configure.ac              |   58 +++++++++-----------------------------------
 src/empathy-audio-sink.c  |   22 -----------------
 src/empathy-audio-src.c   |    8 ------
 src/empathy-call-window.c |   42 +-------------------------------
 src/empathy-video-src.c   |   26 --------------------
 5 files changed, 13 insertions(+), 143 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c22b343..8628c02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,51 +235,18 @@ PKG_CHECK_MODULES(EMPATHY,
 # -----------------------------------------------------------
 # GStreamer
 # -----------------------------------------------------------
-AC_ARG_ENABLE(gst-1.0,
-              AS_HELP_STRING([--enable-gst-1.0=@<:@no/yes/auto@:>@],
-                             [build with GStreamer 1.0]),
-                             enable_gst1=$enableval,
-                             enable_gst1=auto)
-
-# Try to use GStreamer 1.0 if available
-have_gst1="no"
-if test "x$enable_gst1" != "xno"; then
-  PKG_CHECK_MODULES(EMPATHY_CALL,
-  [
-     farstream-0.2
-     telepathy-farstream >= $TP_FS_REQUIRED
-     clutter-1.0 >= $CLUTTER_REQUIRED
-     clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
-     clutter-gst-2.0
-     gstreamer-1.0
-     gstreamer-audio-1.0
-     gstreamer-video-1.0
-     cogl-1.0
-  ], have_gst1="yes", have_gst1="no")
-
-  if test "x$have_gst1" = "xyes"; then
-    AC_DEFINE(HAVE_GST1, 1, [Build with GStreamer 1.0])
-  fi
-fi
-
-if test "x$enable_gst1" = "xyes" -a "x$have_gst1" != "xyes"; then
-   AC_MSG_ERROR([Could not find GStreamer 1.0 dependencies:
-
-$EMPATHY_CALL_PKG_ERRORS])
-fi
-
-if test "x$have_gst1" != "xyes"; then
-  PKG_CHECK_MODULES(EMPATHY_CALL,
-  [
-     farstream-0.1
-     telepathy-farstream >= $TP_FS_REQUIRED
-     clutter-1.0 >= $CLUTTER_REQUIRED
-     clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
-     clutter-gst-1.0 >= 1.5.2
-     gstreamer-0.10 >= $GSTREAMER_REQUIRED
-     gstreamer-interfaces-0.10
-  ])
-fi
+PKG_CHECK_MODULES(EMPATHY_CALL,
+[
+   farstream-0.2
+   telepathy-farstream >= $TP_FS_REQUIRED
+   clutter-1.0 >= $CLUTTER_REQUIRED
+   clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
+   clutter-gst-2.0
+   gstreamer-1.0
+   gstreamer-audio-1.0
+   gstreamer-video-1.0
+   cogl-1.0
+])
 
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
@@ -679,7 +646,6 @@ Configure summary:
        Linker Flags................:  ${LDFLAGS}
        Prefix......................:  ${prefix}
        Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
-       Use GStreamer 1.0...........:  ${have_gst1}
 
     Features:
        Spell checking (enchant)....:  ${have_enchant}
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 985a1fa..f3a78bf 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -21,11 +21,7 @@
 #include "config.h"
 #include "empathy-audio-sink.h"
 
-#ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
-#else
-#include <gst/interfaces/streamvolume.h>
-#endif
 
 #include "empathy-audio-utils.h"
 
@@ -48,12 +44,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE(
     "sink%d",
     GST_PAD_SINK,
     GST_PAD_REQUEST,
-#ifdef HAVE_GST1
     GST_STATIC_CAPS ( "audio/x-raw" )
-#else
-    GST_STATIC_CAPS ( GST_AUDIO_INT_PAD_TEMPLATE_CAPS " ; "
-        GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS)
-#endif
 );
 
 enum {
@@ -81,16 +72,10 @@ empathy_audio_sink_init (EmpathyGstAudioSink *self)
   g_mutex_init (&self->priv->volume_mutex);
 }
 
-#ifdef HAVE_GST1
 static GstPad * empathy_audio_sink_request_new_pad (GstElement *self,
   GstPadTemplate *templ,
   const gchar* name,
   const GstCaps *caps);
-#else
-static GstPad * empathy_audio_sink_request_new_pad (GstElement *self,
-  GstPadTemplate *templ,
-  const gchar* name);
-#endif
 
 static void empathy_audio_sink_release_pad (GstElement *self,
   GstPad *pad);
@@ -301,18 +286,11 @@ empathy_audio_sink_volume_idle_setup (gpointer user_data)
   return FALSE;
 }
 
-#ifdef HAVE_GST1
 static GstPad *
 empathy_audio_sink_request_new_pad (GstElement *element,
   GstPadTemplate *templ,
   const gchar* name,
   const GstCaps *caps)
-#else
-static GstPad *
-empathy_audio_sink_request_new_pad (GstElement *element,
-  GstPadTemplate *templ,
-  const gchar* name)
-#endif
 {
   EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (element);
   GstElement *bin, *resample, *audioconvert0, *audioconvert1;
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index fcca662..86d197d 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -23,11 +23,7 @@
 
 #include <tp-account-widgets/tpaw-utils.h>
 
-#ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
-#else
-#include <gst/interfaces/streamvolume.h>
-#endif
 
 #include "empathy-audio-utils.h"
 #include "empathy-mic-monitor.h"
@@ -314,7 +310,6 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
   priv->volume_element = gst_element_factory_make ("volume", NULL);
   gst_bin_add (GST_BIN (obj), priv->volume_element);
 
-#ifndef HAVE_GST1
   {
     GstElement *capsfilter;
     GstCaps *caps;
@@ -336,9 +331,6 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
     gst_element_link (priv->src, capsfilter);
     gst_element_link (capsfilter, priv->volume_element);
   }
-#else
-  gst_element_link (priv->src, priv->volume_element);
-#endif
 
   src = gst_element_get_static_pad (priv->volume_element, "src");
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 7fe365f..1bed8b0 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2817,11 +2817,7 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self)
   if (priv->funnel == NULL)
     {
       output = priv->video_output_sink;
-#ifdef HAVE_GST1
       priv->funnel = gst_element_factory_make ("funnel", NULL);
-#else
-      priv->funnel = gst_element_factory_make ("fsfunnel", NULL);
-#endif
 
       if (!priv->funnel)
         {
@@ -2861,11 +2857,7 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self)
           goto error_output_added;
         }
     }
-#ifdef HAVE_GST1
   pad = gst_element_get_request_pad (priv->funnel, "sink_%u");
-#else
-  pad = gst_element_get_request_pad (priv->funnel, "sink%d");
-#endif
 
   if (!pad)
     g_warning ("Could not get request pad from funnel");
@@ -3346,7 +3338,6 @@ empathy_call_window_check_video_cb (gpointer data)
 }
 
 /* Called from the streaming thread */
-#ifdef HAVE_GST1
 static GstPadProbeReturn
 empathy_call_window_video_probe_cb (GstPad *pad,
     GstPadProbeInfo *info,
@@ -3366,29 +3357,6 @@ empathy_call_window_video_probe_cb (GstPad *pad,
 
   return GST_PAD_PROBE_OK;
 }
-#else
-static gboolean
-empathy_call_window_video_probe_cb (GstPad *pad,
-    GstMiniObject *mini_obj,
-    EmpathyCallWindow *self)
-{
-  /* Ignore events */
-  if (GST_IS_EVENT (mini_obj))
-    return TRUE;
-
-  if (G_UNLIKELY (!self->priv->got_video))
-    {
-      /* show the remote video */
-      g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
-          empathy_call_window_show_video_output_cb,
-          g_object_ref (self), g_object_unref);
-
-      self->priv->got_video = TRUE;
-    }
-
-  return TRUE;
-}
-#endif
 
 /* Called from the streaming thread */
 static gboolean
@@ -3415,14 +3383,10 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
         g_idle_add (empathy_call_window_show_video_output_cb, self);
         pad = empathy_call_window_get_video_sink_pad (self);
 
-#ifdef HAVE_GST1
         gst_pad_add_probe (src,
             GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST,
             empathy_call_window_video_probe_cb, self, NULL);
-#else
-        gst_pad_add_data_probe (src,
-            G_CALLBACK (empathy_call_window_video_probe_cb), self);
-#endif
+
         if (priv->got_video_src > 0)
           g_source_remove (priv->got_video_src);
         priv->got_video_src = g_timeout_add_seconds (1,
@@ -3601,11 +3565,7 @@ empathy_call_window_content_added_cb (EmpathyCallHandler *handler,
       case FS_MEDIA_TYPE_VIDEO:
         if (priv->video_tee != NULL)
           {
-#ifdef HAVE_GST1
             pad = gst_element_get_request_pad (priv->video_tee, "src_%u");
-#else
-            pad = gst_element_get_request_pad (priv->video_tee, "src%d");
-#endif
             if (GST_PAD_LINK_FAILED (gst_pad_link (pad, sink)))
               {
                 g_warning ("Could not link video source input pipeline");
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 9856efe..41dea23 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -21,11 +21,7 @@
 #include "config.h"
 #include "empathy-video-src.h"
 
-#ifdef HAVE_GST1
 #include <gst/video/colorbalance.h>
-#else
-#include <gst/interfaces/colorbalance.h>
-#endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
@@ -112,7 +108,6 @@ error:
   return NULL;
 }
 
-#ifdef HAVE_GST1
 static GstPadProbeReturn
 empathy_video_src_drop_eos (GstPad *pad,
   GstPadProbeInfo *info,
@@ -123,13 +118,6 @@ empathy_video_src_drop_eos (GstPad *pad,
 
   return GST_PAD_PROBE_OK;
 }
-#else
-static gboolean
-empathy_video_src_drop_eos (GstPad *pad, GstEvent *event, gpointer user_data)
-{
-  return GST_EVENT_TYPE (event) != GST_EVENT_EOS;
-}
-#endif
 
 static void
 empathy_video_src_init (EmpathyGstVideoSrc *obj)
@@ -141,11 +129,7 @@ empathy_video_src_init (EmpathyGstVideoSrc *obj)
   gchar *str;
 
   /* allocate caps here, so we can update it by optional elements */
-#ifdef HAVE_GST1
   caps = gst_caps_new_simple ("video/x-raw",
-#else
-  caps = gst_caps_new_simple ("video/x-raw-yuv",
-#endif
     "width", G_TYPE_INT, 320,
     "height", G_TYPE_INT, 240,
     NULL);
@@ -162,12 +146,8 @@ empathy_video_src_init (EmpathyGstVideoSrc *obj)
    * source (triggering an EOS) */
   src = gst_element_get_static_pad (element, "src");
 
-#ifdef HAVE_GST1
   gst_pad_add_probe (src, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
     empathy_video_src_drop_eos, NULL, NULL);
-#else
-  gst_pad_add_event_probe (src, G_CALLBACK (empathy_video_src_drop_eos), NULL);
-#endif
 
   gst_object_unref (src);
 
@@ -202,15 +182,9 @@ empathy_video_src_init (EmpathyGstVideoSrc *obj)
   DEBUG ("Current video src caps are : %s", str);
   g_free (str);
 
-#ifdef HAVE_GST1
   if ((element = empathy_gst_add_to_bin (GST_BIN (obj),
       element, "videoconvert")) == NULL)
     g_error ("Failed to add \"videoconvert\" (gst-plugins-base missing?)");
-#else
-  if ((element = empathy_gst_add_to_bin (GST_BIN (obj),
-      element, "ffmpegcolorspace")) == NULL)
-    g_error ("Failed to add \"ffmpegcolorspace\" (gst-plugins-base missing?)");
-#endif
 
   if ((element = empathy_gst_add_to_bin (GST_BIN (obj),
       element, "videoscale")) == NULL)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]