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

Don't stop hardware on buffer underruns. Instead continue playing to guarantee that our time function stays as linear as possible.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1566 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-03 23:48:52 +00:00
parent a6c44c0e50
commit 95fab184d5
4 changed files with 92 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/modules/alsa-util.c
View file

@ -289,10 +289,11 @@ int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint32_t *p
pa_assert(periods); pa_assert(periods);
pa_assert(period_size); pa_assert(period_size);
snd_pcm_hw_params_alloca(&hwparams);
buffer_size = *periods * *period_size; buffer_size = *periods * *period_size;
if ((ret = snd_pcm_hw_params_malloc(&hwparams)) < 0 || if ((ret = snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0 ||
(ret = snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0 ||
(ret = snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams, 0)) < 0) (ret = snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams, 0)) < 0)
goto finish; goto finish;
@ -355,12 +356,36 @@ int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint32_t *p
ret = 0; ret = 0;
finish: finish:
if (hwparams)
snd_pcm_hw_params_free(hwparams);
return ret; return ret;
} }
int pa_alsa_set_sw_params(snd_pcm_t *pcm) {
snd_pcm_sw_params_t *swparams;
int err;
pa_assert(pcm);
snd_pcm_sw_params_alloca(&swparams);
if ((err = snd_pcm_sw_params_current(pcm, swparams) < 0)) {
pa_log_warn("Unable to determine current swparams: %s\n", snd_strerror(err));
return err;
}
if ((err = snd_pcm_sw_params_set_stop_threshold(pcm, swparams, (snd_pcm_uframes_t) -1)) < 0) {
pa_log_warn("Unable to set stop threshold: %s\n", snd_strerror(err));
return err;
}
if ((err = snd_pcm_sw_params(pcm, swparams)) < 0) {
pa_log_warn("Unable to set sw params: %s\n", snd_strerror(err));
return err;
}
return 0;
}
int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) { int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev) {
int err; int err;

1
src/modules/alsa-util.h
View file

@ -39,6 +39,7 @@ void pa_alsa_fdlist_free(struct pa_alsa_fdlist *fdl);
int pa_alsa_fdlist_set_mixer(struct pa_alsa_fdlist *fdl, snd_mixer_t *mixer_handle, pa_mainloop_api* m); int pa_alsa_fdlist_set_mixer(struct pa_alsa_fdlist *fdl, snd_mixer_t *mixer_handle, pa_mainloop_api* m);
int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size, int *use_mmap); int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size, int *use_mmap);
int pa_alsa_set_sw_params(snd_pcm_t *pcm);
int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev); int pa_alsa_prepare_mixer(snd_mixer_t *mixer, const char *dev);
snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback); snd_mixer_elem_t *pa_alsa_find_elem(snd_mixer_t *mixer, const char *name, const char *fallback);

42
src/modules/module-alsa-sink.c
View file

@ -545,18 +545,23 @@ static void thread_func(void *userdata) {
goto fail; goto fail;
} else { } else {
ssize_t l; for (;;) {
if ((err = snd_pcm_status(u->pcm_handle, status)) >= 0)
l = snd_pcm_status_get_avail(status) * u->frame_size;
else
l = u->fragment_size;
while (l > 0) {
void *p; void *p;
snd_pcm_sframes_t t; snd_pcm_sframes_t t;
ssize_t l;
pa_assert(l > 0); if ((err = snd_pcm_status(u->pcm_handle, status)) < 0) {
pa_log("Failed to query DSP status data: %s", snd_strerror(t));
goto fail;
}
if (snd_pcm_status_get_avail_max(status)*u->frame_size >= u->hwbuf_size)
pa_log_debug("Buffer underrun!");
l = snd_pcm_status_get_avail(status) * u->frame_size;
if (l <= 0)
break;
if (u->memchunk.length <= 0) if (u->memchunk.length <= 0)
pa_sink_render(u->sink, l, &u->memchunk); pa_sink_render(u->sink, l, &u->memchunk);
@ -573,10 +578,7 @@ static void thread_func(void *userdata) {
if (t < 0) { if (t < 0) {
if (t == -EPIPE) { pa_assert(t != -EPIPE);
pa_log_debug("Buffer underrun!");
u->first = 1;
}
if ((t = snd_pcm_recover(u->pcm_handle, t, 1)) == 0) if ((t = snd_pcm_recover(u->pcm_handle, t, 1)) == 0)
continue; continue;
@ -588,8 +590,7 @@ static void thread_func(void *userdata) {
pa_log("Failed to write data to DSP: %s", snd_strerror(t)); pa_log("Failed to write data to DSP: %s", snd_strerror(t));
goto fail; goto fail;
} }
}
} else {
u->memchunk.index += t * u->frame_size; u->memchunk.index += t * u->frame_size;
u->memchunk.length -= t * u->frame_size; u->memchunk.length -= t * u->frame_size;
@ -599,10 +600,10 @@ static void thread_func(void *userdata) {
pa_memchunk_reset(&u->memchunk); pa_memchunk_reset(&u->memchunk);
} }
l -= t * u->frame_size;
work_done = 1; work_done = 1;
}
if (t * u->frame_size >= (unsigned) l)
break;
} }
} }
@ -756,6 +757,11 @@ int pa__init(pa_core *c, pa_module*m) {
if (u->use_mmap) if (u->use_mmap)
pa_log_info("Successfully enabled mmap() mode."); pa_log_info("Successfully enabled mmap() mode.");
if ((err = pa_alsa_set_sw_params(u->pcm_handle)) < 0) {
pa_log("Failed to set software parameters: %s", snd_strerror(err));
goto fail;
}
/* ALSA might tweak the sample spec, so recalculate the frame size */ /* ALSA might tweak the sample spec, so recalculate the frame size */
frame_size = pa_frame_size(&ss); frame_size = pa_frame_size(&ss);

38
src/modules/module-alsa-source.c
View file

@ -533,18 +533,24 @@ static void thread_func(void *userdata) {
goto fail; goto fail;
} else { } else {
ssize_t l;
if ((err = snd_pcm_status(u->pcm_handle, status)) >= 0) for (;;) {
l = snd_pcm_status_get_avail(status) * u->frame_size;
else
l = u->fragment_size;
while (l > 0) {
void *p; void *p;
snd_pcm_sframes_t t; snd_pcm_sframes_t t;
ssize_t l;
pa_assert(l > 0); if ((err = snd_pcm_status(u->pcm_handle, status)) < 0) {
pa_log("Failed to query DSP status data: %s", snd_strerror(t));
goto fail;
}
if (snd_pcm_status_get_avail_max(status)*u->frame_size >= u->hwbuf_size)
pa_log_debug("Buffer overrun!");
l = snd_pcm_status_get_avail(status) * u->frame_size;
if (l <= 0)
break;
chunk.memblock = pa_memblock_new(u->core->mempool, l); chunk.memblock = pa_memblock_new(u->core->mempool, l);
@ -559,8 +565,7 @@ static void thread_func(void *userdata) {
if (t < 0) { if (t < 0) {
pa_memblock_unref(chunk.memblock); pa_memblock_unref(chunk.memblock);
if (t == -EPIPE) pa_assert(t != -EPIPE);
pa_log_debug("Buffer underrun!");
if ((t = snd_pcm_recover(u->pcm_handle, t, 1)) == 0) if ((t = snd_pcm_recover(u->pcm_handle, t, 1)) == 0)
continue; continue;
@ -573,7 +578,7 @@ static void thread_func(void *userdata) {
goto fail; goto fail;
} }
} else { }
chunk.index = 0; chunk.index = 0;
chunk.length = t * u->frame_size; chunk.length = t * u->frame_size;
@ -581,10 +586,10 @@ static void thread_func(void *userdata) {
pa_source_post(u->source, &chunk); pa_source_post(u->source, &chunk);
pa_memblock_unref(chunk.memblock); pa_memblock_unref(chunk.memblock);
l -= t * u->frame_size;
work_done = 1; work_done = 1;
}
if (t * u->frame_size >= (unsigned) l)
break;
} }
} }
@ -731,6 +736,11 @@ int pa__init(pa_core *c, pa_module*m) {
if (u->use_mmap) if (u->use_mmap)
pa_log_info("Successfully enabled mmap() mode."); pa_log_info("Successfully enabled mmap() mode.");
if ((err = pa_alsa_set_sw_params(u->pcm_handle)) < 0) {
pa_log("Failed to set software parameters: %s", snd_strerror(err));
goto fail;
}
/* ALSA might tweak the sample spec, so recalculate the frame size */ /* ALSA might tweak the sample spec, so recalculate the frame size */
frame_size = pa_frame_size(&ss); frame_size = pa_frame_size(&ss);