mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add fd to the data

Browse source 
Add the fd to the SpaData so that we can noth use the fd and the mmapped
memory when we want instead of needing to mmap again in the plugin.
various cleanups
This commit is contained in:
Wim Taymans 2016-10-04 19:37:44 +02:00
parent b8f693ceea
commit 06765a2dea
15 changed files with 158 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/plugins/alsa/alsa-utils.c
View file

@ -310,6 +310,7 @@ mmap_read (SpaALSAState *state)
snd_htimestamp_t htstamp = { 0, 0 };
int64_t now;
uint8_t *dest = NULL;
size_t destsize;
snd_pcm_status_alloca(&status);
@ -327,12 +328,15 @@ mmap_read (SpaALSAState *state)
if (b == NULL) {
fprintf (stderr, "no more buffers\n");
} else {
dest = b->ptr;
dest = SPA_MEMBER (b->outbuf->datas[0].data, b->outbuf->datas[0].offset, void);
destsize = b->outbuf->datas[0].size;
if (b->h) {
b->h->seq = state->sample_count;
b->h->pts = state->last_monotonic;
b->h->dts_offset = 0;
}
avail = SPA_MIN (avail, destsize / state->frame_size);
}
state->sample_count += avail;
@ -439,7 +443,7 @@ spa_alsa_start (SpaALSAState *state)
if (spa_alsa_open (state) < 0)
return -1;
if (!state->have_buffers)
if (state->n_buffers == 0)
return -1;
CHECK (set_swparams (state), "swparams");