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

alsa: set offset to 0 for playback streams

Browse source
This commit is contained in:
Wim Taymans 2020-12-18 15:32:27 +01:00
parent 5ea1fd3e7d
commit 55c5e48578
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pipewire-alsa/alsa-plugins/pcm_pipewire.c
View file

@ -201,22 +201,26 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct pw_buffer *b, snd_pcm_uf
} }
if (pw->blocks == 1) { if (pw->blocks == 1) {
if (io->stream == SND_PCM_STREAM_PLAYBACK) {
d[0].chunk->size = nframes * pw->stride;
d[0].chunk->offset = 0;
}
ptr = SPA_MEMBER(d[0].data, d[0].chunk->offset, void); ptr = SPA_MEMBER(d[0].data, d[0].chunk->offset, void);
for (channel = 0; channel < io->channels; channel++) { for (channel = 0; channel < io->channels; channel++) {
pwareas[channel].addr = ptr; pwareas[channel].addr = ptr;
pwareas[channel].first = channel * pw->sample_bits; pwareas[channel].first = channel * pw->sample_bits;
pwareas[channel].step = io->channels * pw->sample_bits; pwareas[channel].step = io->channels * pw->sample_bits;
} }
if (io->stream == SND_PCM_STREAM_PLAYBACK)
d[0].chunk->size = nframes * pw->stride;
} else { } else {
for (channel = 0; channel < io->channels; channel++) { for (channel = 0; channel < io->channels; channel++) {
if (io->stream == SND_PCM_STREAM_PLAYBACK) {
d[channel].chunk->size = nframes * pw->stride;
d[channel].chunk->offset = 0;
}
ptr = SPA_MEMBER(d[channel].data, d[channel].chunk->offset, void); ptr = SPA_MEMBER(d[channel].data, d[channel].chunk->offset, void);
pwareas[channel].addr = ptr; pwareas[channel].addr = ptr;
pwareas[channel].first = 0; pwareas[channel].first = 0;
pwareas[channel].step = pw->sample_bits; pwareas[channel].step = pw->sample_bits;
if (io->stream == SND_PCM_STREAM_PLAYBACK)
d[channel].chunk->size = nframes * pw->stride;
} }
} }
@ -230,16 +234,16 @@ snd_pcm_pipewire_process(snd_pcm_pipewire_t *pw, struct pw_buffer *b, snd_pcm_uf
if (io->stream == SND_PCM_STREAM_PLAYBACK) if (io->stream == SND_PCM_STREAM_PLAYBACK)
snd_pcm_areas_copy_wrap(pwareas, 0, nframes, snd_pcm_areas_copy_wrap(pwareas, 0, nframes,
areas, offset, areas, offset,
io->buffer_size, io->buffer_size,
io->channels, xfer, io->channels, xfer,
io->format); io->format);
else else
snd_pcm_areas_copy_wrap(areas, offset, snd_pcm_areas_copy_wrap(areas, offset,
io->buffer_size, io->buffer_size,
pwareas, 0, nframes, pwareas, 0, nframes,
io->channels, xfer, io->channels, xfer,
io->format); io->format);
hw_ptr += xfer; hw_ptr += xfer;
if (hw_ptr > pw->boundary) if (hw_ptr > pw->boundary)