mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-31 22:25:38 -04:00
Rework transport protocol
Remove the old PinosBuffer object and replace it with SpaControl, this communication protocol is designed to make it possible to implement remote nodes and so it is moved to Spa. Move SpaBuffer into to API Work on easier API to make formats, implement enumeration and support for all formats in v4l2. Improve format output in -inspect
This commit is contained in:
Wim Taymans
parent
b795fb851f
commit
4cb90f3b86
37 changed files with 2658 additions and 1032 deletions
|
|
@ -434,110 +434,40 @@ free_mem_block (MemBlock *b)
|
|||
|
||||
static gboolean
|
||||
on_received_buffer (PinosPort *port,
|
||||
PinosBuffer *buffer,
|
||||
SpaBuffer *buffer,
|
||||
GError **error,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosSpaAlsaSink *this = user_data;
|
||||
PinosSpaAlsaSinkPrivate *priv = this->priv;
|
||||
PinosBuffer *pbuf = buffer;
|
||||
PinosBufferIter it;
|
||||
unsigned int i;
|
||||
|
||||
pinos_buffer_iter_init (&it, pbuf);
|
||||
while (pinos_buffer_iter_next (&it)) {
|
||||
switch (pinos_buffer_iter_get_type (&it)) {
|
||||
case PINOS_PACKET_TYPE_HEADER:
|
||||
{
|
||||
PinosPacketHeader hdr;
|
||||
for (i = 0; i < buffer->n_datas; i++) {
|
||||
SpaData *d = &buffer->datas[i];
|
||||
PinosRingbufferArea areas[2];
|
||||
uint8_t *data;
|
||||
size_t size, towrite, total;
|
||||
|
||||
if (!pinos_buffer_iter_parse_header (&it, &hdr))
|
||||
break;
|
||||
if (d->type != SPA_DATA_TYPE_MEMPTR)
|
||||
continue;
|
||||
|
||||
break;
|
||||
}
|
||||
case PINOS_PACKET_TYPE_ADD_MEM:
|
||||
{
|
||||
PinosPacketAddMem p;
|
||||
MemBlock *b;
|
||||
int fd;
|
||||
size = d->size;
|
||||
data = (guint8*)d->ptr + d->offset;
|
||||
|
||||
if (!pinos_buffer_iter_parse_add_mem (&it, &p))
|
||||
break;
|
||||
pinos_ringbuffer_get_write_areas (priv->ringbuffer, areas);
|
||||
|
||||
fd = pinos_buffer_get_fd (pbuf, p.fd_index);
|
||||
if (fd == -1)
|
||||
break;
|
||||
total = MIN (size, areas[0].len + areas[1].len);
|
||||
g_debug ("total write %zd %zd", total, areas[0].len + areas[1].len);
|
||||
towrite = MIN (size, areas[0].len);
|
||||
memcpy (areas[0].data, data, towrite);
|
||||
size -= towrite;
|
||||
data += towrite;
|
||||
towrite = MIN (size, areas[1].len);
|
||||
memcpy (areas[1].data, data, towrite);
|
||||
|
||||
b = g_slice_new0 (MemBlock);
|
||||
b->id = p.id;
|
||||
b->type = p.type;
|
||||
b->fd = fd;
|
||||
b->data = mmap (NULL, p.size, PROT_READ, MAP_PRIVATE, fd, p.offset);
|
||||
b->offset = p.offset;
|
||||
b->size = p.size;
|
||||
|
||||
g_hash_table_insert (priv->mem_ids, GINT_TO_POINTER (p.id), b);
|
||||
break;
|
||||
}
|
||||
|
||||
case PINOS_PACKET_TYPE_REMOVE_MEM:
|
||||
{
|
||||
PinosPacketRemoveMem p;
|
||||
|
||||
if (!pinos_buffer_iter_parse_remove_mem (&it, &p))
|
||||
break;
|
||||
|
||||
g_hash_table_remove (priv->mem_ids, GINT_TO_POINTER (p.id));
|
||||
break;
|
||||
}
|
||||
|
||||
case PINOS_PACKET_TYPE_PROCESS_MEM:
|
||||
{
|
||||
PinosPacketProcessMem p;
|
||||
MemBlock *b;
|
||||
PinosRingbufferArea areas[2];
|
||||
uint8_t *data;
|
||||
size_t size, towrite, total;
|
||||
|
||||
if (!pinos_buffer_iter_parse_process_mem (&it, &p))
|
||||
break;
|
||||
|
||||
if (!(b = g_hash_table_lookup (priv->mem_ids, GINT_TO_POINTER (p.id))))
|
||||
break;
|
||||
|
||||
size = p.size;
|
||||
data = (guint8*)b->data + p.offset;
|
||||
|
||||
pinos_ringbuffer_get_write_areas (priv->ringbuffer, areas);
|
||||
|
||||
total = MIN (size, areas[0].len + areas[1].len);
|
||||
g_debug ("total write %zd %zd", total, areas[0].len + areas[1].len);
|
||||
towrite = MIN (size, areas[0].len);
|
||||
memcpy (areas[0].data, data, towrite);
|
||||
size -= towrite;
|
||||
data += towrite;
|
||||
towrite = MIN (size, areas[1].len);
|
||||
memcpy (areas[1].data, data, towrite);
|
||||
|
||||
pinos_ringbuffer_write_advance (priv->ringbuffer, total);
|
||||
|
||||
break;
|
||||
}
|
||||
case PINOS_PACKET_TYPE_FORMAT_CHANGE:
|
||||
{
|
||||
PinosPacketFormatChange change;
|
||||
|
||||
if (!pinos_buffer_iter_parse_format_change (&it, &change))
|
||||
break;
|
||||
g_debug ("got format change %d %s", change.id, change.format);
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
pinos_ringbuffer_write_advance (priv->ringbuffer, total);
|
||||
}
|
||||
pinos_buffer_iter_end (&it);
|
||||
spa_buffer_unref (buffer);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -550,12 +480,11 @@ on_format_change (GObject *obj,
|
|||
SinkPortData *data = user_data;
|
||||
PinosNode *node = PINOS_NODE (data->sink);
|
||||
PinosSpaAlsaSink *sink = PINOS_SPA_ALSA_SINK (node);
|
||||
PinosSpaAlsaSinkPrivate *priv = sink->priv;
|
||||
GBytes *formats;
|
||||
|
||||
g_object_get (obj, "format", &formats, NULL);
|
||||
if (formats) {
|
||||
g_debug ("port %p: format change %s", obj, g_bytes_get_data (formats, NULL));
|
||||
g_debug ("port %p: format change %s", obj, (gchar*) g_bytes_get_data (formats, NULL));
|
||||
negotiate_formats (sink);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,10 +58,9 @@ struct _PinosSpaV4l2SourcePrivate
|
|||
gboolean running;
|
||||
pthread_t thread;
|
||||
|
||||
const void *format;
|
||||
GBytes *format;
|
||||
|
||||
GList *ports;
|
||||
PinosFdManager *fdmanager;
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
@ -113,50 +112,6 @@ make_node (SpaHandle **handle, const SpaNode **node, const char *lib, const char
|
|||
return SPA_RESULT_ERROR;
|
||||
}
|
||||
|
||||
static void
|
||||
send_format (PinosSpaV4l2Source *source, SourcePortData *data)
|
||||
{
|
||||
PinosSpaV4l2SourcePrivate *priv = source->priv;
|
||||
GError *error = NULL;
|
||||
PinosBufferBuilder builder;
|
||||
PinosBuffer pbuf;
|
||||
PinosPacketFormatChange fc;
|
||||
guint8 buf[1024];
|
||||
|
||||
pinos_buffer_builder_init_into (&builder, buf, 1024, NULL, 0);
|
||||
fc.id = 0;
|
||||
fc.format = priv->format;
|
||||
pinos_buffer_builder_add_format_change (&builder, &fc);
|
||||
pinos_buffer_builder_end (&builder, &pbuf);
|
||||
|
||||
if (!pinos_port_send_buffer (PINOS_PORT (data->port), &pbuf, &error)) {
|
||||
g_debug ("format update failed: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
pinos_buffer_unref (&pbuf);
|
||||
|
||||
data->have_format = TRUE;
|
||||
}
|
||||
|
||||
static int
|
||||
tmpfile_create (PinosSpaV4l2Source * source, void *data, gsize size)
|
||||
{
|
||||
char filename[] = "/dev/shm/tmpfilepay.XXXXXX";
|
||||
int fd;
|
||||
|
||||
fd = mkostemp (filename, O_CLOEXEC);
|
||||
if (fd == -1) {
|
||||
g_debug ("Failed to create temporary file: %s", strerror (errno));
|
||||
return -1;
|
||||
}
|
||||
unlink (filename);
|
||||
|
||||
if (write (fd, data, size) != (gssize) size)
|
||||
g_debug ("Failed to write data: %s", strerror (errno));
|
||||
|
||||
return fd;
|
||||
}
|
||||
|
||||
static void
|
||||
on_source_event (SpaHandle *handle, SpaEvent *event, void *user_data)
|
||||
{
|
||||
|
|
@ -169,66 +124,27 @@ on_source_event (SpaHandle *handle, SpaEvent *event, void *user_data)
|
|||
SpaOutputInfo info[1] = { 0, };
|
||||
SpaResult res;
|
||||
SpaBuffer *b;
|
||||
PinosBuffer pbuf;
|
||||
PinosBufferBuilder builder;
|
||||
PinosPacketHeader hdr;
|
||||
PinosPacketAddMem am;
|
||||
PinosPacketProcessMem p;
|
||||
PinosPacketRemoveMem rm;
|
||||
GList *walk;
|
||||
gint fd;
|
||||
guint8 buf[1024];
|
||||
gint fdbuf[8];
|
||||
gboolean do_close = FALSE;
|
||||
|
||||
if ((res = priv->source_node->port_pull_output (priv->source, 1, info)) < 0)
|
||||
g_debug ("spa-v4l2-source %p: got pull error %d", source, res);
|
||||
|
||||
b = info[0].buffer;
|
||||
|
||||
hdr.flags = 0;
|
||||
hdr.seq = 0;
|
||||
hdr.pts = -1;
|
||||
hdr.dts_offset = 0;
|
||||
|
||||
pinos_buffer_builder_init_into (&builder, buf, 1024, fdbuf, 8);
|
||||
pinos_buffer_builder_add_header (&builder, &hdr);
|
||||
|
||||
if (b->datas[0].type == SPA_DATA_TYPE_FD) {
|
||||
fd = *((int *)b->datas[0].ptr);
|
||||
} else {
|
||||
fd = tmpfile_create (source, b->datas[0].ptr, b->size);
|
||||
do_close = TRUE;
|
||||
}
|
||||
am.fd_index = pinos_buffer_builder_add_fd (&builder, fd);
|
||||
am.id = pinos_fd_manager_get_id (priv->fdmanager);
|
||||
am.offset = 0;
|
||||
am.size = b->datas[0].size + b->datas[0].offset;
|
||||
p.id = am.id;
|
||||
p.offset = b->datas[0].offset;
|
||||
p.size = b->datas[0].size;
|
||||
rm.id = am.id;
|
||||
pinos_buffer_builder_add_add_mem (&builder, &am);
|
||||
pinos_buffer_builder_add_process_mem (&builder, &p);
|
||||
pinos_buffer_builder_add_remove_mem (&builder, &rm);
|
||||
pinos_buffer_builder_end (&builder, &pbuf);
|
||||
|
||||
for (walk = priv->ports; walk; walk = g_list_next (walk)) {
|
||||
SourcePortData *data = walk->data;
|
||||
GError *error = NULL;
|
||||
|
||||
if (!data->have_format)
|
||||
send_format (source, data);
|
||||
if (!data->have_format) {
|
||||
g_object_set (data->port, "format", priv->format, NULL);
|
||||
data->have_format = TRUE;
|
||||
}
|
||||
|
||||
if (!pinos_port_send_buffer (PINOS_PORT (data->port), &pbuf, &error)) {
|
||||
if (!pinos_port_send_buffer (data->port, b, &error)) {
|
||||
g_debug ("send failed: %s", error->message);
|
||||
g_clear_error (&error);
|
||||
}
|
||||
}
|
||||
if (!do_close)
|
||||
pinos_buffer_steal_fds (&pbuf, NULL);
|
||||
pinos_buffer_unref (&pbuf);
|
||||
|
||||
spa_buffer_unref (b);
|
||||
break;
|
||||
}
|
||||
|
|
@ -270,7 +186,7 @@ create_pipeline (PinosSpaV4l2Source *this)
|
|||
g_debug ("got get_props error %d", res);
|
||||
|
||||
value.type = SPA_PROP_TYPE_STRING;
|
||||
value.value = "/dev/video0";
|
||||
value.value = "/dev/video1";
|
||||
value.size = strlen (value.value)+1;
|
||||
props->set_prop (props, spa_props_index_for_name (props, "device"), &value);
|
||||
|
||||
|
|
@ -290,6 +206,7 @@ negotiate_formats (PinosSpaV4l2Source *this)
|
|||
void *state = NULL;
|
||||
SpaFraction frac;
|
||||
SpaRectangle rect;
|
||||
const gchar *str;
|
||||
|
||||
if ((res = priv->source_node->port_enum_formats (priv->source, 0, &format, NULL, &state)) < 0)
|
||||
return res;
|
||||
|
|
@ -323,11 +240,12 @@ negotiate_formats (PinosSpaV4l2Source *this)
|
|||
if ((res = priv->source_node->port_set_format (priv->source, 0, 0, format)) < 0)
|
||||
return res;
|
||||
|
||||
priv->format = "video/x-raw,"
|
||||
" format=(string)YUY2,"
|
||||
" width=(int)320,"
|
||||
" height=(int)240,"
|
||||
" framerate=(fraction)30/1";
|
||||
str = "video/x-raw,"
|
||||
" format=(string)YUY2,"
|
||||
" width=(int)320,"
|
||||
" height=(int)240,"
|
||||
" framerate=(fraction)30/1";
|
||||
priv->format = g_bytes_new_static (str, strlen (str)+1);
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
|
@ -487,26 +405,6 @@ on_deactivate (PinosPort *port, gpointer user_data)
|
|||
pinos_node_report_idle (PINOS_NODE (source));
|
||||
}
|
||||
|
||||
static gboolean
|
||||
on_received_buffer (PinosPort *port,
|
||||
PinosBuffer *pbuf,
|
||||
GError **error,
|
||||
gpointer user_data)
|
||||
{
|
||||
PinosBufferIter it;
|
||||
|
||||
pinos_buffer_iter_init (&it, pbuf);
|
||||
while (pinos_buffer_iter_next (&it)) {
|
||||
switch (pinos_buffer_iter_get_type (&it)) {
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
pinos_buffer_iter_end (&it);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
free_source_port_data (SourcePortData *data)
|
||||
{
|
||||
|
|
@ -575,8 +473,6 @@ add_port (PinosNode *node,
|
|||
data->port = PINOS_NODE_CLASS (pinos_spa_v4l2_source_parent_class)
|
||||
->add_port (node, direction, id, error);
|
||||
|
||||
pinos_port_set_received_buffer_cb (data->port, on_received_buffer, source, NULL);
|
||||
|
||||
g_debug ("connecting signals");
|
||||
g_signal_connect (data->port, "activate", (GCallback) on_activate, data);
|
||||
g_signal_connect (data->port, "deactivate", (GCallback) on_deactivate, data);
|
||||
|
|
@ -607,10 +503,7 @@ pinos_spa_v4l2_source_class_init (PinosSpaV4l2SourceClass * klass)
|
|||
static void
|
||||
pinos_spa_v4l2_source_init (PinosSpaV4l2Source * source)
|
||||
{
|
||||
PinosSpaV4l2SourcePrivate *priv = source->priv = PINOS_SPA_V4L2_SOURCE_GET_PRIVATE (source);
|
||||
|
||||
priv->fdmanager = pinos_fd_manager_get (PINOS_FD_MANAGER_DEFAULT);
|
||||
|
||||
source->priv = PINOS_SPA_V4L2_SOURCE_GET_PRIVATE (source);
|
||||
}
|
||||
|
||||
PinosNode *
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue