mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-29 06:46:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-avb: Introduce changes in the mechanisms how the stream are

Browse source 
built:
* es_builder: create stream with state variables and counters
* acmp: do not use the stream list, go through the descriptor to find
  the index
* stream: do not store redundant information such as the index and
  descriptor
* internal: removing the stream server and function associated to it

module-avb: internal, stream: removing server_find_stream
This commit is contained in:
hackerman-kl 2025-11-27 09:37:37 +01:00 • committed by hackerman-kl
parent 546dafa0b0
commit 875dd91bc2
6 changed files with 120 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/module-avb/stream.c
View file

@ -15,8 +15,8 @@
#include "iec61883.h"
#include "stream.h"
#include "aecp-aem-state.h"
#include "utils.h"
#include "aecp-aem-descriptors.h"
static void on_stream_destroy(void *d)
{
@ -235,34 +235,17 @@ static const struct pw_stream_events sink_stream_events = {
.process = on_sink_stream_process
};
struct stream *server_create_stream(struct server *server,
struct stream *server_create_stream(struct server *server, struct stream *stream,
enum spa_direction direction, uint16_t index)
{
struct stream *stream;
const struct descriptor *desc;
uint32_t n_params;
const struct spa_pod *params[1];
uint8_t buffer[1024];
struct spa_pod_builder b;
int res;
desc = server_find_descriptor(server,
direction == SPA_DIRECTION_INPUT ?
AVB_AEM_DESC_STREAM_INPUT :
AVB_AEM_DESC_STREAM_OUTPUT, index);
if (desc == NULL)
return NULL;
stream = calloc(1, sizeof(*stream));
if (stream == NULL)
return NULL;
stream->server = server;
stream->direction = direction;
stream->index = index;
stream->desc = desc;
spa_list_append(&server->streams, &stream->link);
stream->prio = AVB_MSRP_PRIORITY_DEFAULT;
stream->vlan_id = AVB_DEFAULT_VLAN;
@ -361,8 +344,6 @@ error_free:
void stream_destroy(struct stream *stream)
{
avb_mrp_attribute_destroy(stream->listener_attr->mrp);
spa_list_remove(&stream->link);
free(stream);
}
static int setup_socket(struct stream *stream)
@ -496,7 +477,7 @@ static void on_socket_data(void *data, int fd, uint32_t mask)
}
}
int stream_activate(struct stream *stream, uint64_t now)
int stream_activate(struct stream *stream, uint16_t index, uint64_t now)
{
struct server *server = stream->server;
struct avb_frame_header *h = (void*)stream->pdu;
@ -528,7 +509,7 @@ int stream_activate(struct stream *stream, uint64_t now)
stream->talker_attr->attr.talker.stream_id = htobe64(stream->peer_id);
avb_mrp_attribute_begin(stream->talker_attr->mrp, now);
} else {
if ((res = avb_maap_get_address(server->maap, stream->addr, stream->index)) < 0)
if ((res = avb_maap_get_address(server->maap, stream->addr, index)) < 0)
return res;
stream->listener_attr->attr.listener.stream_id = htobe64(stream->id);