mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-02 09:01:50 -05:00
rework: make client and server nodes
work on making nodes and ports on the client.
This commit is contained in:
Wim Taymans
parent
c67d3d7f04
commit
8407430891
34 changed files with 1500 additions and 3844 deletions
|
|
@ -38,11 +38,9 @@ struct _PinosUploadNodePrivate
|
|||
GBytes *possible_formats;
|
||||
|
||||
PinosPort *input, *output;
|
||||
|
||||
PinosChannel *channel;
|
||||
};
|
||||
|
||||
G_DEFINE_TYPE (PinosUploadNode, pinos_upload_node, PINOS_TYPE_NODE);
|
||||
G_DEFINE_TYPE (PinosUploadNode, pinos_upload_node, PINOS_TYPE_SERVER_NODE);
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
@ -94,18 +92,12 @@ upload_node_set_property (GObject *_object,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
update_channel_format (PinosChannel *channel, GBytes *format)
|
||||
{
|
||||
g_object_set (channel, "format", format, NULL);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
bus_handler (GstBus *bus,
|
||||
GstMessage *message,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosNode *node = user_data;
|
||||
PinosServerNode *node = user_data;
|
||||
PinosUploadNodePrivate *priv = PINOS_UPLOAD_NODE (node)->priv;
|
||||
|
||||
switch (GST_MESSAGE_TYPE (message)) {
|
||||
|
|
@ -118,7 +110,7 @@ bus_handler (GstBus *bus,
|
|||
g_warning ("got error %s (%s)\n", error->message, debug);
|
||||
g_free (debug);
|
||||
|
||||
pinos_node_report_error (node, error);
|
||||
pinos_node_report_error (PINOS_NODE (node), error);
|
||||
gst_element_set_state (priv->pipeline, GST_STATE_NULL);
|
||||
break;
|
||||
}
|
||||
|
|
@ -127,17 +119,9 @@ bus_handler (GstBus *bus,
|
|||
if (gst_message_has_name (message, "PinosPayloaderFormatChange")) {
|
||||
const GstStructure *str = gst_message_get_structure (message);
|
||||
GstCaps *caps;
|
||||
GBytes *format;
|
||||
gchar *caps_str;
|
||||
|
||||
gst_structure_get (str, "format", GST_TYPE_CAPS, &caps, NULL);
|
||||
gst_caps_replace (&priv->format, caps);
|
||||
caps_str = gst_caps_to_string (caps);
|
||||
|
||||
format = g_bytes_new_take (caps_str, strlen (caps_str) + 1);
|
||||
g_list_foreach (pinos_port_get_channels (priv->output), (GFunc) update_channel_format, format);
|
||||
g_list_foreach (pinos_port_get_channels (priv->input), (GFunc) update_channel_format, format);
|
||||
g_bytes_unref (format);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -172,8 +156,8 @@ setup_pipeline (PinosUploadNode *node)
|
|||
}
|
||||
|
||||
static gboolean
|
||||
node_set_state (PinosNode *node,
|
||||
PinosNodeState state)
|
||||
node_set_state (PinosNode *node,
|
||||
PinosNodeState state)
|
||||
{
|
||||
PinosUploadNodePrivate *priv = PINOS_UPLOAD_NODE (node)->priv;
|
||||
|
||||
|
|
@ -202,56 +186,6 @@ node_set_state (PinosNode *node,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
on_socket_notify (GObject *gobject,
|
||||
GParamSpec *pspec,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosUploadNode *node = user_data;
|
||||
PinosUploadNodePrivate *priv = node->priv;
|
||||
GSocket *socket;
|
||||
guint num_handles;
|
||||
|
||||
g_object_get (gobject, "socket", &socket, NULL);
|
||||
|
||||
g_debug ("upload-node %p: output socket notify %p", node, socket);
|
||||
|
||||
if (socket == NULL) {
|
||||
GSocket *prev_socket = g_object_steal_data (gobject, "last-socket");
|
||||
if (prev_socket) {
|
||||
g_signal_emit_by_name (priv->sink, "remove", prev_socket);
|
||||
g_object_unref (prev_socket);
|
||||
}
|
||||
} else {
|
||||
g_signal_emit_by_name (priv->sink, "add", socket);
|
||||
g_object_set_data_full (gobject, "last-socket", socket, g_object_unref);
|
||||
}
|
||||
|
||||
g_object_get (priv->sink, "num-handles", &num_handles, NULL);
|
||||
if (num_handles > 0 && socket) {
|
||||
GBytes *format;
|
||||
|
||||
/* suggest what we provide */
|
||||
g_object_get (priv->channel, "format", &format, NULL);
|
||||
g_object_set (gobject, "format", format, NULL);
|
||||
g_bytes_unref (format);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
on_channel_added (PinosPort *port, PinosChannel *channel, PinosNode *node)
|
||||
{
|
||||
g_signal_connect (channel, "notify::socket", (GCallback) on_socket_notify, node);
|
||||
|
||||
g_debug ("upload-node %p: create channel %p", node, channel);
|
||||
}
|
||||
|
||||
static void
|
||||
on_channel_removed (PinosPort *port, PinosChannel *channel, PinosNode *node)
|
||||
{
|
||||
g_debug ("upload-node %p: release channel %p", node, channel);
|
||||
}
|
||||
|
||||
static void
|
||||
upload_node_dispose (GObject * object)
|
||||
{
|
||||
|
|
@ -272,7 +206,6 @@ upload_node_finalize (GObject * object)
|
|||
|
||||
g_debug ("upload-node %p: finalize", object);
|
||||
|
||||
g_clear_object (&priv->channel);
|
||||
g_clear_object (&priv->sink);
|
||||
g_clear_object (&priv->src);
|
||||
g_clear_object (&priv->pipeline);
|
||||
|
|
@ -284,136 +217,54 @@ upload_node_finalize (GObject * object)
|
|||
G_OBJECT_CLASS (pinos_upload_node_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
on_input_socket_notify (GObject *gobject,
|
||||
GParamSpec *pspec,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosUploadNode *node = user_data;
|
||||
PinosUploadNodePrivate *priv = node->priv;
|
||||
GSocket *socket;
|
||||
GBytes *requested_format;
|
||||
GstCaps *caps;
|
||||
|
||||
g_object_get (gobject, "socket", &socket, NULL);
|
||||
g_debug ("upload-node %p: input socket notify %p", node, socket);
|
||||
|
||||
if (socket) {
|
||||
/* requested format is final format */
|
||||
g_object_get (gobject, "requested-format", &requested_format, NULL);
|
||||
g_assert (requested_format != NULL);
|
||||
g_object_set (gobject, "format", requested_format, NULL);
|
||||
|
||||
/* and set as the current format */
|
||||
caps = gst_caps_from_string (g_bytes_get_data (requested_format, NULL));
|
||||
g_assert (caps != NULL);
|
||||
gst_caps_take (&priv->format, caps);
|
||||
g_bytes_unref (requested_format);
|
||||
} else {
|
||||
gst_caps_replace (&priv->format, NULL);
|
||||
}
|
||||
g_object_set (priv->src, "socket", socket, NULL);
|
||||
|
||||
if (socket) {
|
||||
g_debug ("upload-node %p: set pipeline to PLAYING", node);
|
||||
gst_element_set_state (priv->pipeline, GST_STATE_PLAYING);
|
||||
g_object_unref (socket);
|
||||
} else {
|
||||
g_debug ("upload-node %p: set pipeline to READY", node);
|
||||
gst_element_set_state (priv->pipeline, GST_STATE_READY);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
handle_remove_channel (PinosChannel *channel,
|
||||
on_input_port_created (GObject *source_object,
|
||||
GAsyncResult *res,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosUploadNode *node = user_data;
|
||||
PinosUploadNodePrivate *priv = node->priv;
|
||||
PinosNode *node = PINOS_NODE (source_object);
|
||||
PinosUploadNodePrivate *priv = PINOS_UPLOAD_NODE (source_object)->priv;
|
||||
|
||||
g_debug ("upload-node %p: remove channel %p", node, priv->channel);
|
||||
g_clear_pointer (&priv->channel, g_object_unref);
|
||||
priv->input = pinos_node_create_port_finish (node, res, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* pinos_upload_node_get_channel:
|
||||
* @node: a #PinosUploadNode
|
||||
* @client_path: the client path
|
||||
* @format_filter: a #GBytes
|
||||
* @props: extra properties
|
||||
* @prefix: a path prefix
|
||||
* @error: a #GError or %NULL
|
||||
*
|
||||
* Create a new #PinosChannel that can be used to send data to
|
||||
* the pinos server.
|
||||
*
|
||||
* Returns: a new #PinosChannel.
|
||||
*/
|
||||
PinosChannel *
|
||||
pinos_upload_node_get_channel (PinosUploadNode *node,
|
||||
const gchar *client_path,
|
||||
GBytes *format_filter,
|
||||
PinosProperties *props,
|
||||
GError **error)
|
||||
static void
|
||||
on_output_port_created (GObject *source_object,
|
||||
GAsyncResult *res,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosUploadNodePrivate *priv;
|
||||
PinosNode *node = PINOS_NODE (source_object);
|
||||
PinosUploadNodePrivate *priv = PINOS_UPLOAD_NODE (source_object)->priv;
|
||||
|
||||
g_return_val_if_fail (PINOS_IS_UPLOAD_NODE (node), NULL);
|
||||
priv = node->priv;
|
||||
|
||||
if (priv->channel == NULL) {
|
||||
GstCaps *caps = gst_caps_from_string (g_bytes_get_data (format_filter, NULL));
|
||||
|
||||
gst_caps_take (&priv->format, caps);
|
||||
|
||||
priv->channel = pinos_port_create_channel (priv->input,
|
||||
client_path,
|
||||
format_filter,
|
||||
props,
|
||||
error);
|
||||
if (priv->channel == NULL)
|
||||
return NULL;
|
||||
|
||||
g_signal_connect (priv->channel,
|
||||
"remove",
|
||||
(GCallback) handle_remove_channel,
|
||||
node);
|
||||
|
||||
g_debug ("upload-node %p: get input %p", node, priv->channel);
|
||||
g_signal_connect (priv->channel, "notify::socket", (GCallback) on_input_socket_notify, node);
|
||||
}
|
||||
return g_object_ref (priv->channel);
|
||||
priv->output = pinos_node_create_port_finish (node, res, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
upload_node_constructed (GObject * object)
|
||||
{
|
||||
PinosNode *node = PINOS_NODE (object);
|
||||
PinosServerNode *node = PINOS_SERVER_NODE (object);
|
||||
PinosUploadNode *upload = PINOS_UPLOAD_NODE (object);
|
||||
PinosUploadNodePrivate *priv = upload->priv;
|
||||
|
||||
G_OBJECT_CLASS (pinos_upload_node_parent_class)->constructed (object);
|
||||
|
||||
g_debug ("upload-node %p: constructed", upload);
|
||||
priv->input = pinos_port_new (pinos_node_get_daemon (node),
|
||||
pinos_node_get_object_path (node),
|
||||
pinos_node_create_port (PINOS_NODE (node),
|
||||
PINOS_DIRECTION_INPUT,
|
||||
"input",
|
||||
priv->possible_formats,
|
||||
NULL);
|
||||
priv->output = pinos_port_new (pinos_node_get_daemon (node),
|
||||
pinos_node_get_object_path (node),
|
||||
NULL,
|
||||
NULL,
|
||||
on_input_port_created,
|
||||
node);
|
||||
pinos_node_create_port (PINOS_NODE (node),
|
||||
PINOS_DIRECTION_OUTPUT,
|
||||
"output",
|
||||
priv->possible_formats,
|
||||
NULL);
|
||||
g_signal_connect (priv->output, "channel-added", (GCallback) on_channel_added, upload);
|
||||
g_signal_connect (priv->output, "channel-removed", (GCallback) on_channel_removed, upload);
|
||||
|
||||
pinos_node_add_port (node, priv->input);
|
||||
pinos_node_add_port (node, priv->output);
|
||||
|
||||
NULL,
|
||||
NULL,
|
||||
on_output_port_created,
|
||||
node);
|
||||
setup_pipeline (upload);
|
||||
}
|
||||
|
||||
|
|
@ -457,11 +308,11 @@ pinos_upload_node_init (PinosUploadNode * node)
|
|||
* @daemon: the parent #PinosDaemon
|
||||
* @possible_formats: a #GBytes
|
||||
*
|
||||
* Make a new #PinosNode that can be used to receive data from a client.
|
||||
* Make a new #PinosServerNode that can be used to receive data from a client.
|
||||
*
|
||||
* Returns: a new #PinosNode.
|
||||
* Returns: a new #PinosServerNode.
|
||||
*/
|
||||
PinosNode *
|
||||
PinosServerNode *
|
||||
pinos_upload_node_new (PinosDaemon *daemon,
|
||||
GBytes *possible_formats)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue