diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 6 | ||||
| -rw-r--r-- | data/codec-preferences | 50 | ||||
| -rw-r--r-- | data/element-properties | 59 | ||||
| -rw-r--r-- | src/empathy-streamed-media-handler.c | 23 | ||||
| -rw-r--r-- | src/empathy-streamed-media-window.c | 24 |
6 files changed, 8 insertions, 156 deletions
diff --git a/configure.ac b/configure.ac index a5050f72e..c67ed59fd 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ KEYRING_REQUIRED=2.26.0 GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 -TELEPATHY_FARSIGHT_REQUIRED=0.0.14 +TELEPATHY_FARSIGHT_REQUIRED=0.0.18 TELEPATHY_GLIB_REQUIRED=0.16.0 TELEPATHY_LOGGER=0.2.10 WEBKIT_REQUIRED=1.3.13 diff --git a/data/Makefile.am b/data/Makefile.am index e6414a805..a08ed620d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -19,11 +19,6 @@ convertdir = $(datarootdir)/GConf/gsettings convert_DATA = \ empathy.convert -streamingprefsdir = $(datadir)/empathy -streamingprefs_DATA = \ - codec-preferences \ - element-properties - servicefiledir = $(datadir)/dbus-1/services servicefile_in_files = \ org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \ @@ -76,7 +71,6 @@ EXTRA_DIST = \ $(desktop_in_files) \ $(desktop_DATA) \ $(schemas_DATA) \ - $(streamingprefs_DATA) \ $(html_DATA) \ $(clientfile_DATA) \ $(servicefile_in_files) \ diff --git a/data/codec-preferences b/data/codec-preferences deleted file mode 100644 index fbd8ad55d..000000000 --- a/data/codec-preferences +++ /dev/null @@ -1,50 +0,0 @@ -# Favorite audio codecs - -[audio/SPEEX:8000] -clock-rate=8000 - -[audio/SPEEX:16000] -clock-rate=16000 - -[audio/AMR] - -[audio/G729] - -[audio/ILBC] - -# Disabled audio codecs - -[audio/DV] -id=-1 - -[audio/MPA] -id=-1 - -[audio/VORBIS] -id=-1 - -[audio/MP3] -id=-1 - - -# Favorite video codecs - -# We like freedom and the future (proof of concept VP8 payloading) -[video/X-VP8-GST] - -# but keep an eye on people living in the past -[video/H264] - -[video/H263] - -[video/THEORA] - -# Disable the ones we don't want -[video/JPEG] -id=-1 - -[video/DV] -id=-1 - -[video/MPV] -id=-1 diff --git a/data/element-properties b/data/element-properties deleted file mode 100644 index 68debc234..000000000 --- a/data/element-properties +++ /dev/null @@ -1,59 +0,0 @@ -# Put the desired properties in the style of -# -# [element name] -# prop1=val1 - -[gstrtpbin] -latency=100 - -[x264enc] -byte-stream=1 -bframes=0 -b-adapt=0 -cabac=0 -dct8x8=0 -bitrate=256 -# tuned for zero latency -tune=0x4 -profile=1 -speed-preset=3 -sliced-threads=false -aud=false - -[ffenc_h263] -rtp-payload-size=1 - -[theoraenc] -bitrate=256 - -[vp8enc] -bitrate=256000 -max-latency=1 -speed=2 -error-resilient=true - -# Work around bug in the re-timestamp slaving method in -# GStreamer (2 is skew) -[alsasrc] -slave-method=2 - -[osssrc] -slave-method=2 - -[oss4src] -slave-method=2 - -[sunaudiosrc] -slave-method=2 - -[rtph264pay] -config-interval=5 - -[rtppcmupay] -ptime-multiple=20000000 - -[rtppcmapay] -ptime-multiple=20000000 - -[gstrtpjitterbuffer] -do-lost=1 diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c index 67527d8e4..a3c539773 100644 --- a/src/empathy-streamed-media-handler.c +++ b/src/empathy-streamed-media-handler.c @@ -708,27 +708,6 @@ empathy_streamed_media_handler_tf_channel_closed_cb (TfChannel *tfchannel, g_signal_emit (G_OBJECT (handler), signals[CLOSED], 0); } -static GList * -empathy_streamed_media_handler_tf_channel_codec_config_cb (TfChannel *channel, - guint stream_id, FsMediaType media_type, guint direction, gpointer user_data) -{ - gchar *filename = empathy_file_lookup ("codec-preferences", "data"); - GList *codecs; - GError *error = NULL; - - codecs = fs_codec_list_from_keyfile (filename, &error); - g_free (filename); - - if (!codecs) - { - g_warning ("No codec-preferences file: %s", - error ? error->message : "No error message"); - } - g_clear_error (&error); - - return codecs; -} - static void empathy_streamed_media_handler_start_tpfs (EmpathyStreamedMediaHandler *self) { @@ -748,8 +727,6 @@ empathy_streamed_media_handler_start_tpfs (EmpathyStreamedMediaHandler *self) G_CALLBACK (empathy_streamed_media_handler_tf_channel_stream_created_cb), self); g_signal_connect (priv->tfchannel, "closed", G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self); - g_signal_connect (priv->tfchannel, "stream-get-codec-config", - G_CALLBACK (empathy_streamed_media_handler_tf_channel_codec_config_cb), self); g_object_unref (channel); } diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c index c74910b6b..22ecbd282 100644 --- a/src/empathy-streamed-media-window.c +++ b/src/empathy-streamed-media-window.c @@ -35,6 +35,7 @@ #include <telepathy-glib/util.h> #include <gst/farsight/fs-element-added-notifier.h> +#include <gst/farsight/fs-utils.h> #include <libempathy/empathy-tp-contact-factory.h> #include <libempathy/empathy-utils.h> @@ -981,8 +982,6 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) GtkWidget *arrow; GtkWidget *page; gchar *filename; - GKeyFile *keyfile; - GError *error = NULL; GtkWidget *scroll; filename = empathy_file_lookup ("empathy-streamed-media-window.ui", "src"); @@ -1084,21 +1083,6 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self) /* The call will be started as soon the pipeline is playing */ priv->start_call_when_playing = TRUE; - keyfile = g_key_file_new (); - filename = empathy_file_lookup ("element-properties", "data"); - if (g_key_file_load_from_file (keyfile, filename, G_KEY_FILE_NONE, &error)) - { - fs_element_added_notifier_set_properties_from_keyfile (priv->fsnotifier, - keyfile); - } - else - { - g_warning ("Could not load element-properties file: %s", error->message); - g_key_file_free (keyfile); - g_clear_error (&error); - } - g_free (filename); - priv->vbox = gtk_vbox_new (FALSE, 3); gtk_box_pack_start (GTK_BOX (priv->content_hbox), priv->vbox, FALSE, FALSE, CONTENT_HBOX_CHILDREN_PACKING_PADDING); @@ -1759,6 +1743,12 @@ empathy_streamed_media_window_conference_added_cb (EmpathyStreamedMediaHandler * { EmpathyStreamedMediaWindow *self = EMPATHY_STREAMED_MEDIA_WINDOW (user_data); EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (self); + GKeyFile *keyfile; + + keyfile = fs_utils_get_default_element_properties (conference); + if (keyfile != NULL) + fs_element_added_notifier_set_properties_from_keyfile (priv->fsnotifier, + keyfile); gst_bin_add (GST_BIN (priv->pipeline), conference); |