core-format: Add pa_format_info_get_rate()

This also fixes an issue in pa_format_info_to_sample_spec(): it did
no validation for the rate value. Now the validation is taken care of
in pa_format_info_get_rate().
This commit is contained in:
Tanu Kaskinen 2013-11-25 14:34:58 +02:00
parent eae16f41a4
commit 85a3f560d1
3 changed files with 28 additions and 3 deletions

View file

@ -219,7 +219,7 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m
/* For PCM streams */
int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map) {
char *m = NULL;
int rate, channels;
int channels;
int ret = -PA_ERR_INVALID;
pa_assert(f);
@ -230,12 +230,11 @@ int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_chan
if (pa_format_info_get_sample_format(f, &ss->format) < 0)
goto out;
if (pa_format_info_get_prop_int(f, PA_PROP_FORMAT_RATE, &rate))
if (pa_format_info_get_rate(f, &ss->rate) < 0)
goto out;
if (pa_format_info_get_prop_int(f, PA_PROP_FORMAT_CHANNELS, &channels))
goto out;
ss->rate = (uint32_t) rate;
ss->channels = (uint8_t) channels;
if (map) {