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

spa: make fd in spa_data an int64_t

Browse source 
So that we can store other things in it later as well.
This commit is contained in:
Wim Taymans 2019-02-07 12:22:51 +01:00
parent 569cbb48a9
commit 8a9c1129a2
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/buffer/buffer.h
View file

@ -64,7 +64,7 @@ struct spa_data {
#define SPA_DATA_FLAG_NONE 0 #define SPA_DATA_FLAG_NONE 0
#define SPA_DATA_FLAG_CORRUPTED (1<<0) /**< data is corrupted in some way */ #define SPA_DATA_FLAG_CORRUPTED (1<<0) /**< data is corrupted in some way */
uint32_t flags; /**< data flags */ uint32_t flags; /**< data flags */
int fd; /**< optional fd for data */ int64_t fd; /**< optional fd for data */
uint32_t mapoffset; /**< offset to map fd at */ uint32_t mapoffset; /**< offset to map fd at */
uint32_t maxsize; /**< max size of data */ uint32_t maxsize; /**< max size of data */
void *data; /**< optional data pointer */ void *data; /**< optional data pointer */

2
spa/include/spa/debug/buffer.h
View file

@ -100,7 +100,7 @@ static inline int spa_debug_buffer(int indent, const struct spa_buffer *buffer)
spa_debug_type_find_name(spa_type_data_type, d->type)); spa_debug_type_find_name(spa_type_data_type, d->type));
spa_debug("%*s" " flags: %d", indent, "", d->flags); spa_debug("%*s" " flags: %d", indent, "", d->flags);
spa_debug("%*s" " data: %p", indent, "", d->data); spa_debug("%*s" " data: %p", indent, "", d->data);
spa_debug("%*s" " fd: %d", indent, "", d->fd); spa_debug("%*s" " fd: %" PRIi64, indent, "", d->fd);
spa_debug("%*s" " offset: %d", indent, "", d->mapoffset); spa_debug("%*s" " offset: %d", indent, "", d->mapoffset);
spa_debug("%*s" " maxsize: %u", indent, "", d->maxsize); spa_debug("%*s" " maxsize: %u", indent, "", d->maxsize);
spa_debug("%*s" " chunk: %p", indent, "", d->chunk); spa_debug("%*s" " chunk: %p", indent, "", d->chunk);

4
src/pipewire/stream.c
View file

@ -528,7 +528,7 @@ static int map_data(struct stream *impl, struct spa_data *data, int prot)
return -errno; return -errno;
} }
data->data = SPA_MEMBER(ptr, range.start, void); data->data = SPA_MEMBER(ptr, range.start, void);
pw_log_debug("stream %p: fd %d mapped %d %d %p", impl, data->fd, pw_log_debug("stream %p: fd %"PRIi64" mapped %d %d %p", impl, data->fd,
range.offset, range.size, data->data); range.offset, range.size, data->data);
return 0; return 0;
@ -543,7 +543,7 @@ static int unmap_data(struct stream *impl, struct spa_data *data)
if (munmap(SPA_MEMBER(data->data, -range.start, void), range.size) < 0) if (munmap(SPA_MEMBER(data->data, -range.start, void), range.size) < 0)
pw_log_warn("failed to unmap: %m"); pw_log_warn("failed to unmap: %m");
pw_log_debug("stream %p: fd %d unmapped", impl, data->fd); pw_log_debug("stream %p: fd %"PRIi64" unmapped", impl, data->fd);
return 0; return 0;
} }