mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-12-16 08:56:45 -05:00
spa: don't use typedef for struct and enum
This commit is contained in:
Wim Taymans
parent
83964cec87
commit
11f23a3ffa
163 changed files with 6510 additions and 8264 deletions
|
|
@ -38,24 +38,24 @@
|
|||
#include <lib/props.h>
|
||||
#include <lib/mapper.h>
|
||||
|
||||
typedef struct {
|
||||
struct type {
|
||||
uint32_t node;
|
||||
uint32_t props;
|
||||
uint32_t format;
|
||||
uint32_t props_device;
|
||||
uint32_t SDL_Texture;
|
||||
SpaTypeMeta meta;
|
||||
SpaTypeData data;
|
||||
SpaTypeMediaType media_type;
|
||||
SpaTypeMediaSubtype media_subtype;
|
||||
SpaTypeFormatVideo format_video;
|
||||
SpaTypeVideoFormat video_format;
|
||||
SpaTypeEventNode event_node;
|
||||
SpaTypeCommandNode command_node;
|
||||
} Type;
|
||||
struct spa_type_meta meta;
|
||||
struct spa_type_data data;
|
||||
struct spa_type_media_type media_type;
|
||||
struct spa_type_media_subtype media_subtype;
|
||||
struct spa_type_format_video format_video;
|
||||
struct spa_type_video_format video_format;
|
||||
struct spa_type_event_node event_node;
|
||||
struct spa_type_command_node command_node;
|
||||
};
|
||||
|
||||
static inline void
|
||||
init_type (Type *type, SpaTypeMap *map)
|
||||
init_type (struct type *type, struct spa_type_map *map)
|
||||
{
|
||||
type->node = spa_type_map_get_id (map, SPA_TYPE__Node);
|
||||
type->props = spa_type_map_get_id (map, SPA_TYPE__Props);
|
||||
|
|
@ -74,27 +74,27 @@ init_type (Type *type, SpaTypeMap *map)
|
|||
|
||||
#define MAX_BUFFERS 8
|
||||
|
||||
typedef struct {
|
||||
SpaBuffer buffer;
|
||||
SpaMeta metas[2];
|
||||
SpaMetaHeader header;
|
||||
SpaMetaPointer ptr;
|
||||
SpaData datas[1];
|
||||
SpaChunk chunks[1];
|
||||
} SDLBuffer;
|
||||
struct buffer {
|
||||
struct spa_buffer buffer;
|
||||
struct spa_meta metas[2];
|
||||
struct spa_meta_header header;
|
||||
struct spa_meta_pointer ptr;
|
||||
struct spa_data datas[1];
|
||||
struct spa_chunk chunks[1];
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
Type type;
|
||||
struct data {
|
||||
struct type type;
|
||||
|
||||
SpaTypeMap *map;
|
||||
SpaLog *log;
|
||||
SpaLoop data_loop;
|
||||
struct spa_type_map *map;
|
||||
struct spa_log *log;
|
||||
struct spa_loop data_loop;
|
||||
|
||||
SpaSupport support[4];
|
||||
struct spa_support support[4];
|
||||
uint32_t n_support;
|
||||
|
||||
SpaNode *source;
|
||||
SpaPortIO source_output[1];
|
||||
struct spa_node *source;
|
||||
struct spa_port_io source_output[1];
|
||||
|
||||
SDL_Renderer *renderer;
|
||||
SDL_Window *window;
|
||||
|
|
@ -105,25 +105,25 @@ typedef struct {
|
|||
bool running;
|
||||
pthread_t thread;
|
||||
|
||||
SpaSource sources[16];
|
||||
struct spa_source sources[16];
|
||||
unsigned int n_sources;
|
||||
|
||||
bool rebuild_fds;
|
||||
struct pollfd fds[16];
|
||||
unsigned int n_fds;
|
||||
|
||||
SpaBuffer *bp[MAX_BUFFERS];
|
||||
SDLBuffer buffers[MAX_BUFFERS];
|
||||
struct spa_buffer *bp[MAX_BUFFERS];
|
||||
struct buffer buffers[MAX_BUFFERS];
|
||||
unsigned int n_buffers;
|
||||
} AppData;
|
||||
};
|
||||
|
||||
static SpaResult
|
||||
make_node (AppData *data, SpaNode **node, const char *lib, const char *name)
|
||||
static int
|
||||
make_node (struct data *data, struct spa_node **node, const char *lib, const char *name)
|
||||
{
|
||||
SpaHandle *handle;
|
||||
SpaResult res;
|
||||
struct spa_handle *handle;
|
||||
int res;
|
||||
void *hnd;
|
||||
SpaEnumHandleFactoryFunc enum_func;
|
||||
spa_handle_factory_enum_func_t enum_func;
|
||||
unsigned int i;
|
||||
uint32_t state = 0;
|
||||
|
||||
|
|
@ -131,13 +131,13 @@ make_node (AppData *data, SpaNode **node, const char *lib, const char *name)
|
|||
printf ("can't load %s: %s\n", lib, dlerror());
|
||||
return SPA_RESULT_ERROR;
|
||||
}
|
||||
if ((enum_func = dlsym (hnd, "spa_enum_handle_factory")) == NULL) {
|
||||
if ((enum_func = dlsym (hnd, SPA_HANDLE_FACTORY_ENUM_FUNC_NAME)) == NULL) {
|
||||
printf ("can't find enum function\n");
|
||||
return SPA_RESULT_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; ;i++) {
|
||||
const SpaHandleFactory *factory;
|
||||
const struct spa_handle_factory *factory;
|
||||
void *iface;
|
||||
|
||||
if ((res = enum_func (&factory, state)) < 0) {
|
||||
|
|
@ -164,7 +164,7 @@ make_node (AppData *data, SpaNode **node, const char *lib, const char *name)
|
|||
}
|
||||
|
||||
static void
|
||||
handle_events (AppData *data)
|
||||
handle_events (struct data *data)
|
||||
{
|
||||
SDL_Event event;
|
||||
while (SDL_PollEvent (&event)) {
|
||||
|
|
@ -177,9 +177,9 @@ handle_events (AppData *data)
|
|||
}
|
||||
|
||||
static void
|
||||
on_source_event (SpaNode *node, SpaEvent *event, void *user_data)
|
||||
on_source_event (struct spa_node *node, struct spa_event *event, void *user_data)
|
||||
{
|
||||
AppData *data = user_data;
|
||||
struct data *data = user_data;
|
||||
|
||||
handle_events (data);
|
||||
|
||||
|
|
@ -187,18 +187,18 @@ on_source_event (SpaNode *node, SpaEvent *event, void *user_data)
|
|||
}
|
||||
|
||||
static void
|
||||
on_source_have_output (SpaNode *node, void *user_data)
|
||||
on_source_have_output (struct spa_node *node, void *user_data)
|
||||
{
|
||||
AppData *data = user_data;
|
||||
SpaResult res;
|
||||
SpaBuffer *b;
|
||||
struct data *data = user_data;
|
||||
int res;
|
||||
struct spa_buffer *b;
|
||||
void *sdata, *ddata;
|
||||
int sstride, dstride;
|
||||
int i;
|
||||
uint8_t *src, *dst;
|
||||
SpaMeta *metas;
|
||||
SpaData *datas;
|
||||
SpaPortIO *io = &data->source_output[0];
|
||||
struct spa_meta *metas;
|
||||
struct spa_data *datas;
|
||||
struct spa_port_io *io = &data->source_output[0];
|
||||
|
||||
handle_events (data);
|
||||
|
||||
|
|
@ -208,9 +208,9 @@ on_source_have_output (SpaNode *node, void *user_data)
|
|||
datas = b->datas;
|
||||
|
||||
if (metas[1].type == data->type.meta.Pointer &&
|
||||
((SpaMetaPointer *)metas[1].data)->type == data->type.SDL_Texture) {
|
||||
((struct spa_meta_pointer *)metas[1].data)->type == data->type.SDL_Texture) {
|
||||
SDL_Texture *texture;
|
||||
texture = ((SpaMetaPointer *)metas[1].data)->ptr;
|
||||
texture = ((struct spa_meta_pointer *)metas[1].data)->ptr;
|
||||
|
||||
SDL_UnlockTexture(texture);
|
||||
|
||||
|
|
@ -257,18 +257,18 @@ on_source_have_output (SpaNode *node, void *user_data)
|
|||
printf ("got pull error %d\n", res);
|
||||
}
|
||||
|
||||
static const SpaNodeCallbacks source_callbacks = {
|
||||
static const struct spa_node_callbacks source_callbacks = {
|
||||
&on_source_event,
|
||||
NULL,
|
||||
&on_source_have_output,
|
||||
NULL
|
||||
};
|
||||
|
||||
static SpaResult
|
||||
do_add_source (SpaLoop *loop,
|
||||
SpaSource *source)
|
||||
static int
|
||||
do_add_source (struct spa_loop *loop,
|
||||
struct spa_source *source)
|
||||
{
|
||||
AppData *data = SPA_CONTAINER_OF (loop, AppData, data_loop);
|
||||
struct data *data = SPA_CONTAINER_OF (loop, struct data, data_loop);
|
||||
|
||||
data->sources[data->n_sources] = *source;
|
||||
data->n_sources++;
|
||||
|
|
@ -277,20 +277,20 @@ do_add_source (SpaLoop *loop,
|
|||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static SpaResult
|
||||
do_update_source (SpaSource *source)
|
||||
static int
|
||||
do_update_source (struct spa_source *source)
|
||||
{
|
||||
return SPA_RESULT_OK;
|
||||
}
|
||||
|
||||
static void
|
||||
do_remove_source (SpaSource *source)
|
||||
do_remove_source (struct spa_source *source)
|
||||
{
|
||||
}
|
||||
|
||||
static SpaResult
|
||||
do_invoke (SpaLoop *loop,
|
||||
SpaInvokeFunc func,
|
||||
static int
|
||||
do_invoke (struct spa_loop *loop,
|
||||
spa_invoke_func_t func,
|
||||
uint32_t seq,
|
||||
size_t size,
|
||||
void *data,
|
||||
|
|
@ -299,13 +299,13 @@ do_invoke (SpaLoop *loop,
|
|||
return func (loop, false, seq, size, data, user_data);
|
||||
}
|
||||
|
||||
static SpaResult
|
||||
make_nodes (AppData *data, const char *device)
|
||||
static int
|
||||
make_nodes (struct data *data, const char *device)
|
||||
{
|
||||
SpaResult res;
|
||||
SpaProps *props;
|
||||
SpaPODBuilder b = { 0 };
|
||||
SpaPODFrame f[2];
|
||||
int res;
|
||||
struct spa_props *props;
|
||||
struct spa_pod_builder b = { 0 };
|
||||
struct spa_pod_frame f[2];
|
||||
uint8_t buffer[256];
|
||||
|
||||
if ((res = make_node (data, &data->source, "build/spa/plugins/v4l2/libspa-v4l2.so", "v4l2-source")) < 0) {
|
||||
|
|
@ -319,7 +319,7 @@ make_nodes (AppData *data, const char *device)
|
|||
SPA_POD_PROP (&f[1], data->type.props_device, 0,
|
||||
SPA_POD_TYPE_STRING, 1,
|
||||
device ? device : "/dev/video0"));
|
||||
props = SPA_POD_BUILDER_DEREF (&b, f[0].ref, SpaProps);
|
||||
props = SPA_POD_BUILDER_DEREF (&b, f[0].ref, struct spa_props);
|
||||
|
||||
if ((res = spa_node_set_props (data->source, props)) < 0)
|
||||
printf ("got set_props error %d\n", res);
|
||||
|
|
@ -327,13 +327,13 @@ make_nodes (AppData *data, const char *device)
|
|||
return res;
|
||||
}
|
||||
|
||||
static SpaResult
|
||||
alloc_buffers (AppData *data)
|
||||
static int
|
||||
alloc_buffers (struct data *data)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MAX_BUFFERS; i++) {
|
||||
SDLBuffer *b = &data->buffers[i];
|
||||
struct buffer *b = &data->buffers[i];
|
||||
SDL_Texture *texture;
|
||||
void *ptr;
|
||||
int stride;
|
||||
|
|
@ -389,15 +389,15 @@ alloc_buffers (AppData *data)
|
|||
return spa_node_port_use_buffers (data->source, SPA_DIRECTION_OUTPUT, 0, data->bp, data->n_buffers);
|
||||
}
|
||||
|
||||
static SpaResult
|
||||
negotiate_formats (AppData *data)
|
||||
static int
|
||||
negotiate_formats (struct data *data)
|
||||
{
|
||||
SpaResult res;
|
||||
const SpaPortInfo *info;
|
||||
SpaFormat *format;
|
||||
SpaPODFrame f[2];
|
||||
int res;
|
||||
const struct spa_port_info *info;
|
||||
struct spa_format *format;
|
||||
struct spa_pod_frame f[2];
|
||||
uint8_t buffer[256];
|
||||
SpaPODBuilder b = SPA_POD_BUILDER_INIT (buffer, sizeof (buffer));
|
||||
struct spa_pod_builder b = SPA_POD_BUILDER_INIT (buffer, sizeof (buffer));
|
||||
|
||||
data->source_output[0] = SPA_PORT_IO_INIT;
|
||||
|
||||
|
|
@ -422,7 +422,7 @@ negotiate_formats (AppData *data)
|
|||
SPA_POD_PROP (&f[1], data->type.format_video.framerate, 0,
|
||||
SPA_POD_TYPE_FRACTION, 1,
|
||||
25, 1));
|
||||
format = SPA_POD_BUILDER_DEREF (&b, f[0].ref, SpaFormat);
|
||||
format = SPA_POD_BUILDER_DEREF (&b, f[0].ref, struct spa_format);
|
||||
#endif
|
||||
|
||||
if ((res = spa_node_port_set_format (data->source, SPA_DIRECTION_OUTPUT, 0, 0, format)) < 0)
|
||||
|
|
@ -458,7 +458,7 @@ negotiate_formats (AppData *data)
|
|||
static void *
|
||||
loop (void *user_data)
|
||||
{
|
||||
AppData *data = user_data;
|
||||
struct data *data = user_data;
|
||||
|
||||
printf ("enter thread\n");
|
||||
while (data->running) {
|
||||
|
|
@ -467,7 +467,7 @@ loop (void *user_data)
|
|||
/* rebuild */
|
||||
if (data->rebuild_fds) {
|
||||
for (i = 0; i < data->n_sources; i++) {
|
||||
SpaSource *p = &data->sources[i];
|
||||
struct spa_source *p = &data->sources[i];
|
||||
data->fds[i].fd = p->fd;
|
||||
data->fds[i].events = p->mask;
|
||||
}
|
||||
|
|
@ -488,7 +488,7 @@ loop (void *user_data)
|
|||
|
||||
/* after */
|
||||
for (i = 0; i < data->n_sources; i++) {
|
||||
SpaSource *p = &data->sources[i];
|
||||
struct spa_source *p = &data->sources[i];
|
||||
p->rmask = 0;
|
||||
if (data->fds[i].revents & POLLIN)
|
||||
p->rmask |= SPA_IO_IN;
|
||||
|
|
@ -500,7 +500,7 @@ loop (void *user_data)
|
|||
p->rmask |= SPA_IO_ERR;
|
||||
}
|
||||
for (i = 0; i < data->n_sources; i++) {
|
||||
SpaSource *p = &data->sources[i];
|
||||
struct spa_source *p = &data->sources[i];
|
||||
if (p->rmask)
|
||||
p->func (p);
|
||||
}
|
||||
|
|
@ -510,13 +510,13 @@ loop (void *user_data)
|
|||
}
|
||||
|
||||
static void
|
||||
run_async_source (AppData *data)
|
||||
run_async_source (struct data *data)
|
||||
{
|
||||
SpaResult res;
|
||||
int res;
|
||||
int err;
|
||||
|
||||
{
|
||||
SpaCommand cmd = SPA_COMMAND_INIT (data->type.command_node.Start);
|
||||
struct spa_command cmd = SPA_COMMAND_INIT (data->type.command_node.Start);
|
||||
if ((res = spa_node_send_command (data->source, &cmd)) < 0)
|
||||
printf ("got error %d\n", res);
|
||||
}
|
||||
|
|
@ -535,7 +535,7 @@ run_async_source (AppData *data)
|
|||
}
|
||||
|
||||
{
|
||||
SpaCommand cmd = SPA_COMMAND_INIT (data->type.command_node.Pause);
|
||||
struct spa_command cmd = SPA_COMMAND_INIT (data->type.command_node.Pause);
|
||||
if ((res = spa_node_send_command (data->source, &cmd)) < 0)
|
||||
printf ("got error %d\n", res);
|
||||
}
|
||||
|
|
@ -544,8 +544,8 @@ run_async_source (AppData *data)
|
|||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
AppData data = { 0 };
|
||||
SpaResult res;
|
||||
struct data data = { 0 };
|
||||
int res;
|
||||
const char *str;
|
||||
|
||||
data.use_buffer = true;
|
||||
|
|
@ -556,7 +556,7 @@ main (int argc, char *argv[])
|
|||
if ((str = getenv ("SPA_DEBUG")))
|
||||
data.log->level = atoi (str);
|
||||
|
||||
data.data_loop.size = sizeof (SpaLoop);
|
||||
data.data_loop.size = sizeof (struct spa_loop);
|
||||
data.data_loop.add_source = do_add_source;
|
||||
data.data_loop.update_source = do_update_source;
|
||||
data.data_loop.remove_source = do_remove_source;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue