mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: improve debug

Browse source
This commit is contained in:
Wim Taymans 2019-03-13 15:02:04 +01:00
parent c6cb2ea61b
commit 66ea505f22
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ static int spa_alsa_open(struct state *state)
CHECK(snd_output_stdio_attach(&state->output, stderr, 0), "attach failed"); CHECK(snd_output_stdio_attach(&state->output, stderr, 0), "attach failed");
spa_log_info(state->log, "ALSA device open '%s'", props->device); spa_log_info(state->log, "%p: ALSA device open '%s'", state, props->device);
CHECK(snd_pcm_open(&state->hndl, CHECK(snd_pcm_open(&state->hndl,
props->device, props->device,
state->stream, state->stream,
@ -49,7 +49,7 @@ int spa_alsa_close(struct state *state)
if (!state->opened) if (!state->opened)
return 0; return 0;
spa_log_info(state->log, "Device '%s' closing", state->props.device); spa_log_info(state->log, "%p: Device '%s' closing", state, state->props.device);
CHECK(snd_pcm_close(state->hndl), "close failed"); CHECK(snd_pcm_close(state->hndl), "close failed");
close(state->timerfd); close(state->timerfd);
@ -402,12 +402,12 @@ int spa_alsa_set_format(struct state *state, struct spa_audio_info *fmt, uint32_
/* set the sample format */ /* set the sample format */
format = spa_format_to_alsa(info->format); format = spa_format_to_alsa(info->format);
if (format == SND_PCM_FORMAT_UNKNOWN) { if (format == SND_PCM_FORMAT_UNKNOWN) {
spa_log_warn(state->log, "unknown format %u", info->format); spa_log_warn(state->log, "%p: unknown format %u", state, info->format);
return -EINVAL; return -EINVAL;
} }
spa_log_info(state->log, "Stream parameters are %iHz, %s, %i channels", info->rate, snd_pcm_format_name(format), spa_log_info(state->log, "%p: Stream parameters are %iHz, %s, %i channels",
info->channels); state, info->rate, snd_pcm_format_name(format), info->channels);
CHECK(snd_pcm_hw_params_set_format(hndl, params, format), "set_format"); CHECK(snd_pcm_hw_params_set_format(hndl, params, format), "set_format");
/* set the count of channels */ /* set the count of channels */
@ -445,8 +445,9 @@ int spa_alsa_set_format(struct state *state, struct spa_audio_info *fmt, uint32_
state->period_frames = period_size; state->period_frames = period_size;
periods = state->buffer_frames / state->period_frames; periods = state->buffer_frames / state->period_frames;
spa_log_info(state->log, "buffer frames %zd, period frames %zd, periods %u, frame_size %zd", spa_log_info(state->log, "%p: buffer frames %zd, period frames %zd, periods %u, frame_size %zd",
state->buffer_frames, state->period_frames, periods, state->frame_size); state, state->buffer_frames, state->period_frames,
periods, state->frame_size);
/* write the parameters to device */ /* write the parameters to device */
CHECK(snd_pcm_hw_params(hndl, params), "set_hw_params"); CHECK(snd_pcm_hw_params(hndl, params), "set_hw_params");
@ -525,8 +526,8 @@ static int alsa_recover(struct state *state, int err)
xrun = SPA_TIMEVAL_TO_USEC(&diff); xrun = SPA_TIMEVAL_TO_USEC(&diff);
missing = xrun * state->rate / SPA_USEC_PER_SEC; missing = xrun * state->rate / SPA_USEC_PER_SEC;
spa_log_error(state->log, "xrun of %"PRIu64" usec %"PRIu64" %f", spa_log_error(state->log, "%p: xrun of %"PRIu64" usec %"PRIu64" %f",
xrun, missing, state->safety); state, xrun, missing, state->safety);
break; break;
} }
default: default:
@ -778,7 +779,7 @@ push_frames(struct state *state,
snd_pcm_uframes_t total_frames = 0; snd_pcm_uframes_t total_frames = 0;
if (spa_list_is_empty(&state->free)) { if (spa_list_is_empty(&state->free)) {
spa_log_warn(state->log, "no more buffers"); spa_log_warn(state->log, "%p: no more buffers", state);
total_frames = state->threshold; total_frames = state->threshold;
} else { } else {
uint8_t *src; uint8_t *src;