From: Timo Wischer <twischer@xxxxxxxxxxxxxx>
when the JACK thread is requesting too many audio frames
Playback:
Without this commit the ALSA audio buffer
will be played with endless repeats as long as the user application
has not provided new audio data.
Therefore this garbage will be played as long as the user application
has not called snd_pcm_stop() after an Xrun.
With this fix the rest of the JACK buffer will be filled
with silence.
Capture:
Without this commit the audio data in the ALSA buffer would be
overwritten.
With this commit the new data from the JACK buffer
will not be copied.
Therefore the existing data in the ALSA buffer
will not be overwritten.
Signed-off-by: Timo Wischer <twischer@xxxxxxxxxxxxxx>
diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c
index c547cbb..18425e9 100644
--- a/jack/pcm_jack.c
+++ b/jack/pcm_jack.c
@@ -54,6 +54,7 @@ typedef struct {
static int snd_pcm_jack_stop(snd_pcm_ioplug_t *io);
+
static int pcm_poll_block_check(snd_pcm_ioplug_t *io)
{
static char buf[32];
@@ -144,7 +145,6 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io)
{
snd_pcm_jack_t *jack = io->private_data;
snd_pcm_uframes_t hw_ptr;
- const snd_pcm_channel_area_t *areas;
snd_pcm_uframes_t xfer = 0;
unsigned int channel;
@@ -154,40 +154,43 @@ snd_pcm_jack_process_cb(jack_nframes_t nframes, snd_pcm_ioplug_t *io)
jack->areas[channel].first = 0;
jack->areas[channel].step = jack->sample_bits;
}
-
- if (io->state != SND_PCM_STATE_RUNNING) {
- if (io->stream == SND_PCM_STREAM_PLAYBACK) {
- for (channel = 0; channel < io->channels; channel++)
- snd_pcm_area_silence(&jack->areas[channel], 0, nframes, io->format);
- return 0;
- }
- }
hw_ptr = jack->hw_ptr;
- areas = snd_pcm_ioplug_mmap_areas(io);
+ if (io->state == SND_PCM_STATE_RUNNING) {
+ const snd_pcm_channel_area_t *areas = snd_pcm_ioplug_mmap_areas(io);
+
+ snd_pcm_uframes_t hw_avail = snd_pcm_ioplug_hw_avail(io, hw_ptr,
+ io->appl_ptr);
- while (xfer < nframes) {
- snd_pcm_uframes_t frames = nframes - xfer;
- snd_pcm_uframes_t offset = hw_ptr % io->buffer_size;
- snd_pcm_uframes_t cont = io->buffer_size - offset;
+ if (hw_avail > 0) {
+ snd_pcm_uframes_t frames = nframes - xfer;
+ snd_pcm_uframes_t offset = hw_ptr % io->buffer_size;
- if (cont < frames)
- frames = cont;
+ if (hw_avail < frames)
+ frames = hw_avail;
- for (channel = 0; channel < io->channels; channel++) {
if (io->stream == SND_PCM_STREAM_PLAYBACK)
- snd_pcm_area_copy(&jack->areas[channel], xfer, &areas[channel], offset, frames, io->format);
+ snd_pcm_areas_copy_wrap(jack->areas, xfer, io->buffer_size, areas, offset, io->buffer_size, io->channels, frames, io->format);
else
- snd_pcm_area_copy(&areas[channel], offset, &jack->areas[channel], xfer, frames, io->format);
+ snd_pcm_areas_copy_wrap(areas, offset, io->buffer_size, jack->areas, xfer, io->buffer_size, io->channels, frames, io->format);
+
+ hw_ptr += frames;
+ if (hw_ptr >= jack->boundary)
+ hw_ptr -= jack->boundary;
+ xfer += frames;
}
-
- hw_ptr += frames;
- if (hw_ptr >= jack->boundary)
- hw_ptr -= jack->boundary;
- xfer += frames;
}
jack->hw_ptr = hw_ptr;
+ /* check if requested frames were copied */
+ if (xfer < nframes) {
+ /* always fill the not yet written JACK buffer with silence */
+ if (io->stream == SND_PCM_STREAM_PLAYBACK) {
+ const snd_pcm_uframes_t frames = nframes - xfer;
+ snd_pcm_areas_silence(jack->areas, io->channels, xfer, frames, io->format);
+ }
+ }
+
pcm_poll_unblock_check(io); /* unblock socket for polling if needed */
return 0;
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
