mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

examples: remove some unused types

Browse source
This commit is contained in:
Wim Taymans 2018-02-09 12:03:28 +01:00
parent c0f8f811e8
commit 60177646e9
5 changed files with 22 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/examples/export-sink.c
View file

@ -37,12 +37,8 @@
#define M_PI_M2 ( M_PI + M_PI ) #define M_PI_M2 ( M_PI + M_PI )
struct type { struct type {
uint32_t format;
uint32_t props;
uint32_t prop_param; uint32_t prop_param;
uint32_t io_prop_param; uint32_t io_prop_param;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type; struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype; struct spa_type_media_subtype media_subtype;
struct spa_type_format_video format_video; struct spa_type_format_video format_video;
@ -51,12 +47,8 @@ struct type {
static inline void init_type(struct type *type, struct spa_type_map *map) static inline void init_type(struct type *type, struct spa_type_map *map)
{ {
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->prop_param = spa_type_map_get_id(map, SPA_TYPE_PROPS__contrast); type->prop_param = spa_type_map_get_id(map, SPA_TYPE_PROPS__contrast);
type->io_prop_param = spa_type_map_get_id(map, SPA_TYPE_IO_PROP_BASE "contrast"); type->io_prop_param = spa_type_map_get_id(map, SPA_TYPE_IO_PROP_BASE "contrast");
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type); spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype); spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_video_map(map, &type->format_video); spa_type_format_video_map(map, &type->format_video);
@ -295,7 +287,7 @@ static int port_enum_formats(struct spa_node *node,
SDL_GetRendererInfo(d->renderer, &info); SDL_GetRendererInfo(d->renderer, &info);
spa_pod_builder_push_object(builder, spa_pod_builder_push_object(builder,
d->t->param.idEnumFormat, d->type.format); d->t->param.idEnumFormat, d->t->spa_format);
spa_pod_builder_id(builder, d->type.media_type.video); spa_pod_builder_id(builder, d->type.media_type.video);
spa_pod_builder_id(builder, d->type.media_subtype.raw); spa_pod_builder_id(builder, d->type.media_subtype.raw);
@ -347,7 +339,7 @@ static int port_get_format(struct spa_node *node,
return 0; return 0;
*result = spa_pod_builder_object(builder, *result = spa_pod_builder_object(builder,
d->t->param.idFormat, d->type.format, d->t->param.idFormat, d->t->spa_format,
"I", d->type.media_type.video, "I", d->type.media_type.video,
"I", d->type.media_subtype.raw, "I", d->type.media_subtype.raw,
":", d->type.format_video.format, "I", d->format.format, ":", d->type.format_video.format, "I", d->format.format,
@ -514,12 +506,12 @@ static int do_render(struct spa_loop *loop, bool async, uint32_t seq,
buf = d->buffers[d->io->buffer_id]; buf = d->buffers[d->io->buffer_id];
if (buf->datas[0].type == d->type.data.MemFd || if (buf->datas[0].type == d->t->data.MemFd ||
buf->datas[0].type == d->type.data.DmaBuf) { buf->datas[0].type == d->t->data.DmaBuf) {
map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ, map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ,
MAP_PRIVATE, buf->datas[0].fd, 0); MAP_PRIVATE, buf->datas[0].fd, 0);
sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t); sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t);
} else if (buf->datas[0].type == d->type.data.MemPtr) { } else if (buf->datas[0].type == d->t->data.MemPtr) {
map = NULL; map = NULL;
sdata = buf->datas[0].data; sdata = buf->datas[0].data;
} else } else

16
src/examples/export-source.c
View file

@ -34,12 +34,8 @@
#define M_PI_M2 ( M_PI + M_PI ) #define M_PI_M2 ( M_PI + M_PI )
struct type { struct type {
uint32_t format;
uint32_t props;
uint32_t prop_volume; uint32_t prop_volume;
uint32_t io_prop_volume; uint32_t io_prop_volume;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type; struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype; struct spa_type_media_subtype media_subtype;
struct spa_type_format_audio format_audio; struct spa_type_format_audio format_audio;
@ -48,12 +44,8 @@ struct type {
static inline void init_type(struct type *type, struct spa_type_map *map) static inline void init_type(struct type *type, struct spa_type_map *map)
{ {
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
type->prop_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume); type->prop_volume = spa_type_map_get_id(map, SPA_TYPE_PROPS__volume);
type->io_prop_volume = spa_type_map_get_id(map, SPA_TYPE_IO_PROP_BASE "volume"); type->io_prop_volume = spa_type_map_get_id(map, SPA_TYPE_IO_PROP_BASE "volume");
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type); spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype); spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_audio_map(map, &type->format_audio); spa_type_format_audio_map(map, &type->format_audio);
@ -206,7 +198,7 @@ static int port_enum_formats(struct spa_node *node,
return 0; return 0;
*param = spa_pod_builder_object(builder, *param = spa_pod_builder_object(builder,
d->t->param.idEnumFormat, d->type.format, d->t->param.idEnumFormat, d->t->spa_format,
"I", d->type.media_type.audio, "I", d->type.media_type.audio,
"I", d->type.media_subtype.raw, "I", d->type.media_subtype.raw,
":", d->type.format_audio.format, "I", d->type.audio_format.S16, ":", d->type.format_audio.format, "I", d->type.audio_format.S16,
@ -234,7 +226,7 @@ static int port_get_format(struct spa_node *node,
return 0; return 0;
*param = spa_pod_builder_object(builder, *param = spa_pod_builder_object(builder,
d->t->param.idFormat, d->type.format, d->t->param.idFormat, d->t->spa_format,
"I", d->type.media_type.audio, "I", d->type.media_type.audio,
"I", d->type.media_subtype.raw, "I", d->type.media_subtype.raw,
":", d->type.format_audio.format, "I", d->format.format, ":", d->type.format_audio.format, "I", d->format.format,
@ -390,8 +382,8 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc
b->ptr = datas[0].data; b->ptr = datas[0].data;
b->mapped = false; b->mapped = false;
} }
else if (datas[0].type == d->type.data.MemFd || else if (datas[0].type == d->t->data.MemFd ||
datas[0].type == d->type.data.DmaBuf) { datas[0].type == d->t->data.DmaBuf) {
b->ptr = mmap(NULL, datas[0].maxsize + datas[0].mapoffset, PROT_WRITE, b->ptr = mmap(NULL, datas[0].maxsize + datas[0].mapoffset, PROT_WRITE,
MAP_SHARED, datas[0].fd, 0); MAP_SHARED, datas[0].fd, 0);
if (b->ptr == MAP_FAILED) { if (b->ptr == MAP_FAILED) {

16
src/examples/local-v4l2.c
View file

@ -34,10 +34,6 @@
#include <pipewire/factory.h> #include <pipewire/factory.h>
struct type { struct type {
uint32_t format;
uint32_t props;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type; struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype; struct spa_type_media_subtype media_subtype;
struct spa_type_format_video format_video; struct spa_type_format_video format_video;
@ -46,10 +42,6 @@ struct type {
static inline void init_type(struct type *type, struct spa_type_map *map) static inline void init_type(struct type *type, struct spa_type_map *map)
{ {
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type); spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype); spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_video_map(map, &type->format_video); spa_type_format_video_map(map, &type->format_video);
@ -254,7 +246,7 @@ static int port_enum_formats(struct spa_node *node,
SDL_GetRendererInfo(d->renderer, &info); SDL_GetRendererInfo(d->renderer, &info);
spa_pod_builder_push_object(builder, spa_pod_builder_push_object(builder,
d->t->param.idEnumFormat, d->type.format); d->t->param.idEnumFormat, d->t->spa_format);
spa_pod_builder_id(builder, d->type.media_type.video); spa_pod_builder_id(builder, d->type.media_type.video);
spa_pod_builder_id(builder, d->type.media_subtype.raw); spa_pod_builder_id(builder, d->type.media_subtype.raw);
@ -403,12 +395,12 @@ static int do_render(struct spa_loop *loop, bool async, uint32_t seq,
buf = d->buffers[d->io->buffer_id]; buf = d->buffers[d->io->buffer_id];
if (buf->datas[0].type == d->type.data.MemFd || if (buf->datas[0].type == d->t->data.MemFd ||
buf->datas[0].type == d->type.data.DmaBuf) { buf->datas[0].type == d->t->data.DmaBuf) {
map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ, map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ,
MAP_PRIVATE, buf->datas[0].fd, 0); MAP_PRIVATE, buf->datas[0].fd, 0);
sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t); sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t);
} else if (buf->datas[0].type == d->type.data.MemPtr) { } else if (buf->datas[0].type == d->t->data.MemPtr) {
map = NULL; map = NULL;
sdata = buf->datas[0].data; sdata = buf->datas[0].data;
} else } else

18
src/examples/video-play.c
View file

@ -32,11 +32,6 @@
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
struct type { struct type {
uint32_t format;
uint32_t props;
struct spa_type_param param;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type; struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype; struct spa_type_media_subtype media_subtype;
struct spa_type_format_video format_video; struct spa_type_format_video format_video;
@ -45,11 +40,6 @@ struct type {
static inline void init_type(struct type *type, struct spa_type_map *map) static inline void init_type(struct type *type, struct spa_type_map *map)
{ {
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
spa_type_param_map(map, &type->param);
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type); spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype); spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_video_map(map, &type->format_video); spa_type_format_video_map(map, &type->format_video);
@ -111,12 +101,12 @@ do_render(struct spa_loop *loop, bool async, uint32_t seq,
handle_events(data); handle_events(data);
if (buf->datas[0].type == data->type.data.MemFd || if (buf->datas[0].type == data->t->data.MemFd ||
buf->datas[0].type == data->type.data.DmaBuf) { buf->datas[0].type == data->t->data.DmaBuf) {
map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ, map = mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, PROT_READ,
MAP_PRIVATE, buf->datas[0].fd, 0); MAP_PRIVATE, buf->datas[0].fd, 0);
sdata = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t); 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 == data->t->data.MemPtr) {
map = NULL; map = NULL;
sdata = buf->datas[0].data; sdata = buf->datas[0].data;
} else } else
@ -331,7 +321,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
SDL_GetRendererInfo(data->renderer, &info); SDL_GetRendererInfo(data->renderer, &info);
spa_pod_builder_push_object(&b, spa_pod_builder_push_object(&b,
data->type.param.idEnumFormat, data->type.format); data->t->param.idEnumFormat, data->t->spa_format);
spa_pod_builder_id(&b, data->type.media_type.video); spa_pod_builder_id(&b, data->type.media_type.video);
spa_pod_builder_id(&b, data->type.media_subtype.raw); spa_pod_builder_id(&b, data->type.media_subtype.raw);

19
src/examples/video-src.c
View file

@ -31,11 +31,6 @@
#include <pipewire/pipewire.h> #include <pipewire/pipewire.h>
struct type { struct type {
uint32_t format;
uint32_t props;
struct spa_type_param param;
struct spa_type_meta meta;
struct spa_type_data data;
struct spa_type_media_type media_type; struct spa_type_media_type media_type;
struct spa_type_media_subtype media_subtype; struct spa_type_media_subtype media_subtype;
struct spa_type_format_video format_video; struct spa_type_format_video format_video;
@ -44,11 +39,6 @@ struct type {
static inline void init_type(struct type *type, struct spa_type_map *map) static inline void init_type(struct type *type, struct spa_type_map *map)
{ {
type->format = spa_type_map_get_id(map, SPA_TYPE__Format);
type->props = spa_type_map_get_id(map, SPA_TYPE__Props);
spa_type_param_map(map, &type->param);
spa_type_meta_map(map, &type->meta);
spa_type_data_map(map, &type->data);
spa_type_media_type_map(map, &type->media_type); spa_type_media_type_map(map, &type->media_type);
spa_type_media_subtype_map(map, &type->media_subtype); spa_type_media_subtype_map(map, &type->media_subtype);
spa_type_format_video_map(map, &type->format_video); spa_type_format_video_map(map, &type->format_video);
@ -93,7 +83,8 @@ static void on_timeout(void *userdata, uint64_t expirations)
buf = pw_stream_peek_buffer(data->stream, id); buf = pw_stream_peek_buffer(data->stream, id);
if (buf->datas[0].type == data->type.data.MemFd) { if (buf->datas[0].type == data->t->data.MemFd ||
buf->datas[0].type == data->t->data.DmaBuf) {
map = map =
mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset, mmap(NULL, buf->datas[0].maxsize + buf->datas[0].mapoffset,
PROT_READ | PROT_WRITE, MAP_SHARED, buf->datas[0].fd, 0); PROT_READ | PROT_WRITE, MAP_SHARED, buf->datas[0].fd, 0);
@ -102,13 +93,13 @@ static void on_timeout(void *userdata, uint64_t expirations)
return; return;
} }
p = SPA_MEMBER(map, buf->datas[0].mapoffset, uint8_t); p = 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 == data->t->data.MemPtr) {
map = NULL; map = NULL;
p = buf->datas[0].data; p = buf->datas[0].data;
} else } else
return; return;
if ((h = spa_buffer_find_meta(buf, data->type.meta.Header))) { if ((h = spa_buffer_find_meta(buf, data->t->meta.Header))) {
#if 0 #if 0
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
@ -229,7 +220,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
data->stream = pw_stream_new(remote, "video-src", NULL); data->stream = pw_stream_new(remote, "video-src", NULL);
params[0] = spa_pod_builder_object(&b, params[0] = spa_pod_builder_object(&b,
data->type.param.idEnumFormat, data->type.format, data->t->param.idEnumFormat, data->t->spa_format,
"I", data->type.media_type.video, "I", data->type.media_type.video,
"I", data->type.media_subtype.raw, "I", data->type.media_subtype.raw,
":", data->type.format_video.format, "I", data->type.video_format.RGB, ":", data->type.format_video.format, "I", data->type.video_format.RGB,