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

sink, source: Add a channel map validity check for reconfiguration

Browse source 
Also move the check to an early assert instead of silently bailing.
This commit is contained in:
Arun Raghavan 2022-01-12 16:25:59 -05:00
parent 5d1184b35a
commit 96c119fbe4
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pulsecore/sink.c
View file

@ -1510,11 +1510,22 @@ int pa_sink_reconfigure(pa_sink *s, pa_sample_spec *spec, pa_channel_map *map, b
pa_channel_map old_map, *new_map; pa_channel_map old_map, *new_map;
bool restore = spec == NULL; bool restore = spec == NULL;
pa_assert(spec != NULL || (map == NULL && pa_sample_spec_valid(&s->saved_spec))); /* if spec is unspecified (i.e. we want to restore), map must not be specified either */
pa_assert(spec != NULL || map == NULL);
pa_assert(spec == NULL || pa_sample_spec_valid(spec));
pa_assert(map == NULL || pa_channel_map_valid(map));
if (!restore && pa_sample_spec_equal(spec, &s->sample_spec)) if (!restore && pa_sample_spec_equal(spec, &s->sample_spec))
return 0; return 0;
if (restore && !pa_sample_spec_valid(&s->saved_spec)) {
/* If we were asked to restore and nothing was saved, this is not an
* error -- it means that no reconfiguration was required in the
* "entry" phase, so none is required in the "exit" phase either.
*/
return 0;
}
if (!s->reconfigure) if (!s->reconfigure)
return -1; return -1;
@ -1536,9 +1547,6 @@ int pa_sink_reconfigure(pa_sink *s, pa_sample_spec *spec, pa_channel_map *map, b
} }
} }
if (PA_UNLIKELY(!restore && !pa_sample_spec_valid(spec)))
return -1;
if (passthrough) { if (passthrough) {
/* Save the previous sample spec and channel map, we will try to restore it when leaving passthrough */ /* Save the previous sample spec and channel map, we will try to restore it when leaving passthrough */
s->saved_spec = s->sample_spec; s->saved_spec = s->sample_spec;

17
src/pulsecore/source.c
View file

@ -1073,11 +1073,23 @@ int pa_source_reconfigure(pa_source *s, pa_sample_spec *spec, pa_channel_map *ma
pa_channel_map old_map, *new_map; pa_channel_map old_map, *new_map;
bool restore = spec == NULL; bool restore = spec == NULL;
pa_assert(spec != NULL || (map == NULL && pa_sample_spec_valid(&s->saved_spec))); /* if spec is unspecified (i.e. we want to restore), map must not be specified either */
pa_assert(spec != NULL || map == NULL);
pa_assert(spec == NULL || pa_sample_spec_valid(spec));
pa_assert(map == NULL || pa_channel_map_valid(map));
if (!restore && pa_sample_spec_equal(spec, &s->sample_spec)) if (!restore && pa_sample_spec_equal(spec, &s->sample_spec))
return 0; return 0;
if (restore && !pa_sample_spec_valid(&s->saved_spec)) {
/* If we were asked to restore and nothing was saved, this is not an
* error -- it means that no reconfiguration was required in the
* "entry" phase, so none is required in the "exit" phase either.
*/
return 0;
}
if (!s->reconfigure && !s->monitor_of) if (!s->reconfigure && !s->monitor_of)
return -1; return -1;
@ -1099,9 +1111,6 @@ int pa_source_reconfigure(pa_source *s, pa_sample_spec *spec, pa_channel_map *ma
} }
} }
if (PA_UNLIKELY(!restore && !pa_sample_spec_valid(spec)))
return -1;
if (passthrough) { if (passthrough) {
/* Save the previous sample spec and channel map, we will try to restore it when leaving passthrough */ /* Save the previous sample spec and channel map, we will try to restore it when leaving passthrough */
s->saved_spec = s->sample_spec; s->saved_spec = s->sample_spec;