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

alsa: update the clock name when we can

Browse source 
Update the clock name as soon as we get a io_clock. This way we can use
it to compare the clock name against the driver right away.
This commit is contained in:
Wim Taymans 2023-09-14 17:15:06 +02:00
parent 354ee6fd96
commit 4ffa7860bc
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/alsa/alsa-pcm-sink.c
View file

@ -252,9 +252,13 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
switch (id) { switch (id) {
case SPA_IO_Clock: case SPA_IO_Clock:
if (size > 0 && size < sizeof(struct spa_io_clock))
return -EINVAL;
this->clock = data; this->clock = data;
break; break;
case SPA_IO_Position: case SPA_IO_Position:
if (size > 0 && size < sizeof(struct spa_io_position))
return -EINVAL;
this->position = data; this->position = data;
break; break;
default: default:

2
spa/plugins/alsa/alsa-pcm-source.c
View file

@ -235,6 +235,8 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
this->clock = data; this->clock = data;
break; break;
case SPA_IO_Position: case SPA_IO_Position:
if (size > 0 && size < sizeof(struct spa_io_position))
return -EINVAL;
this->position = data; this->position = data;
break; break;
default: default:

24
spa/plugins/alsa/alsa-pcm.c
View file

@ -654,10 +654,6 @@ int spa_alsa_open(struct state *state, const char *params)
/* ALSA pollfds may only be ready after setting swparams, so /* ALSA pollfds may only be ready after setting swparams, so
* these are initialised in spa_alsa_start() */ * these are initialised in spa_alsa_start() */
} }
if (state->clock)
spa_scnprintf(state->clock->name, sizeof(state->clock->name),
"%s", state->clock_name);
state->opened = true; state->opened = true;
state->sample_count = 0; state->sample_count = 0;
state->sample_time = 0; state->sample_time = 0;
@ -2965,16 +2961,17 @@ int spa_alsa_reassign_follower(struct state *state)
{ {
bool following, freewheel; bool following, freewheel;
if (!state->started) if (state->clock != NULL)
return 0; spa_scnprintf(state->clock->name, sizeof(state->clock->name), "%s", state->clock_name);
following = is_following(state); following = is_following(state);
if (following != state->following) { if (following != state->following) {
spa_log_debug(state->log, "%p: reassign follower %d->%d", state, state->following, following); spa_log_debug(state->log, "%p: reassign follower %d->%d", state, state->following, following);
state->following = following; state->following = following;
spa_loop_invoke(state->data_loop, do_setup_sources, 0, NULL, 0, true, state); setup_matching(state);
if (state->started)
spa_loop_invoke(state->data_loop, do_setup_sources, 0, NULL, 0, true, state);
} }
setup_matching(state);
freewheel = state->position && freewheel = state->position &&
SPA_FLAG_IS_SET(state->position->clock.flags, SPA_IO_CLOCK_FLAG_FREEWHEEL); SPA_FLAG_IS_SET(state->position->clock.flags, SPA_IO_CLOCK_FLAG_FREEWHEEL);
@ -2982,12 +2979,13 @@ int spa_alsa_reassign_follower(struct state *state)
if (state->freewheel != freewheel) { if (state->freewheel != freewheel) {
spa_log_debug(state->log, "%p: freewheel %d->%d", state, state->freewheel, freewheel); spa_log_debug(state->log, "%p: freewheel %d->%d", state, state->freewheel, freewheel);
state->freewheel = freewheel; state->freewheel = freewheel;
if (freewheel) if (state->started) {
snd_pcm_pause(state->hndl, 1); if (freewheel)
else snd_pcm_pause(state->hndl, 1);
snd_pcm_pause(state->hndl, 0); else
snd_pcm_pause(state->hndl, 0);
}
} }
state->alsa_sync_warning = false; state->alsa_sync_warning = false;
return 0; return 0;
} }