mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-18 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa/buffer: rename SPA_MEMBER to SPA_PTROFF

Browse source 
SPA_MEMBER is misleading, all we're doing here is pointer+offset and a
type-casting the result. Rename to SPA_PTROFF which is more expressive (and
has the same number of characters so we don't need to re-indent).
This commit is contained in:
Peter Hutterer 2021-05-06 13:41:44 +10:00 • committed by Wim Taymans
parent e598d0a422
commit 2405f0942b
92 changed files with 248 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -375,7 +375,7 @@ static int do_render(struct spa_loop *loop, bool async, uint32_t seq,
buf->datas[0].type == SPA_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);
sdata = SPA_PTROFF(map, buf->datas[0].mapoffset, uint8_t);
} else if (buf->datas[0].type == SPA_DATA_MemPtr) {
map = NULL;
sdata = buf->datas[0].data;

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

@ -330,7 +330,7 @@ static int impl_port_use_buffers(void *object,
return -errno;
}
b->ptr = SPA_MEMBER(b->ptr, datas[0].mapoffset, void);
b->ptr = SPA_PTROFF(b->ptr, datas[0].mapoffset, void);
b->mapped = true;
}
else {
@ -435,9 +435,9 @@ static int impl_node_process(void *object)
avail = maxsize - offset;
if (d->format.format == SPA_AUDIO_FORMAT_S16)
fill_s16(d, SPA_MEMBER(b->ptr, offset, void), avail);
fill_s16(d, SPA_PTROFF(b->ptr, offset, void), avail);
else if (d->format.format == SPA_AUDIO_FORMAT_F32)
fill_f32(d, SPA_MEMBER(b->ptr, offset, void), avail);
fill_f32(d, SPA_PTROFF(b->ptr, offset, void), avail);
od[0].chunk->offset = 0;
od[0].chunk->size = avail;

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

@ -271,7 +271,7 @@ static int do_render(struct spa_loop *loop, bool async, uint32_t seq,
buf->datas[0].type == SPA_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);
sdata = SPA_PTROFF(map, buf->datas[0].mapoffset, uint8_t);
} else if (buf->datas[0].type == SPA_DATA_MemPtr) {
map = NULL;
sdata = buf->datas[0].data;

4
src/examples/media-session/alsa-midi.c
View file

@ -104,10 +104,10 @@ static void on_notify_events(void *data, int fd, uint32_t mask)
if (len <= 0)
break;
e = SPA_MEMBER(&buf, len, void);
e = SPA_PTROFF(&buf, len, void);
for (p = &buf; p < e;
p = SPA_MEMBER(p, sizeof(struct inotify_event) + event->len, void)) {
p = SPA_PTROFF(p, sizeof(struct inotify_event) + event->len, void)) {
event = (const struct inotify_event *) p;
if ((event->mask & IN_ATTRIB)) {

6
src/examples/media-session/media-session.c
View file

@ -271,7 +271,7 @@ void *sm_object_add_data(struct sm_object *obj, const char *id, size_t size)
spa_list_append(&obj->data, &d->link);
done:
return SPA_MEMBER(d, sizeof(struct data), void);
return SPA_PTROFF(d, sizeof(struct data), void);
}
void *sm_object_get_data(struct sm_object *obj, const char *id)
@ -280,7 +280,7 @@ void *sm_object_get_data(struct sm_object *obj, const char *id)
d = object_find_data(obj, id);
if (d == NULL)
return NULL;
return SPA_MEMBER(d, sizeof(struct data), void);
return SPA_PTROFF(d, sizeof(struct data), void);
}
int sm_object_remove_data(struct sm_object *obj, const char *id)
@ -390,7 +390,7 @@ static struct param *add_param(struct spa_list *param_list,
return NULL;
p->this.id = id;
p->this.param = SPA_MEMBER(p, sizeof(struct param), struct spa_pod);
p->this.param = SPA_PTROFF(p, sizeof(struct param), struct spa_pod);
memcpy(p->this.param, param, SPA_POD_SIZE(param));
spa_list_append(param_list, &p->this.link);

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

@ -146,7 +146,7 @@ on_process(void *_data)
data->cursor_rect.x = mcs->position.x;
data->cursor_rect.y = mcs->position.y;
mb = SPA_MEMBER(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
mb = SPA_PTROFF(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
data->cursor_rect.w = mb->size.width;
data->cursor_rect.h = mb->size.height;
@ -165,7 +165,7 @@ on_process(void *_data)
}
/* copy the cursor bitmap into the texture */
src = SPA_MEMBER(mb, mb->offset, uint8_t);
src = SPA_PTROFF(mb, mb->offset, uint8_t);
dst = cdata;
ostride = SPA_MIN(cstride, mb->stride);
@ -186,9 +186,9 @@ on_process(void *_data)
NULL,
sdata,
sstride,
SPA_MEMBER(sdata, sstride * data->size.height, void),
SPA_PTROFF(sdata, sstride * data->size.height, void),
sstride / 2,
SPA_MEMBER(sdata, 5 * (sstride * data->size.height) / 4, void),
SPA_PTROFF(sdata, 5 * (sstride * data->size.height) / 4, void),
sstride / 2);
}
else {

4
src/examples/video-src-alloc.c
View file

@ -145,14 +145,14 @@ static void on_timeout(void *userdata, uint64_t expirations)
mcs->hotspot.y = 0;
mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
mb = SPA_MEMBER(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
mb = SPA_PTROFF(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
mb->format = SPA_VIDEO_FORMAT_ARGB;
mb->size.width = CURSOR_WIDTH;
mb->size.height = CURSOR_HEIGHT;
mb->stride = CURSOR_WIDTH * CURSOR_BPP;
mb->offset = sizeof(struct spa_meta_bitmap);
bitmap = SPA_MEMBER(mb, mb->offset, uint32_t);
bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
color = (cos(data->accumulator) + 1.0) * (1 << 23);
color |= 0xff000000;

4
src/examples/video-src-reneg.c
View file

@ -147,14 +147,14 @@ static void on_timeout(void *userdata, uint64_t expirations)
mcs->hotspot.y = 0;
mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
mb = SPA_MEMBER(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
mb = SPA_PTROFF(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
mb->format = SPA_VIDEO_FORMAT_ARGB;
mb->size.width = CURSOR_WIDTH;
mb->size.height = CURSOR_HEIGHT;
mb->stride = CURSOR_WIDTH * CURSOR_BPP;
mb->offset = sizeof(struct spa_meta_bitmap);
bitmap = SPA_MEMBER(mb, mb->offset, uint32_t);
bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
color = (cos(data->accumulator) + 1.0) * (1 << 23);
color |= 0xff000000;

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

@ -143,14 +143,14 @@ static void on_timeout(void *userdata, uint64_t expirations)
mcs->hotspot.y = 0;
mcs->bitmap_offset = sizeof(struct spa_meta_cursor);
mb = SPA_MEMBER(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
mb = SPA_PTROFF(mcs, mcs->bitmap_offset, struct spa_meta_bitmap);
mb->format = SPA_VIDEO_FORMAT_ARGB;
mb->size.width = CURSOR_WIDTH;
mb->size.height = CURSOR_HEIGHT;
mb->stride = CURSOR_WIDTH * CURSOR_BPP;
mb->offset = sizeof(struct spa_meta_bitmap);
bitmap = SPA_MEMBER(mb, mb->offset, uint32_t);
bitmap = SPA_PTROFF(mb, mb->offset, uint32_t);
color = (cos(data->accumulator) + 1.0) * (1 << 23);
color |= 0xff000000;