mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-03 09:01:54 -05:00
Make structure private
Make structs private. Expose methods for things we need. Signals only work on exposed structures so make a new callback helper to signal events.
This commit is contained in:
Wim Taymans
parent
e24c934a1b
commit
b898eb46cd
72 changed files with 2980 additions and 2120 deletions
|
|
@ -74,14 +74,17 @@ struct data {
|
|||
struct pw_loop *loop;
|
||||
|
||||
struct pw_core *core;
|
||||
struct pw_type *t;
|
||||
|
||||
struct pw_remote *remote;
|
||||
struct pw_listener on_state_changed;
|
||||
struct pw_callback_info remote_callbacks;
|
||||
|
||||
struct pw_node *node;
|
||||
struct pw_port *port;
|
||||
struct spa_port_info port_info;
|
||||
|
||||
struct spa_port_io *io;
|
||||
|
||||
uint8_t buffer[1024];
|
||||
|
||||
struct spa_video_info_raw format;
|
||||
|
|
@ -180,14 +183,21 @@ static Uint32 id_to_sdl_format(struct data *data, uint32_t id)
|
|||
SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \
|
||||
SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__)
|
||||
|
||||
static int impl_port_enum_formats(struct pw_port *port,
|
||||
static int impl_port_set_io(void *data, struct spa_port_io *io)
|
||||
{
|
||||
struct data *d = data;
|
||||
d->io = io;
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_enum_formats(void *data,
|
||||
struct spa_format **format,
|
||||
const struct spa_format *filter,
|
||||
int32_t index)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct data *d = data;
|
||||
const struct spa_format *formats[1];
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(data->buffer, sizeof(data->buffer));
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer));
|
||||
struct spa_pod_frame f[2];
|
||||
SDL_RendererInfo info;
|
||||
int i, c;
|
||||
|
|
@ -195,17 +205,17 @@ static int impl_port_enum_formats(struct pw_port *port,
|
|||
if (index != 0)
|
||||
return SPA_RESULT_ENUM_END;
|
||||
|
||||
SDL_GetRendererInfo(data->renderer, &info);
|
||||
SDL_GetRendererInfo(d->renderer, &info);
|
||||
|
||||
spa_pod_builder_push_format(&b, &f[0], data->type.format,
|
||||
data->type.media_type.video,
|
||||
data->type.media_subtype.raw);
|
||||
spa_pod_builder_push_format(&b, &f[0], d->type.format,
|
||||
d->type.media_type.video,
|
||||
d->type.media_subtype.raw);
|
||||
|
||||
spa_pod_builder_push_prop(&b, &f[1], data->type.format_video.format,
|
||||
spa_pod_builder_push_prop(&b, &f[1], d->type.format_video.format,
|
||||
SPA_POD_PROP_FLAG_UNSET |
|
||||
SPA_POD_PROP_RANGE_ENUM);
|
||||
for (i = 0, c = 0; i < info.num_texture_formats; i++) {
|
||||
uint32_t id = sdl_format_to_id(data, info.texture_formats[i]);
|
||||
uint32_t id = sdl_format_to_id(d, info.texture_formats[i]);
|
||||
if (id == 0)
|
||||
continue;
|
||||
if (c++ == 0)
|
||||
|
|
@ -214,17 +224,17 @@ static int impl_port_enum_formats(struct pw_port *port,
|
|||
}
|
||||
for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
|
||||
uint32_t id =
|
||||
*SPA_MEMBER(&data->type.video_format, video_formats[i].id,
|
||||
*SPA_MEMBER(&d->type.video_format, video_formats[i].id,
|
||||
uint32_t);
|
||||
if (id != data->type.video_format.UNKNOWN)
|
||||
if (id != d->type.video_format.UNKNOWN)
|
||||
spa_pod_builder_id(&b, id);
|
||||
}
|
||||
spa_pod_builder_pop(&b, &f[1]);
|
||||
spa_pod_builder_add(&b,
|
||||
PROP_U_MM(&f[1], data->type.format_video.size, SPA_POD_TYPE_RECTANGLE,
|
||||
PROP_U_MM(&f[1], d->type.format_video.size, SPA_POD_TYPE_RECTANGLE,
|
||||
WIDTH, HEIGHT,
|
||||
1, 1, info.max_texture_width, info.max_texture_height),
|
||||
PROP_U_MM(&f[1], data->type.format_video.framerate, SPA_POD_TYPE_FRACTION,
|
||||
PROP_U_MM(&f[1], d->type.format_video.framerate, SPA_POD_TYPE_FRACTION,
|
||||
25, 1,
|
||||
0, 1, 30, 1),
|
||||
0);
|
||||
|
|
@ -238,70 +248,70 @@ static int impl_port_enum_formats(struct pw_port *port,
|
|||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_set_format(struct pw_port *port, uint32_t flags, const struct spa_format *format)
|
||||
static int impl_port_set_format(void *data, uint32_t flags, const struct spa_format *format)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct pw_core *core = data->core;
|
||||
struct data *d = data;
|
||||
struct pw_type *t = d->t;
|
||||
struct spa_pod_builder b = { NULL };
|
||||
struct spa_pod_frame f[2];
|
||||
Uint32 sdl_format;
|
||||
void *d;
|
||||
void *dest;
|
||||
|
||||
if (format == NULL)
|
||||
return SPA_RESULT_OK;
|
||||
|
||||
spa_debug_format(format);
|
||||
|
||||
spa_format_video_raw_parse(format, &data->format, &data->type.format_video);
|
||||
spa_format_video_raw_parse(format, &d->format, &d->type.format_video);
|
||||
|
||||
sdl_format = id_to_sdl_format(data, data->format.format);
|
||||
sdl_format = id_to_sdl_format(d, d->format.format);
|
||||
if (sdl_format == SDL_PIXELFORMAT_UNKNOWN)
|
||||
return SPA_RESULT_ERROR;
|
||||
|
||||
data->texture = SDL_CreateTexture(data->renderer,
|
||||
d->texture = SDL_CreateTexture(d->renderer,
|
||||
sdl_format,
|
||||
SDL_TEXTUREACCESS_STREAMING,
|
||||
data->format.size.width,
|
||||
data->format.size.height);
|
||||
SDL_LockTexture(data->texture, NULL, &d, &data->stride);
|
||||
SDL_UnlockTexture(data->texture);
|
||||
d->format.size.width,
|
||||
d->format.size.height);
|
||||
SDL_LockTexture(d->texture, NULL, &dest, &d->stride);
|
||||
SDL_UnlockTexture(d->texture);
|
||||
|
||||
spa_pod_builder_init(&b, data->params_buffer, sizeof(data->params_buffer));
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], core->type.param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
data->stride * data->format.size.height),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
data->stride),
|
||||
PROP_U_MM(&f[1], core->type.param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_init(&b, d->params_buffer, sizeof(d->params_buffer));
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], t->param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
d->stride * d->format.size.height),
|
||||
PROP(&f[1], t->param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
d->stride),
|
||||
PROP_U_MM(&f[1], t->param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
32,
|
||||
2, 32),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
PROP(&f[1], t->param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
16));
|
||||
data->params[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
d->params[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
core->type.meta.Header),
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], t->param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
t->meta.Header),
|
||||
PROP(&f[1], t->param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
sizeof(struct spa_meta_header)));
|
||||
data->params[1] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
d->params[1] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_get_format(struct pw_port *port, const struct spa_format **format)
|
||||
static int impl_port_get_format(void *data, const struct spa_format **format)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(data->buffer, sizeof(data->buffer));
|
||||
struct data *d = data;
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer));
|
||||
struct spa_pod_frame f[2];
|
||||
|
||||
spa_pod_builder_push_format(&b, &f[0], data->type.format,
|
||||
data->type.media_type.video,
|
||||
data->type.media_subtype.raw);
|
||||
spa_pod_builder_push_format(&b, &f[0], d->type.format,
|
||||
d->type.media_type.video,
|
||||
d->type.media_subtype.raw);
|
||||
spa_pod_builder_add(&b,
|
||||
PROP(&f[1], data->type.format_video.format, SPA_POD_TYPE_ID, data->format.format),
|
||||
PROP(&f[1], data->type.format_video.size, SPA_POD_TYPE_RECTANGLE, &data->format.size),
|
||||
PROP(&f[1], data->type.format_video.framerate, SPA_POD_TYPE_FRACTION, &data->format.framerate),
|
||||
PROP(&f[1], d->type.format_video.format, SPA_POD_TYPE_ID, d->format.format),
|
||||
PROP(&f[1], d->type.format_video.size, SPA_POD_TYPE_RECTANGLE, &d->format.size),
|
||||
PROP(&f[1], d->type.format_video.framerate, SPA_POD_TYPE_FRACTION, &d->format.framerate),
|
||||
0);
|
||||
spa_pod_builder_pop(&b, &f[0]);
|
||||
*format = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_format);
|
||||
|
|
@ -309,104 +319,55 @@ static int impl_port_get_format(struct pw_port *port, const struct spa_format **
|
|||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_get_info(struct pw_port *port, const struct spa_port_info **info)
|
||||
static int impl_port_get_info(void *data, const struct spa_port_info **info)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct data *d = data;
|
||||
|
||||
data->port_info.flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
|
||||
data->port_info.rate = 0;
|
||||
data->port_info.props = NULL;
|
||||
d->port_info.flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
|
||||
d->port_info.rate = 0;
|
||||
d->port_info.props = NULL;
|
||||
|
||||
*info = &data->port_info;
|
||||
*info = &d->port_info;
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_enum_params(struct pw_port *port, uint32_t index, struct spa_param **param)
|
||||
static int impl_port_enum_params(void *data, uint32_t index, struct spa_param **param)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct data *d = data;
|
||||
|
||||
if (index >= 2)
|
||||
return SPA_RESULT_ENUM_END;
|
||||
|
||||
*param = data->params[index];
|
||||
*param = d->params[index];
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_set_param(struct pw_port *port, struct spa_param *param)
|
||||
static int impl_port_use_buffers(void *data, struct spa_buffer **buffers, uint32_t n_buffers)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_port_use_buffers(struct pw_port *port, struct spa_buffer **buffers, uint32_t n_buffers)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct data *d = data;
|
||||
int i;
|
||||
for (i = 0; i < n_buffers; i++)
|
||||
data->buffers[i] = buffers[i];
|
||||
data->n_buffers = n_buffers;
|
||||
d->buffers[i] = buffers[i];
|
||||
d->n_buffers = n_buffers;
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_alloc_buffers(struct pw_port *port,
|
||||
struct spa_param **params, uint32_t n_params,
|
||||
struct spa_buffer **buffers, uint32_t *n_buffers)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_port_reuse_buffer(struct pw_port *port, uint32_t buffer_id)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_port_send_command(struct pw_port *port, struct spa_command *command)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static const struct pw_port_implementation impl_port = {
|
||||
PW_VERSION_PORT_IMPLEMENTATION,
|
||||
impl_port_enum_formats,
|
||||
impl_port_set_format,
|
||||
impl_port_get_format,
|
||||
impl_port_get_info,
|
||||
impl_port_enum_params,
|
||||
impl_port_set_param,
|
||||
impl_port_use_buffers,
|
||||
impl_port_alloc_buffers,
|
||||
impl_port_reuse_buffer,
|
||||
impl_port_send_command,
|
||||
.set_io = impl_port_set_io,
|
||||
.enum_formats = impl_port_enum_formats,
|
||||
.set_format = impl_port_set_format,
|
||||
.get_format = impl_port_get_format,
|
||||
.get_info = impl_port_get_info,
|
||||
.enum_params = impl_port_enum_params,
|
||||
.use_buffers = impl_port_use_buffers,
|
||||
};
|
||||
|
||||
static int impl_node_get_props(struct pw_node *node, struct spa_props **props)
|
||||
static int impl_node_process_input(void *data)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_node_set_props(struct pw_node *node, const struct spa_props *props)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_node_send_command(struct pw_node *node,
|
||||
const struct spa_command *command)
|
||||
{
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static struct pw_port* impl_node_add_port(struct pw_node *node,
|
||||
enum pw_direction direction,
|
||||
uint32_t port_id)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int impl_node_process_input(struct pw_node *node)
|
||||
{
|
||||
struct data *data = node->user_data;
|
||||
struct pw_port *port = data->port;
|
||||
struct data *d = data;
|
||||
struct spa_buffer *buf;
|
||||
uint8_t *map;
|
||||
void *sdata, *ddata;
|
||||
|
|
@ -414,20 +375,20 @@ static int impl_node_process_input(struct pw_node *node)
|
|||
int i;
|
||||
uint8_t *src, *dst;
|
||||
|
||||
buf = port->buffers[port->io.buffer_id];
|
||||
buf = d->buffers[d->io->buffer_id];
|
||||
|
||||
if (buf->datas[0].type == data->type.data.MemFd ||
|
||||
buf->datas[0].type == data->type.data.DmaBuf) {
|
||||
if (buf->datas[0].type == d->type.data.MemFd ||
|
||||
buf->datas[0].type == d->type.data.DmaBuf) {
|
||||
map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ,
|
||||
MAP_PRIVATE, buf->datas[0].fd, 0);
|
||||
sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t);
|
||||
} else if (buf->datas[0].type == data->type.data.MemPtr) {
|
||||
} else if (buf->datas[0].type == d->type.data.MemPtr) {
|
||||
map = NULL;
|
||||
sdata = buf->datas[0].data;
|
||||
} else
|
||||
return SPA_RESULT_ERROR;
|
||||
|
||||
if (SDL_LockTexture(data->texture, NULL, &ddata, &dstride) < 0) {
|
||||
if (SDL_LockTexture(d->texture, NULL, &ddata, &dstride) < 0) {
|
||||
fprintf(stderr, "Couldn't lock texture: %s\n", SDL_GetError());
|
||||
return SPA_RESULT_ERROR;
|
||||
}
|
||||
|
|
@ -436,40 +397,30 @@ static int impl_node_process_input(struct pw_node *node)
|
|||
|
||||
src = sdata;
|
||||
dst = ddata;
|
||||
for (i = 0; i < data->format.size.height; i++) {
|
||||
for (i = 0; i < d->format.size.height; i++) {
|
||||
memcpy(dst, src, ostride);
|
||||
src += sstride;
|
||||
dst += dstride;
|
||||
}
|
||||
SDL_UnlockTexture(data->texture);
|
||||
SDL_UnlockTexture(d->texture);
|
||||
|
||||
SDL_RenderClear(data->renderer);
|
||||
SDL_RenderCopy(data->renderer, data->texture, NULL, NULL);
|
||||
SDL_RenderPresent(data->renderer);
|
||||
SDL_RenderClear(d->renderer);
|
||||
SDL_RenderCopy(d->renderer, d->texture, NULL, NULL);
|
||||
SDL_RenderPresent(d->renderer);
|
||||
|
||||
if (map)
|
||||
munmap(map, buf->datas[0].maxsize);
|
||||
|
||||
handle_events(data);
|
||||
handle_events(d);
|
||||
|
||||
port->io.status = SPA_RESULT_NEED_BUFFER;
|
||||
d->io->status = SPA_RESULT_NEED_BUFFER;
|
||||
|
||||
return SPA_RESULT_NEED_BUFFER;
|
||||
}
|
||||
|
||||
static int impl_node_process_output(struct pw_node *node)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static const struct pw_node_implementation impl_node = {
|
||||
PW_VERSION_NODE_IMPLEMENTATION,
|
||||
impl_node_get_props,
|
||||
impl_node_set_props,
|
||||
impl_node_send_command,
|
||||
impl_node_add_port,
|
||||
impl_node_process_input,
|
||||
impl_node_process_output,
|
||||
.process_input = impl_node_process_input,
|
||||
};
|
||||
|
||||
static void make_node(struct data *data)
|
||||
|
|
@ -482,25 +433,23 @@ static void make_node(struct data *data)
|
|||
NULL);
|
||||
|
||||
data->node = pw_node_new(data->core, NULL, NULL, "SDL-sink", props, 0);
|
||||
data->node->user_data = data;
|
||||
data->node->implementation = &impl_node;
|
||||
pw_node_set_implementation(data->node, &impl_node, data);
|
||||
|
||||
data->port = pw_port_new(PW_DIRECTION_INPUT, 0, 0);
|
||||
data->port->user_data = data;
|
||||
data->port->implementation = &impl_port;
|
||||
pw_port_set_implementation(data->port, &impl_port, data);
|
||||
pw_port_add(data->port, data->node);
|
||||
pw_node_register(data->node);
|
||||
|
||||
pw_remote_export(data->remote, data->node);
|
||||
}
|
||||
|
||||
static void on_state_changed(struct pw_listener *listener, struct pw_remote *remote)
|
||||
static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remote_state state, const char *error)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_state_changed);
|
||||
struct data *data = _data;
|
||||
|
||||
switch (remote->state) {
|
||||
switch (state) {
|
||||
case PW_REMOTE_STATE_ERROR:
|
||||
printf("remote error: %s\n", remote->error);
|
||||
printf("remote error: %s\n", error);
|
||||
data->running = false;
|
||||
break;
|
||||
|
||||
|
|
@ -509,11 +458,15 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
break;
|
||||
|
||||
default:
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(remote->state));
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static const struct pw_remote_callbacks remote_callbacks = {
|
||||
PW_VERSION_REMOTE_CALLBACKS,
|
||||
.state_changed = on_state_changed,
|
||||
};
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
|
@ -524,14 +477,15 @@ int main(int argc, char *argv[])
|
|||
data.loop = pw_loop_new();
|
||||
data.running = true;
|
||||
data.core = pw_core_new(data.loop, NULL);
|
||||
data.t = pw_core_get_type(data.core);
|
||||
data.remote = pw_remote_new(data.core, NULL);
|
||||
data.path = argc > 1 ? argv[1] : NULL;
|
||||
|
||||
pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL);
|
||||
|
||||
init_type(&data.type, data.core->type.map);
|
||||
init_type(&data.type, data.t->map);
|
||||
|
||||
spa_debug_set_type_map(data.core->type.map);
|
||||
spa_debug_set_type_map(data.t->map);
|
||||
|
||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||
printf("can't initialize SDL: %s\n", SDL_GetError());
|
||||
|
|
@ -544,7 +498,7 @@ int main(int argc, char *argv[])
|
|||
return -1;
|
||||
}
|
||||
|
||||
pw_signal_add(&data.remote->state_changed, &data.on_state_changed, on_state_changed);
|
||||
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
|
||||
|
||||
pw_remote_connect(data.remote);
|
||||
|
||||
|
|
|
|||
|
|
@ -64,9 +64,10 @@ struct data {
|
|||
struct pw_loop *loop;
|
||||
|
||||
struct pw_core *core;
|
||||
struct pw_type *t;
|
||||
|
||||
struct pw_remote *remote;
|
||||
struct pw_listener on_state_changed;
|
||||
struct pw_callback_info remote_callbacks;
|
||||
|
||||
struct pw_node *node;
|
||||
};
|
||||
|
|
@ -86,13 +87,13 @@ static void make_node(struct data *data)
|
|||
pw_remote_export(data->remote, data->node);
|
||||
}
|
||||
|
||||
static void on_state_changed(struct pw_listener *listener, struct pw_remote *remote)
|
||||
static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remote_state state, const char *error)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_state_changed);
|
||||
struct data *data = _data;
|
||||
|
||||
switch (remote->state) {
|
||||
switch (state) {
|
||||
case PW_REMOTE_STATE_ERROR:
|
||||
printf("remote error: %s\n", remote->error);
|
||||
printf("remote error: %s\n", error);
|
||||
data->running = false;
|
||||
break;
|
||||
|
||||
|
|
@ -101,11 +102,15 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
break;
|
||||
|
||||
default:
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(remote->state));
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static const struct pw_remote_callbacks remote_callbacks = {
|
||||
PW_VERSION_REMOTE_CALLBACKS,
|
||||
.state_changed = on_state_changed,
|
||||
};
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
|
@ -116,15 +121,16 @@ int main(int argc, char *argv[])
|
|||
data.loop = pw_loop_new();
|
||||
data.running = true;
|
||||
data.core = pw_core_new(data.loop, NULL);
|
||||
data.t = pw_core_get_type(data.core);
|
||||
data.remote = pw_remote_new(data.core, NULL);
|
||||
|
||||
pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL);
|
||||
|
||||
init_type(&data.type, data.core->type.map);
|
||||
init_type(&data.type, data.t->map);
|
||||
|
||||
spa_debug_set_type_map(data.core->type.map);
|
||||
spa_debug_set_type_map(data.t->map);
|
||||
|
||||
pw_signal_add(&data.remote->state_changed, &data.on_state_changed, on_state_changed);
|
||||
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
|
||||
|
||||
pw_remote_connect(data.remote);
|
||||
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ struct data {
|
|||
struct spa_source *timer;
|
||||
|
||||
struct pw_core *core;
|
||||
struct pw_type *t;
|
||||
struct pw_node *node;
|
||||
struct pw_port *port;
|
||||
struct spa_port_info port_info;
|
||||
|
|
@ -83,6 +84,8 @@ struct data {
|
|||
|
||||
struct pw_link *link;
|
||||
|
||||
struct spa_port_io *io;
|
||||
|
||||
uint8_t buffer[1024];
|
||||
|
||||
struct spa_video_info_raw format;
|
||||
|
|
@ -181,14 +184,21 @@ static Uint32 id_to_sdl_format(struct data *data, uint32_t id)
|
|||
SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \
|
||||
SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__)
|
||||
|
||||
static int impl_port_enum_formats(struct pw_port *port,
|
||||
static int impl_port_set_io(void *data, struct spa_port_io *io)
|
||||
{
|
||||
struct data *d = data;
|
||||
d->io = io;
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_enum_formats(void *data,
|
||||
struct spa_format **format,
|
||||
const struct spa_format *filter,
|
||||
int32_t index)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct data *d = data;
|
||||
const struct spa_format *formats[1];
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(data->buffer, sizeof(data->buffer));
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(d->buffer, sizeof(d->buffer));
|
||||
struct spa_pod_frame f[2];
|
||||
SDL_RendererInfo info;
|
||||
int i, c;
|
||||
|
|
@ -196,17 +206,17 @@ static int impl_port_enum_formats(struct pw_port *port,
|
|||
if (index != 0)
|
||||
return SPA_RESULT_ENUM_END;
|
||||
|
||||
SDL_GetRendererInfo(data->renderer, &info);
|
||||
SDL_GetRendererInfo(d->renderer, &info);
|
||||
|
||||
spa_pod_builder_push_format(&b, &f[0], data->type.format,
|
||||
data->type.media_type.video,
|
||||
data->type.media_subtype.raw);
|
||||
spa_pod_builder_push_format(&b, &f[0], d->type.format,
|
||||
d->type.media_type.video,
|
||||
d->type.media_subtype.raw);
|
||||
|
||||
spa_pod_builder_push_prop(&b, &f[1], data->type.format_video.format,
|
||||
spa_pod_builder_push_prop(&b, &f[1], d->type.format_video.format,
|
||||
SPA_POD_PROP_FLAG_UNSET |
|
||||
SPA_POD_PROP_RANGE_ENUM);
|
||||
for (i = 0, c = 0; i < info.num_texture_formats; i++) {
|
||||
uint32_t id = sdl_format_to_id(data, info.texture_formats[i]);
|
||||
uint32_t id = sdl_format_to_id(d, info.texture_formats[i]);
|
||||
if (id == 0)
|
||||
continue;
|
||||
if (c++ == 0)
|
||||
|
|
@ -215,17 +225,17 @@ static int impl_port_enum_formats(struct pw_port *port,
|
|||
}
|
||||
for (i = 0; i < SPA_N_ELEMENTS(video_formats); i++) {
|
||||
uint32_t id =
|
||||
*SPA_MEMBER(&data->type.video_format, video_formats[i].id,
|
||||
*SPA_MEMBER(&d->type.video_format, video_formats[i].id,
|
||||
uint32_t);
|
||||
if (id != data->type.video_format.UNKNOWN)
|
||||
if (id != d->type.video_format.UNKNOWN)
|
||||
spa_pod_builder_id(&b, id);
|
||||
}
|
||||
spa_pod_builder_pop(&b, &f[1]);
|
||||
spa_pod_builder_add(&b,
|
||||
PROP_U_MM(&f[1], data->type.format_video.size, SPA_POD_TYPE_RECTANGLE,
|
||||
PROP_U_MM(&f[1], d->type.format_video.size, SPA_POD_TYPE_RECTANGLE,
|
||||
WIDTH, HEIGHT,
|
||||
1, 1, info.max_texture_width, info.max_texture_height),
|
||||
PROP_U_MM(&f[1], data->type.format_video.framerate, SPA_POD_TYPE_FRACTION,
|
||||
PROP_U_MM(&f[1], d->type.format_video.framerate, SPA_POD_TYPE_FRACTION,
|
||||
25, 1,
|
||||
0, 1, 30, 1),
|
||||
0);
|
||||
|
|
@ -239,14 +249,14 @@ static int impl_port_enum_formats(struct pw_port *port,
|
|||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_set_format(struct pw_port *port, uint32_t flags, const struct spa_format *format)
|
||||
static int impl_port_set_format(void *data, uint32_t flags, const struct spa_format *format)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct pw_core *core = data->core;
|
||||
struct data *d = data;
|
||||
struct pw_type *t = d->t;
|
||||
struct spa_pod_builder b = { NULL };
|
||||
struct spa_pod_frame f[2];
|
||||
Uint32 sdl_format;
|
||||
void *d;
|
||||
void *dest;
|
||||
|
||||
if (format == NULL) {
|
||||
return SPA_RESULT_OK;
|
||||
|
|
@ -254,146 +264,91 @@ static int impl_port_set_format(struct pw_port *port, uint32_t flags, const stru
|
|||
|
||||
spa_debug_format(format);
|
||||
|
||||
spa_format_video_raw_parse(format, &data->format, &data->type.format_video);
|
||||
spa_format_video_raw_parse(format, &d->format, &d->type.format_video);
|
||||
|
||||
sdl_format = id_to_sdl_format(data, data->format.format);
|
||||
sdl_format = id_to_sdl_format(d, d->format.format);
|
||||
if (sdl_format == SDL_PIXELFORMAT_UNKNOWN)
|
||||
return SPA_RESULT_ERROR;
|
||||
|
||||
data->texture = SDL_CreateTexture(data->renderer,
|
||||
d->texture = SDL_CreateTexture(d->renderer,
|
||||
sdl_format,
|
||||
SDL_TEXTUREACCESS_STREAMING,
|
||||
data->format.size.width,
|
||||
data->format.size.height);
|
||||
SDL_LockTexture(data->texture, NULL, &d, &data->stride);
|
||||
SDL_UnlockTexture(data->texture);
|
||||
d->format.size.width,
|
||||
d->format.size.height);
|
||||
SDL_LockTexture(d->texture, NULL, &dest, &d->stride);
|
||||
SDL_UnlockTexture(d->texture);
|
||||
|
||||
spa_pod_builder_init(&b, data->params_buffer, sizeof(data->params_buffer));
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], core->type.param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
data->stride * data->format.size.height),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
data->stride),
|
||||
PROP_U_MM(&f[1], core->type.param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_init(&b, d->params_buffer, sizeof(d->params_buffer));
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], t->param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
d->stride * d->format.size.height),
|
||||
PROP(&f[1], t->param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
d->stride),
|
||||
PROP_U_MM(&f[1], t->param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
32,
|
||||
2, 32),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
PROP(&f[1], t->param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
16));
|
||||
data->params[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
d->params[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
core->type.meta.Header),
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], t->param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
t->meta.Header),
|
||||
PROP(&f[1], t->param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
sizeof(struct spa_meta_header)));
|
||||
data->params[1] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
d->params[1] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_get_format(struct pw_port *port, const struct spa_format **format)
|
||||
static int impl_port_get_info(void *data, const struct spa_port_info **info)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
struct data *d = data;
|
||||
|
||||
static int impl_port_get_info(struct pw_port *port, const struct spa_port_info **info)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
d->port_info.flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
|
||||
d->port_info.rate = 0;
|
||||
d->port_info.props = NULL;
|
||||
|
||||
data->port_info.flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
|
||||
data->port_info.rate = 0;
|
||||
data->port_info.props = NULL;
|
||||
|
||||
*info = &data->port_info;
|
||||
*info = &d->port_info;
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_enum_params(struct pw_port *port, uint32_t index, struct spa_param **param)
|
||||
static int impl_port_enum_params(void *data, uint32_t index, struct spa_param **param)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct data *d = data;
|
||||
|
||||
if (index >= 2)
|
||||
return SPA_RESULT_ENUM_END;
|
||||
|
||||
*param = data->params[index];
|
||||
*param = d->params[index];
|
||||
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_set_param(struct pw_port *port, struct spa_param *param)
|
||||
static int impl_port_use_buffers(void *data, struct spa_buffer **buffers, uint32_t n_buffers)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_port_use_buffers(struct pw_port *port, struct spa_buffer **buffers, uint32_t n_buffers)
|
||||
{
|
||||
struct data *data = port->user_data;
|
||||
struct data *d = data;
|
||||
int i;
|
||||
for (i = 0; i < n_buffers; i++)
|
||||
data->buffers[i] = buffers[i];
|
||||
data->n_buffers = n_buffers;
|
||||
d->buffers[i] = buffers[i];
|
||||
d->n_buffers = n_buffers;
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static int impl_port_alloc_buffers(struct pw_port *port,
|
||||
struct spa_param **params, uint32_t n_params,
|
||||
struct spa_buffer **buffers, uint32_t *n_buffers)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_port_reuse_buffer(struct pw_port *port, uint32_t buffer_id)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_port_send_command(struct pw_port *port, struct spa_command *command)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static const struct pw_port_implementation impl_port = {
|
||||
PW_VERSION_PORT_IMPLEMENTATION,
|
||||
impl_port_enum_formats,
|
||||
impl_port_set_format,
|
||||
impl_port_get_format,
|
||||
impl_port_get_info,
|
||||
impl_port_enum_params,
|
||||
impl_port_set_param,
|
||||
impl_port_use_buffers,
|
||||
impl_port_alloc_buffers,
|
||||
impl_port_reuse_buffer,
|
||||
impl_port_send_command,
|
||||
.set_io = impl_port_set_io,
|
||||
.enum_formats = impl_port_enum_formats,
|
||||
.set_format = impl_port_set_format,
|
||||
.get_info = impl_port_get_info,
|
||||
.enum_params = impl_port_enum_params,
|
||||
.use_buffers = impl_port_use_buffers,
|
||||
};
|
||||
|
||||
static int impl_node_get_props(struct pw_node *node, struct spa_props **props)
|
||||
static int impl_node_process_input(void *data)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_node_set_props(struct pw_node *node, const struct spa_props *props)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static int impl_node_send_command(struct pw_node *node,
|
||||
const struct spa_command *command)
|
||||
{
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static struct pw_port* impl_node_add_port(struct pw_node *node,
|
||||
enum pw_direction direction,
|
||||
uint32_t port_id)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int impl_node_process_input(struct pw_node *node)
|
||||
{
|
||||
struct data *data = node->user_data;
|
||||
struct pw_port *port = data->port;
|
||||
struct data *d = data;
|
||||
struct spa_buffer *buf;
|
||||
uint8_t *map;
|
||||
void *sdata, *ddata;
|
||||
|
|
@ -401,20 +356,20 @@ static int impl_node_process_input(struct pw_node *node)
|
|||
int i;
|
||||
uint8_t *src, *dst;
|
||||
|
||||
buf = port->buffers[port->io.buffer_id];
|
||||
buf = d->buffers[d->io->buffer_id];
|
||||
|
||||
if (buf->datas[0].type == data->type.data.MemFd ||
|
||||
buf->datas[0].type == data->type.data.DmaBuf) {
|
||||
if (buf->datas[0].type == d->type.data.MemFd ||
|
||||
buf->datas[0].type == d->type.data.DmaBuf) {
|
||||
map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ,
|
||||
MAP_PRIVATE, buf->datas[0].fd, 0);
|
||||
sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t);
|
||||
} else if (buf->datas[0].type == data->type.data.MemPtr) {
|
||||
} else if (buf->datas[0].type == d->type.data.MemPtr) {
|
||||
map = NULL;
|
||||
sdata = buf->datas[0].data;
|
||||
} else
|
||||
return SPA_RESULT_ERROR;
|
||||
|
||||
if (SDL_LockTexture(data->texture, NULL, &ddata, &dstride) < 0) {
|
||||
if (SDL_LockTexture(d->texture, NULL, &ddata, &dstride) < 0) {
|
||||
fprintf(stderr, "Couldn't lock texture: %s\n", SDL_GetError());
|
||||
return SPA_RESULT_ERROR;
|
||||
}
|
||||
|
|
@ -423,40 +378,30 @@ static int impl_node_process_input(struct pw_node *node)
|
|||
|
||||
src = sdata;
|
||||
dst = ddata;
|
||||
for (i = 0; i < data->format.size.height; i++) {
|
||||
for (i = 0; i < d->format.size.height; i++) {
|
||||
memcpy(dst, src, ostride);
|
||||
src += sstride;
|
||||
dst += dstride;
|
||||
}
|
||||
SDL_UnlockTexture(data->texture);
|
||||
SDL_UnlockTexture(d->texture);
|
||||
|
||||
SDL_RenderClear(data->renderer);
|
||||
SDL_RenderCopy(data->renderer, data->texture, NULL, NULL);
|
||||
SDL_RenderPresent(data->renderer);
|
||||
SDL_RenderClear(d->renderer);
|
||||
SDL_RenderCopy(d->renderer, d->texture, NULL, NULL);
|
||||
SDL_RenderPresent(d->renderer);
|
||||
|
||||
if (map)
|
||||
munmap(map, buf->datas[0].maxsize);
|
||||
|
||||
handle_events(data);
|
||||
handle_events(d);
|
||||
|
||||
port->io.status = SPA_RESULT_NEED_BUFFER;
|
||||
d->io->status = SPA_RESULT_NEED_BUFFER;
|
||||
|
||||
return SPA_RESULT_NEED_BUFFER;
|
||||
}
|
||||
|
||||
static int impl_node_process_output(struct pw_node *node)
|
||||
{
|
||||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static const struct pw_node_implementation impl_node = {
|
||||
PW_VERSION_NODE_IMPLEMENTATION,
|
||||
impl_node_get_props,
|
||||
impl_node_set_props,
|
||||
impl_node_send_command,
|
||||
impl_node_add_port,
|
||||
impl_node_process_input,
|
||||
impl_node_process_output,
|
||||
.process_input = impl_node_process_input,
|
||||
};
|
||||
|
||||
static void make_nodes(struct data *data)
|
||||
|
|
@ -465,12 +410,10 @@ static void make_nodes(struct data *data)
|
|||
struct pw_properties *props;
|
||||
|
||||
data->node = pw_node_new(data->core, NULL, NULL, "SDL-sink", NULL, 0);
|
||||
data->node->user_data = data;
|
||||
data->node->implementation = &impl_node;
|
||||
pw_node_set_implementation(data->node, &impl_node, data);
|
||||
|
||||
data->port = pw_port_new(PW_DIRECTION_INPUT, 0, 0);
|
||||
data->port->user_data = data;
|
||||
data->port->implementation = &impl_port;
|
||||
pw_port_set_implementation(data->port, &impl_port, data);
|
||||
pw_port_add(data->port, data->node);
|
||||
pw_node_register(data->node);
|
||||
|
||||
|
|
@ -498,13 +441,14 @@ int main(int argc, char *argv[])
|
|||
data.loop = pw_loop_new();
|
||||
data.running = true;
|
||||
data.core = pw_core_new(data.loop, NULL);
|
||||
data.t = pw_core_get_type(data.core);
|
||||
data.path = argc > 1 ? argv[1] : NULL;
|
||||
|
||||
pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL);
|
||||
|
||||
init_type(&data.type, data.core->type.map);
|
||||
init_type(&data.type, data.t->map);
|
||||
|
||||
spa_debug_set_type_map(data.core->type.map);
|
||||
spa_debug_set_type_map(data.t->map);
|
||||
|
||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||
printf("can't initialize SDL: %s\n", SDL_GetError());
|
||||
|
|
|
|||
|
|
@ -72,13 +72,12 @@ struct data {
|
|||
struct pw_loop *loop;
|
||||
|
||||
struct pw_core *core;
|
||||
struct pw_type *t;
|
||||
struct pw_remote *remote;
|
||||
struct pw_listener on_state_changed;
|
||||
struct pw_callback_info remote_callbacks;
|
||||
|
||||
struct pw_stream *stream;
|
||||
struct pw_listener on_stream_state_changed;
|
||||
struct pw_listener on_stream_format_changed;
|
||||
struct pw_listener on_stream_new_buffer;
|
||||
struct pw_callback_info stream_callbacks;
|
||||
|
||||
struct spa_video_info_raw format;
|
||||
int32_t stride;
|
||||
|
|
@ -100,9 +99,10 @@ static void handle_events(struct data *data)
|
|||
}
|
||||
|
||||
static void
|
||||
on_stream_new_buffer(struct pw_listener *listener, struct pw_stream *stream, uint32_t id)
|
||||
on_stream_new_buffer(void *_data, uint32_t id)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_stream_new_buffer);
|
||||
struct data *data = _data;
|
||||
struct pw_stream *stream = data->stream;
|
||||
struct spa_buffer *buf;
|
||||
uint8_t *map;
|
||||
void *sdata, *ddata;
|
||||
|
|
@ -110,7 +110,7 @@ on_stream_new_buffer(struct pw_listener *listener, struct pw_stream *stream, uin
|
|||
int i;
|
||||
uint8_t *src, *dst;
|
||||
|
||||
buf = pw_stream_peek_buffer(data->stream, id);
|
||||
buf = pw_stream_peek_buffer(stream, id);
|
||||
|
||||
if (buf->datas[0].type == data->type.data.MemFd) {
|
||||
map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ,
|
||||
|
|
@ -145,14 +145,15 @@ on_stream_new_buffer(struct pw_listener *listener, struct pw_stream *stream, uin
|
|||
if (map)
|
||||
munmap(map, buf->datas[0].maxsize);
|
||||
|
||||
pw_stream_recycle_buffer(data->stream, id);
|
||||
pw_stream_recycle_buffer(stream, id);
|
||||
|
||||
handle_events(data);
|
||||
}
|
||||
|
||||
static void on_stream_state_changed(struct pw_listener *listener, struct pw_stream *stream)
|
||||
static void on_stream_state_changed(void *data, enum pw_stream_state old,
|
||||
enum pw_stream_state state, const char *error)
|
||||
{
|
||||
printf("stream state: \"%s\"\n", pw_stream_state_as_string(stream->state));
|
||||
printf("stream state: \"%s\"\n", pw_stream_state_as_string(state));
|
||||
}
|
||||
|
||||
static struct {
|
||||
|
|
@ -230,12 +231,11 @@ static Uint32 id_to_sdl_format(struct data *data, uint32_t id)
|
|||
SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__)
|
||||
|
||||
static void
|
||||
on_stream_format_changed(struct pw_listener *listener,
|
||||
struct pw_stream *stream, struct spa_format *format)
|
||||
on_stream_format_changed(void *_data, struct spa_format *format)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_stream_format_changed);
|
||||
struct pw_remote *remote = stream->remote;
|
||||
struct pw_core *core = remote->core;
|
||||
struct data *data = _data;
|
||||
struct pw_stream *stream = data->stream;
|
||||
struct pw_type *t = data->t;
|
||||
struct spa_pod_builder b = { NULL };
|
||||
struct spa_pod_frame f[2];
|
||||
struct spa_param *params[2];
|
||||
|
|
@ -266,35 +266,43 @@ on_stream_format_changed(struct pw_listener *listener,
|
|||
SDL_UnlockTexture(data->texture);
|
||||
|
||||
spa_pod_builder_init(&b, data->params_buffer, sizeof(data->params_buffer));
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], core->type.param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], t->param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
data->stride * data->format.size.height),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
PROP(&f[1], t->param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
data->stride),
|
||||
PROP_U_MM(&f[1], core->type.param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
PROP_U_MM(&f[1], t->param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
32,
|
||||
2, 32),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
PROP(&f[1], t->param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
16));
|
||||
params[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
core->type.meta.Header),
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], t->param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
t->meta.Header),
|
||||
PROP(&f[1], t->param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
sizeof(struct spa_meta_header)));
|
||||
params[1] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
pw_stream_finish_format(stream, SPA_RESULT_OK, params, 2);
|
||||
}
|
||||
|
||||
static void on_state_changed(struct pw_listener *listener, struct pw_remote *remote)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_state_changed);
|
||||
static const struct pw_stream_callbacks stream_callbacks = {
|
||||
PW_VERSION_STREAM_CALLBACKS,
|
||||
.state_changed = on_stream_state_changed,
|
||||
.format_changed = on_stream_format_changed,
|
||||
.new_buffer = on_stream_new_buffer,
|
||||
};
|
||||
|
||||
switch (remote->state) {
|
||||
static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remote_state state, const char *error)
|
||||
{
|
||||
struct data *data = _data;
|
||||
struct pw_remote *remote = data->remote;
|
||||
|
||||
switch (state) {
|
||||
case PW_REMOTE_STATE_ERROR:
|
||||
printf("remote error: %s\n", remote->error);
|
||||
printf("remote error: %s\n", error);
|
||||
data->running = false;
|
||||
break;
|
||||
|
||||
|
|
@ -307,8 +315,7 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
SDL_RendererInfo info;
|
||||
int i, c;
|
||||
|
||||
printf("remote state: \"%s\"\n",
|
||||
pw_remote_state_as_string(remote->state));
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
|
||||
|
||||
data->stream = pw_stream_new(remote, "video-play", NULL);
|
||||
|
||||
|
|
@ -351,12 +358,10 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
printf("supported formats:\n");
|
||||
spa_debug_format(formats[0]);
|
||||
|
||||
pw_signal_add(&data->stream->state_changed,
|
||||
&data->on_stream_state_changed, on_stream_state_changed);
|
||||
pw_signal_add(&data->stream->format_changed,
|
||||
&data->on_stream_format_changed, on_stream_format_changed);
|
||||
pw_signal_add(&data->stream->new_buffer,
|
||||
&data->on_stream_new_buffer, on_stream_new_buffer);
|
||||
pw_stream_add_callbacks(data->stream,
|
||||
&data->stream_callbacks,
|
||||
&stream_callbacks,
|
||||
data);
|
||||
|
||||
pw_stream_connect(data->stream,
|
||||
PW_DIRECTION_INPUT,
|
||||
|
|
@ -365,11 +370,16 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
break;
|
||||
}
|
||||
default:
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(remote->state));
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static const struct pw_remote_callbacks remote_callbacks = {
|
||||
PW_VERSION_REMOTE_CALLBACKS,
|
||||
.state_changed = on_state_changed,
|
||||
};
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
struct data data = { 0, };
|
||||
|
|
@ -379,12 +389,13 @@ int main(int argc, char *argv[])
|
|||
data.loop = pw_loop_new();
|
||||
data.running = true;
|
||||
data.core = pw_core_new(data.loop, NULL);
|
||||
data.t = pw_core_get_type(data.core);
|
||||
data.remote = pw_remote_new(data.core, NULL);
|
||||
data.path = argc > 1 ? argv[1] : NULL;
|
||||
|
||||
init_type(&data.type, data.core->type.map);
|
||||
init_type(&data.type, data.t->map);
|
||||
|
||||
spa_debug_set_type_map(data.core->type.map);
|
||||
spa_debug_set_type_map(data.t->map);
|
||||
|
||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||
printf("can't initialize SDL: %s\n", SDL_GetError());
|
||||
|
|
@ -397,7 +408,7 @@ int main(int argc, char *argv[])
|
|||
return -1;
|
||||
}
|
||||
|
||||
pw_signal_add(&data.remote->state_changed, &data.on_state_changed, on_state_changed);
|
||||
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
|
||||
|
||||
pw_remote_connect(data.remote);
|
||||
|
||||
|
|
|
|||
|
|
@ -65,12 +65,12 @@ struct data {
|
|||
struct spa_source *timer;
|
||||
|
||||
struct pw_core *core;
|
||||
struct pw_type *t;
|
||||
struct pw_remote *remote;
|
||||
struct pw_listener on_state_changed;
|
||||
struct pw_callback_info remote_callbacks;
|
||||
|
||||
struct pw_stream *stream;
|
||||
struct pw_listener on_stream_state_changed;
|
||||
struct pw_listener on_stream_format_changed;
|
||||
struct pw_callback_info stream_callbacks;
|
||||
|
||||
struct spa_video_info_raw format;
|
||||
int32_t stride;
|
||||
|
|
@ -137,13 +137,14 @@ static void on_timeout(struct spa_loop_utils *utils, struct spa_source *source,
|
|||
pw_stream_send_buffer(data->stream, id);
|
||||
}
|
||||
|
||||
static void on_stream_state_changed(struct pw_listener *listener, struct pw_stream *stream)
|
||||
static void on_stream_state_changed(void *_data, enum pw_stream_state old, enum pw_stream_state state,
|
||||
const char *error)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_stream_state_changed);
|
||||
struct data *data = _data;
|
||||
|
||||
printf("stream state: \"%s\"\n", pw_stream_state_as_string(stream->state));
|
||||
printf("stream state: \"%s\"\n", pw_stream_state_as_string(state));
|
||||
|
||||
switch (stream->state) {
|
||||
switch (state) {
|
||||
case PW_STREAM_STATE_PAUSED:
|
||||
pw_loop_update_timer(data->loop, data->timer, NULL, NULL, false);
|
||||
break;
|
||||
|
|
@ -172,12 +173,11 @@ static void on_stream_state_changed(struct pw_listener *listener, struct pw_stre
|
|||
SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__)
|
||||
|
||||
static void
|
||||
on_stream_format_changed(struct pw_listener *listener,
|
||||
struct pw_stream *stream, struct spa_format *format)
|
||||
on_stream_format_changed(void *_data, struct spa_format *format)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_stream_format_changed);
|
||||
struct pw_remote *remote = stream->remote;
|
||||
struct pw_core *core = remote->core;
|
||||
struct data *data = _data;
|
||||
struct pw_stream *stream = data->stream;
|
||||
struct pw_type *t = data->t;
|
||||
struct spa_pod_builder b = { NULL };
|
||||
struct spa_pod_frame f[2];
|
||||
struct spa_param *params[2];
|
||||
|
|
@ -191,35 +191,42 @@ on_stream_format_changed(struct pw_listener *listener,
|
|||
data->stride = SPA_ROUND_UP_N(data->format.size.width * BPP, 4);
|
||||
|
||||
spa_pod_builder_init(&b, data->params_buffer, sizeof(data->params_buffer));
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], core->type.param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_buffers.Buffers,
|
||||
PROP(&f[1], t->param_alloc_buffers.size, SPA_POD_TYPE_INT,
|
||||
data->stride * data->format.size.height),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
PROP(&f[1], t->param_alloc_buffers.stride, SPA_POD_TYPE_INT,
|
||||
data->stride),
|
||||
PROP_U_MM(&f[1], core->type.param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
PROP_U_MM(&f[1], t->param_alloc_buffers.buffers, SPA_POD_TYPE_INT,
|
||||
32,
|
||||
2, 32),
|
||||
PROP(&f[1], core->type.param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
PROP(&f[1], t->param_alloc_buffers.align, SPA_POD_TYPE_INT,
|
||||
16));
|
||||
params[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
spa_pod_builder_object(&b, &f[0], 0, core->type.param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
core->type.meta.Header),
|
||||
PROP(&f[1], core->type.param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
spa_pod_builder_object(&b, &f[0], 0, t->param_alloc_meta_enable.MetaEnable,
|
||||
PROP(&f[1], t->param_alloc_meta_enable.type, SPA_POD_TYPE_ID,
|
||||
t->meta.Header),
|
||||
PROP(&f[1], t->param_alloc_meta_enable.size, SPA_POD_TYPE_INT,
|
||||
sizeof(struct spa_meta_header)));
|
||||
params[1] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_param);
|
||||
|
||||
pw_stream_finish_format(stream, SPA_RESULT_OK, params, 2);
|
||||
}
|
||||
|
||||
static void on_state_changed(struct pw_listener *listener, struct pw_remote *remote)
|
||||
{
|
||||
struct data *data = SPA_CONTAINER_OF(listener, struct data, on_state_changed);
|
||||
static const struct pw_stream_callbacks stream_callbacks = {
|
||||
PW_VERSION_STREAM_CALLBACKS,
|
||||
.state_changed = on_stream_state_changed,
|
||||
.format_changed = on_stream_format_changed,
|
||||
};
|
||||
|
||||
switch (remote->state) {
|
||||
static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remote_state state, const char *error)
|
||||
{
|
||||
struct data *data = _data;
|
||||
struct pw_remote *remote = data->remote;
|
||||
|
||||
switch (state) {
|
||||
case PW_REMOTE_STATE_ERROR:
|
||||
printf("remote error: %s\n", remote->error);
|
||||
printf("remote error: %s\n", error);
|
||||
data->running = false;
|
||||
break;
|
||||
|
||||
|
|
@ -231,7 +238,7 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
struct spa_pod_frame f[2];
|
||||
|
||||
printf("remote state: \"%s\"\n",
|
||||
pw_remote_state_as_string(remote->state));
|
||||
pw_remote_state_as_string(state));
|
||||
|
||||
data->stream = pw_stream_new(remote, "video-src", NULL);
|
||||
|
||||
|
|
@ -247,10 +254,10 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
25, 1));
|
||||
formats[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_format);
|
||||
|
||||
pw_signal_add(&data->stream->state_changed,
|
||||
&data->on_stream_state_changed, on_stream_state_changed);
|
||||
pw_signal_add(&data->stream->format_changed,
|
||||
&data->on_stream_format_changed, on_stream_format_changed);
|
||||
pw_stream_add_callbacks(data->stream,
|
||||
&data->stream_callbacks,
|
||||
&stream_callbacks,
|
||||
data);
|
||||
|
||||
pw_stream_connect(data->stream,
|
||||
PW_DIRECTION_OUTPUT,
|
||||
|
|
@ -259,11 +266,16 @@ static void on_state_changed(struct pw_listener *listener, struct pw_remote *rem
|
|||
break;
|
||||
}
|
||||
default:
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(remote->state));
|
||||
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static const struct pw_remote_callbacks remote_callbacks = {
|
||||
PW_VERSION_REMOTE_CALLBACKS,
|
||||
.state_changed = on_state_changed,
|
||||
};
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
struct data data = { 0, };
|
||||
|
|
@ -273,13 +285,14 @@ int main(int argc, char *argv[])
|
|||
data.loop = pw_loop_new();
|
||||
data.running = true;
|
||||
data.core = pw_core_new(data.loop, NULL);
|
||||
data.t = pw_core_get_type(data.core);
|
||||
data.remote = pw_remote_new(data.core, NULL);
|
||||
|
||||
init_type(&data.type, data.core->type.map);
|
||||
init_type(&data.type, data.t->map);
|
||||
|
||||
data.timer = pw_loop_add_timer(data.loop, on_timeout, &data);
|
||||
|
||||
pw_signal_add(&data.remote->state_changed, &data.on_state_changed, on_state_changed);
|
||||
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
|
||||
|
||||
pw_remote_connect(data.remote);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue