/pidgin/main: 15c0ee1aa398: Remove x264enc specific hack as it's...

Changeset: 15c0ee1aa39807b6c7e27a34713f6b3e5f177e34
Author:	 Mike Ruprecht <[email protected]>
Date:	 2016-01-22 03:11 -0600
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/15c0ee1aa398

Description:

Remove x264enc specific hack as it's now included in Farstream defaults

diffstat:

 libpurple/media/backend-fs2.c |  27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

diffs (52 lines):

diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -1530,18 +1530,6 @@ init_conference(PurpleMediaBackendFs2 *s
 	return TRUE;
 }
 
-static void
-gst_element_added_cb(FsElementAddedNotifier *self,
-		GstBin *bin, GstElement *element, gpointer user_data)
-{
-	/*
-	 * Hack to make H264 work with Gmail video.
-	 */
-	if (!strncmp(GST_ELEMENT_NAME(element), "x264", 4)) {
-		g_object_set(GST_OBJECT(element), "cabac", FALSE, NULL);
-	}
-}
-
 static gboolean
 create_src(PurpleMediaBackendFs2 *self, const gchar *sess_id,
 		PurpleMediaSessionType type)
@@ -1660,9 +1648,8 @@ create_session(PurpleMediaBackendFs2 *se
 			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
 	PurpleMediaBackendFs2Session *session;
 	GError *err = NULL;
-	GList *codec_conf = NULL, *iter = NULL;
+	GList *codec_conf = NULL;
 	gchar *filename = NULL;
-	gboolean is_nice = !strcmp(transmitter, "nice");
 
 	session = g_new0(PurpleMediaBackendFs2Session, 1);
 
@@ -1726,18 +1713,6 @@ create_session(PurpleMediaBackendFs2 *se
 		g_object_set(G_OBJECT(session->session),
 				"no-rtcp-timeout", 0, NULL);
 
-	/*
-	 * Hack to make x264 work with Gmail video.
-	 */
-	if (is_nice && !strcmp(sess_id, "google-video")) {
-		FsElementAddedNotifier *notifier =
-				fs_element_added_notifier_new();
-		g_signal_connect(G_OBJECT(notifier), "element-added",
-				G_CALLBACK(gst_element_added_cb), NULL);
-		fs_element_added_notifier_add(notifier,
-				GST_BIN(priv->conference));
-	}
-
 	session->id = g_strdup(sess_id);
 	session->backend = self;
 	session->type = type;

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits