mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04: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

30
src/pulse/format.c
View file

@ -120,21 +120,21 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m
}
/* For PCM streams */
void pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map) {
pa_bool_t pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map) {
const char *sf, *r, *ch;
uint32_t channels;
pa_assert(f);
pa_assert(ss);
pa_assert(f->encoding == PA_ENCODING_PCM);
pa_return_val_if_fail(f->encoding == PA_ENCODING_PCM, FALSE);
pa_assert(sf = pa_proplist_gets(f->plist, PA_PROP_FORMAT_SAMPLE_FORMAT));
pa_assert(r = pa_proplist_gets(f->plist, PA_PROP_FORMAT_RATE));
pa_assert(ch = pa_proplist_gets(f->plist, PA_PROP_FORMAT_CHANNELS));
pa_return_val_if_fail(sf = pa_proplist_gets(f->plist, PA_PROP_FORMAT_SAMPLE_FORMAT), FALSE);
pa_return_val_if_fail(r = pa_proplist_gets(f->plist, PA_PROP_FORMAT_RATE), FALSE);
pa_return_val_if_fail(ch = pa_proplist_gets(f->plist, PA_PROP_FORMAT_CHANNELS), FALSE);
pa_assert((ss->format = pa_parse_sample_format(sf)) != PA_SAMPLE_INVALID);
pa_assert(pa_atou(r, &ss->rate) == 0);
pa_assert(pa_atou(ch, &channels) == 0);
pa_return_val_if_fail((ss->format = pa_parse_sample_format(sf)) != PA_SAMPLE_INVALID, FALSE);
pa_return_val_if_fail(pa_atou(r, &ss->rate) == 0, FALSE);
pa_return_val_if_fail(pa_atou(ch, &channels) == 0, FALSE);
ss->channels = (uint8_t) channels;
if (map) {
@ -142,21 +142,25 @@ void pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_cha
pa_channel_map_init(map);
if (m)
pa_assert(pa_channel_map_parse(map, m) != NULL);
pa_return_val_if_fail(pa_channel_map_parse(map, m) != NULL, FALSE);
}
return TRUE;
}
/* For compressed streams */
void pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec *ss) {
pa_bool_t pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec *ss) {
const char *r;
pa_assert(f);
pa_assert(ss);
pa_assert(f->encoding != PA_ENCODING_PCM);
pa_return_val_if_fail(f->encoding != PA_ENCODING_PCM, FALSE);
ss->format = PA_SAMPLE_S16LE;
ss->channels = 2;
pa_assert(r = pa_proplist_gets(f->plist, PA_PROP_FORMAT_RATE));
pa_assert(pa_atou(r, &ss->rate) == 0);
pa_return_val_if_fail(r = pa_proplist_gets(f->plist, PA_PROP_FORMAT_RATE), FALSE);
pa_return_val_if_fail(pa_atou(r, &ss->rate) == 0, FALSE);
return TRUE;
}

4
src/pulse/internal.h
View file

@ -298,8 +298,8 @@ void pa_ext_stream_restore_command(pa_context *c, uint32_t tag, pa_tagstruct *t)
pa_bool_t pa_format_info_is_compatible(pa_format_info *first, pa_format_info *second);
pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_map *map);
void pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map);
void pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec *ss);
pa_bool_t pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map);
pa_bool_t pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec *ss);
pa_bool_t pa_mainloop_is_our_api(pa_mainloop_api*m);

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;