pidgin: libpurple/media/backend-fs2.c comparison

comparison libpurple/media/backend-fs2.c @ 32766:fd1b4bbefc6b

Port to Farstream Farstream is the new name of Farsight. The changes to support Farstream are from ocrete. rlaager modified the patch to retain the Farsight code using #ifdef HAVE_FARSIGHT. committer: Richard Laager <rlaager@wiktel.com>

author	olivier.crete@collabora.com
date	Thu, 05 Apr 2012 03:18:40 +0000
parents	60bd913072f7
children	cb2084b4a463

comparison

equal deleted inserted replaced

-:60bd913072f7
+:fd1b4bbefc6b
 /**
-* @file backend-fs2.c Farsight 2 backend for media API
+* @file backend-fs2.c Farstream backend for media API
 * @ingroup core
 */
 /* purple
 *
 #include "backend-iface.h"
 #include "debug.h"
 #include "network.h"
 #include "media-gst.h"
+#ifdef HAVE_FARSIGHT
 #include <gst/farsight/fs-conference-iface.h>
 #include <gst/farsight/fs-element-added-notifier.h>
+#else
+#include <farstream/fs-conference.h>
+#include <farstream/fs-element-added-notifier.h>
+#include <farstream/fs-utils.h>
+#endif
 /** @copydoc _PurpleMediaBackendFs2Class */
 typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
 /** @copydoc _PurpleMediaBackendFs2Private */
 typedef struct _PurpleMediaBackendFs2Private PurpleMediaBackendFs2Private;
 {
 	PurpleMediaBackendFs2Session *session;
 	gchar *participant;
 	FsStream *stream;
+#ifndef HAVE_FARSIGHT
+	gboolean supports_add;
+#endif
 	GstElement *src;
 	GstElement *tee;
 	GstElement *volume;
 	GstElement *level;
 	GstElement *fakesink;
 	PurpleMedia *media;
 	GstElement *confbin;
 	FsConference *conference;
 	gchar *conference_type;
+#ifndef HAVE_FARSIGHT
+	FsElementAddedNotifier *notifier;
+#endif
 	GHashTable *sessions;
 	GHashTable *participants;
 	GList *streams;
 	PurpleMediaBackendFs2Private *priv =
 			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(obj);
 	GList *iter = NULL;
 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
+#ifndef HAVE_FARSIGHT
+	if (priv->notifier) {
+		g_object_unref(priv->notifier);
+		priv->notifier = NULL;
+	}
+#endif
 	if (priv->confbin) {
 		GstElement *pipeline;
 		pipeline = purple_media_manager_get_pipeline(
 	if (!FS_IS_CONFERENCE(src) || !PURPLE_IS_MEDIA_BACKEND(self) ||
 			priv->conference != FS_CONFERENCE(src))
 		return;
+#ifdef HAVE_FARSIGHT
 	if (gst_structure_has_name(msg->structure, "farsight-error")) {
+#else
+	if (gst_structure_has_name(msg->structure, "farstream-error")) {
+#endif
 		FsError error_no;
 		gst_structure_get_enum(msg->structure, "error-no",
 				FS_TYPE_ERROR, (gint*)&error_no);
 		switch (error_no) {
 			case FS_ERROR_NO_CODECS:
 						" GStreamer codecs found"
 						" in GStreamer plugins"
 						" packages."));
 				purple_media_end(priv->media, NULL, NULL);
 				break;
+#ifdef HAVE_FARSIGHT
 			case FS_ERROR_NO_CODECS_LEFT:
 				purple_media_error(priv->media, _("No codecs"
 						" left. Your codec"
 						" preferences in"
 						" fs-codecs.conf are too"
 				 * Unknown CName is only a problem for the
 				 * multicast transmitter which isn't used.
 				 * It is also deprecated.
 				 */
 				break;
+#endif
 			default:
 				purple_debug_error("backend-fs2",
+#ifdef HAVE_FARSIGHT
 						"farsight-error: %i: %s\n",
+#else
+						"farstream-error: %i: %s\n",
+#endif
 						error_no,
 						gst_structure_get_string(
 						msg->structure, "error-msg"));
 				break;
 		}
 		if (FS_ERROR_IS_FATAL(error_no)) {
+#ifdef HAVE_FARSIGHT
 			purple_media_error(priv->media, _("A non-recoverable "
 					"Farsight2 error has occurred."));
+#else
+			purple_media_error(priv->media, _("A non-recoverable "
+					"Farstream error has occurred."));
+#endif
 			purple_media_end(priv->media, NULL, NULL);
 		}
 	} else if (gst_structure_has_name(msg->structure,
+#ifdef HAVE_FARSIGHT
 			"farsight-new-local-candidate")) {
+#else
+			"farstream-new-local-candidate")) {
+#endif
 		const GValue *value;
 		FsStream *stream;
 		FsCandidate *local_candidate;
 		PurpleMediaCandidate *candidate;
 		FsParticipant *participant;
 		candidate = candidate_from_fs(local_candidate);
 		g_signal_emit_by_name(self, "new-candidate",
 				session->id, name, candidate);
 		g_object_unref(candidate);
 	} else if (gst_structure_has_name(msg->structure,
+#ifdef HAVE_FARSIGHT
 			"farsight-local-candidates-prepared")) {
+#else
+			"farstream-local-candidates-prepared")) {
+#endif
 		const GValue *value;
 		FsStream *stream;
 		FsParticipant *participant;
 		PurpleMediaBackendFs2Session *session;
 		gchar *name;
 		g_object_unref(participant);
 		g_signal_emit_by_name(self, "candidates-prepared",
 				session->id, name);
 	} else if (gst_structure_has_name(msg->structure,
+#ifdef HAVE_FARSIGHT
 			"farsight-new-active-candidate-pair")) {
+#else
+			"farstream-new-active-candidate-pair")) {
+#endif
 		const GValue *value;
 		FsStream *stream;
 		FsCandidate *local_candidate;
 		FsCandidate *remote_candidate;
 		FsParticipant *participant;
 				session->id, name, lcandidate, rcandidate);
 		g_object_unref(lcandidate);
 		g_object_unref(rcandidate);
 	} else if (gst_structure_has_name(msg->structure,
+#ifdef HAVE_FARSIGHT
 			"farsight-recv-codecs-changed")) {
+#else
+			"farstream-recv-codecs-changed")) {
+#endif
 		const GValue *value;
 		GList *codecs;
 		FsCodec *codec;
 		value = gst_structure_get_value(msg->structure, "codecs");
 		codecs = g_value_get_boxed(value);
 		codec = codecs->data;
 		purple_debug_info("backend-fs2",
+#ifdef HAVE_FARSIGHT
 				"farsight-recv-codecs-changed: %s\n",
+#else
+				"farstream-recv-codecs-changed: %s\n",
+#endif
 				codec->encoding_name);
 	} else if (gst_structure_has_name(msg->structure,
+#ifdef HAVE_FARSIGHT
 			"farsight-component-state-changed")) {
+#else
+			"farstream-component-state-changed")) {
+#endif
 		const GValue *value;
 		FsStreamState fsstate;
 		guint component;
 		const gchar *state;
 				state = "UNKNOWN";
 				break;
 		}
 		purple_debug_info("backend-fs2",
+#ifdef HAVE_FARSIGHT
 				"farsight-component-state-changed: "
+#else
+				"farstream-component-state-changed: "
+#endif
 				"component: %u state: %s\n",
 				component, state);
 	} else if (gst_structure_has_name(msg->structure,
+#ifdef HAVE_FARSIGHT
 			"farsight-send-codec-changed")) {
+#else
+			"farstream-send-codec-changed")) {
+#endif
 		const GValue *value;
 		FsCodec *codec;
 		gchar *codec_str;
 		value = gst_structure_get_value(msg->structure, "codec");
 		codec = g_value_get_boxed(value);
 		codec_str = fs_codec_to_string(codec);
 		purple_debug_info("backend-fs2",
+#ifdef HAVE_FARSIGHT
 				"farsight-send-codec-changed: codec: %s\n",
+#else
+				"farstream-send-codec-changed: codec: %s\n",
+#endif
 				codec_str);
 		g_free(codec_str);
 	} else if (gst_structure_has_name(msg->structure,
+#ifdef HAVE_FARSIGHT
 			"farsight-codecs-changed")) {
+#else
+			"farstream-codecs-changed")) {
+#endif
 		const GValue *value;
 		FsSession *fssession;
 		GList *sessions;
 		value = gst_structure_get_value(msg->structure, "session");
 		if (stream->remote_candidates == NULL ||
 				purple_media_is_initiator(media, sid, name))
 			return;
+#ifdef HAVE_FARSIGHT
 		fs_stream_set_remote_candidates(stream->stream,
 				stream->remote_candidates, &err);
+#else
+		if (stream->supports_add)
+			fs_stream_add_remote_candidates(stream->stream,
+					stream->remote_candidates, &err);
+		else
+			fs_stream_force_remote_candidates(stream->stream,
+					stream->remote_candidates, &err);
+#endif
 		if (err == NULL)
 			return;
 		purple_debug_error("backend-fs2", "Error adding "
 	PurpleMediaBackendFs2Private *priv =
 			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
 	GstElement *pipeline;
 	GstBus *bus;
 	gchar *name;
+#ifndef HAVE_FARSIGHT
+	GKeyFile *default_props;
+#endif
 	priv->conference = FS_CONFERENCE(
 			gst_element_factory_make(priv->conference_type, NULL));
 	if (priv->conference == NULL) {
 	if (bus == NULL) {
 		purple_debug_error("backend-fs2",
 				"Couldn't get the pipeline's bus.\n");
 		return FALSE;
 	}
+#ifndef HAVE_FARSIGHT
+	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
+	if (default_props != NULL) {
+		priv->notifier = fs_element_added_notifier_new();
+		fs_element_added_notifier_add(priv->notifier,
+				GST_BIN(priv->confbin));
+		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
+	}
+#endif
 	g_signal_connect(G_OBJECT(bus), "message",
 			G_CALLBACK(gst_bus_cb), self);
 	gst_object_unref(bus);
 	/*
 	 * Removes a 5-7 second delay before
 	 * receiving the src-pad-added signal.
 	 * Only works for non-multicast FsRtpSessions.
 	 */
+#ifdef HAVE_FARSIGHT
 	if (is_nice || !strcmp(transmitter, "rawudp"))
+#else
+	if (!!strcmp(transmitter, "multicast"))
+#endif
 		g_object_set(G_OBJECT(session->session),
 				"no-rtcp-timeout", 0, NULL);
 	/*
 	 * Hack to make x264 work with Gmail video.
 			PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
 	FsParticipant *participant;
 	GError *err = NULL;
 	participant = fs_conference_new_participant(
+#ifdef HAVE_FARSIGHT
 			priv->conference, name, &err);
+#else
+			priv->conference, &err);
+#endif
 	if (err) {
 		purple_debug_error("backend-fs2",
 				"Error creating participant: %s\n",
 				err->message);
 		g_error_free(err);
 		return FALSE;
 	}
+#ifndef HAVE_FARSIGHT
+	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
+			"cname")) {
+		g_object_set(participant, "cname", name, NULL);
+	}
+#endif
 	if (!priv->participants) {
 		purple_debug_info("backend-fs2",
 				"Creating hash table for participants\n");
 		priv->participants = g_hash_table_new_full(g_str_hash,
 		purple_debug_error("backend-fs2", "Couldn't find "
 				"participant to create stream.\n");
 		return FALSE;
 	}
-	for (i = 0 ; i < num_params ; i++) {
+#ifndef HAVE_FARSIGHT
-		if (purple_strequal(params[i].name, "relay-info")) {
-			got_turn_from_prpl = TRUE;
-			break;
-		}
-	}
-	_params = g_new0(GParameter, num_params + 3);
-	memcpy(_params, params, sizeof(GParameter) * num_params);
-	/* set the controlling mode parameter */
-	_params[_num_params].name = "controlling-mode";
-	g_value_init(&_params[_num_params].value, G_TYPE_BOOLEAN);
-	g_value_set_boolean(&_params[_num_params].value, initiator);
-	++_num_params;
-	if (stun_ip) {
-		purple_debug_info("backend-fs2",
-			"Setting stun-ip on new stream: %s\n", stun_ip);
-		_params[_num_params].name = "stun-ip";
-		g_value_init(&_params[_num_params].value, G_TYPE_STRING);
-		g_value_set_string(&_params[_num_params].value, stun_ip);
-		++_num_params;
-	}
-	if (turn_ip && !strcmp("nice", transmitter) && !got_turn_from_prpl) {
-		GValueArray *relay_info = g_value_array_new(0);
-		gint port;
-		const gchar *username =	purple_prefs_get_string(
-				"/purple/network/turn_username");
-		const gchar *password = purple_prefs_get_string(
-				"/purple/network/turn_password");
-		/* UDP */
-		port = purple_prefs_get_int("/purple/network/turn_port");
-		if (port > 0) {
-			relay_info = append_relay_info(relay_info, turn_ip, port, username,
-				password, "udp");
-		}
-		/* TCP */
-		port = purple_prefs_get_int("/purple/network/turn_port_tcp");
-		if (port > 0) {
-			relay_info = append_relay_info(relay_info, turn_ip, port, username,
-				password, "tcp");
-		}
-		/* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode
-			at this time */
-		purple_debug_info("backend-fs2",
-			"Setting relay-info on new stream\n");
-		_params[_num_params].name = "relay-info";
-		g_value_init(&_params[_num_params].value,
-			G_TYPE_VALUE_ARRAY);
-		g_value_set_boxed(&_params[_num_params].value,
-			relay_info);
-		g_value_array_free(relay_info);
-		_num_params++;
-	}
 	fsstream = fs_session_new_stream(session->session, participant,
 			initiator == TRUE ? type_direction :
-			(type_direction & FS_DIRECTION_RECV), transmitter,
+			(type_direction & FS_DIRECTION_RECV), &err);
-			_num_params, _params, &err);
-	g_free(_params);
 	if (fsstream == NULL) {
 		if (err) {
 			purple_debug_error("backend-fs2",
 					"Error creating stream: %s\n",
 		} else
 			purple_debug_error("backend-fs2",
 					"Error creating stream\n");
 		return FALSE;
 	}
+#endif
+	for (i = 0 ; i < num_params ; i++) {
+		if (purple_strequal(params[i].name, "relay-info")) {
+			got_turn_from_prpl = TRUE;
+			break;
+		}
+	}
+	_params = g_new0(GParameter, num_params + 3);
+	memcpy(_params, params, sizeof(GParameter) * num_params);
+	/* set the controlling mode parameter */
+	_params[_num_params].name = "controlling-mode";
+	g_value_init(&_params[_num_params].value, G_TYPE_BOOLEAN);
+	g_value_set_boolean(&_params[_num_params].value, initiator);
+	++_num_params;
+	if (stun_ip) {
+		purple_debug_info("backend-fs2",
+			"Setting stun-ip on new stream: %s\n", stun_ip);
+		_params[_num_params].name = "stun-ip";
+		g_value_init(&_params[_num_params].value, G_TYPE_STRING);
+		g_value_set_string(&_params[_num_params].value, stun_ip);
+		++_num_params;
+	}
+	if (turn_ip && !strcmp("nice", transmitter) && !got_turn_from_prpl) {
+		GValueArray *relay_info = g_value_array_new(0);
+		gint port;
+		const gchar *username =	purple_prefs_get_string(
+				"/purple/network/turn_username");
+		const gchar *password = purple_prefs_get_string(
+				"/purple/network/turn_password");
+		/* UDP */
+		port = purple_prefs_get_int("/purple/network/turn_port");
+		if (port > 0) {
+			relay_info = append_relay_info(relay_info, turn_ip, port, username,
+				password, "udp");
+		}
+		/* TCP */
+		port = purple_prefs_get_int("/purple/network/turn_port_tcp");
+		if (port > 0) {
+			relay_info = append_relay_info(relay_info, turn_ip, port, username,
+				password, "tcp");
+		}
+		/* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode
+			at this time */
+		purple_debug_info("backend-fs2",
+			"Setting relay-info on new stream\n");
+		_params[_num_params].name = "relay-info";
+		g_value_init(&_params[_num_params].value,
+			G_TYPE_VALUE_ARRAY);
+		g_value_set_boxed(&_params[_num_params].value,
+			relay_info);
+		g_value_array_free(relay_info);
+		_num_params++;
+	}
+#ifdef HAVE_FARSIGHT
+	fsstream = fs_session_new_stream(session->session, participant,
+			initiator == TRUE ? type_direction :
+			(type_direction & FS_DIRECTION_RECV), transmitter,
+			_num_params, _params, &err);
+	g_free(_params);
+	if (fsstream == NULL) {
+		if (err) {
+			purple_debug_error("backend-fs2",
+					"Error creating stream: %s\n",
+					err && err->message ?
+					err->message : "NULL");
+			g_error_free(err);
+		} else
+			purple_debug_error("backend-fs2",
+					"Error creating stream\n");
+		return FALSE;
+	}
+#else
+	if (!fs_stream_set_transmitter(fsstream, transmitter,
+			_params, _num_params, &err)) {
+		purple_debug_error("backend-fs2",
+				"Could not set transmitter %s: %s.\n",
+				transmitter, err->message);
+		g_clear_error(&err);
+		g_free(_params);
+		return FALSE;
+	}
+	g_free(_params);
+#endif
 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
 	stream->participant = g_strdup(who);
 	stream->session = session;
 	stream->stream = fsstream;
+#ifndef HAVE_FARSTREAM
+	stream->supports_add = !strcmp(transmitter, "nice");
+#endif
 	priv->streams =	g_list_append(priv->streams, stream);
 	g_signal_connect(G_OBJECT(fsstream), "src-pad-added",
 			G_CALLBACK(src_pad_added_cb), stream);
 			candidate_list_to_fs(remote_candidates));
 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
 			purple_media_accepted(
 			priv->media, sess_id, participant)) {
+#ifdef HAVE_FARSIGHT
 		fs_stream_set_remote_candidates(stream->stream,
 				stream->remote_candidates, &err);
+#else
+		if (stream->supports_add)
+			fs_stream_add_remote_candidates(stream->stream,
+					stream->remote_candidates, &err);
+		else
+			fs_stream_force_remote_candidates(stream->stream,
+					stream->remote_candidates, &err);
+#endif
 		if (err) {
 			purple_debug_error("backend-fs2", "Error adding remote"
 					" candidates: %s\n", err->message);
 			g_error_free(err);
 		if (session == NULL)
 			return FALSE;
 		if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
 				PURPLE_MEDIA_SEND_VIDEO)) {
+#ifdef HAVE_FARSIGHT
 			g_object_get(session->session,
 					"codecs-ready", &ret, NULL);
+#else
+			GList *codecs = NULL;
+			g_object_get(session->session,
+					"codecs", &codecs, NULL);
+			if (codecs) {
+				fs_codec_list_destroy (codecs);
+				ret = TRUE;
+			}
+#endif
 		} else
 			ret = TRUE;
 	} else {
 		GList *values = g_hash_table_get_values(priv->sessions);
 		for (; values; values = g_list_delete_link(values, values)) {
 			PurpleMediaBackendFs2Session *session = values->data;
 			if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
 					PURPLE_MEDIA_SEND_VIDEO)) {
+#ifdef HAVE_FARSIGHT
 				g_object_get(session->session,
 						"codecs-ready", &ret, NULL);
 				if (ret == FALSE)
 					break;
+#else
+				GList *codecs = NULL;
+				g_object_get(session->session,
+						"codecs", &codecs, NULL);
+				if (codecs) {
+					fs_codec_list_destroy (codecs);
+					ret = TRUE;
+				} else {
+					ret = FALSE;
+					break;
+				}
+#endif
 			} else
 				ret = TRUE;
 		}
 		if (values != NULL)

Mercurial > pidgin

comparison libpurple/media/backend-fs2.c @ 32766:fd1b4bbefc6b