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

sink-input: Don't assert on bad formats

Browse source 
Handles bad format input more gracefully and returns an error instead.
This commit is contained in:
Arun Raghavan 2011-03-02 11:16:07 +05:30
parent 8ec0548f5f
commit 13229fb39e
3 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/sink-input.c
View file

@ -281,12 +281,12 @@ int pa_sink_input_new(
/* Now populate the sample spec and format according to the final
* format that we've negotiated */
if (PA_LIKELY(data->format->encoding == PA_ENCODING_PCM)) {
pa_format_info_to_sample_spec(data->format, &ss, &map);
pa_return_val_if_fail(pa_format_info_to_sample_spec(data->format, &ss, &map), -PA_ERR_INVALID);
pa_sink_input_new_data_set_sample_spec(data, &ss);
if (pa_channel_map_valid(&map))
pa_sink_input_new_data_set_channel_map(data, &map);
} else {
pa_format_info_to_sample_spec_fake(data->format, &ss);
pa_return_val_if_fail(pa_format_info_to_sample_spec_fake(data->format, &ss), -PA_ERR_INVALID);
pa_sink_input_new_data_set_sample_spec(data, &ss);
/* XXX: this is redundant - we can just check the encoding */
data->flags |= PA_SINK_INPUT_PASSTHROUGH;