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().

diff --git a/src/pulse/format.c b/src/pulse/format.c
index 0b87560ecdd5a0c8239df5a7249e95b9041c8c9e..1b4a1549cb1a75e67e186f59f93bcb280cdf90b2 100644 (file)
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -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) {

diff --git a/src/pulsecore/core-format.c b/src/pulsecore/core-format.c
index cb65e9e018502d9357bd72ccbf641dda68e5b9a8..43ad4683d64382e4eec1a432943f794f7cc45a4f 100644 (file)
--- a/src/pulsecore/core-format.c
+++ b/src/pulsecore/core-format.c
@@ -53,6 +53,27 @@ int pa_format_info_get_sample_format(pa_format_info *f, pa_sample_format_t *sf)
     return 0;
 }
 
+int pa_format_info_get_rate(pa_format_info *f, uint32_t *rate) {
+    int r;
+    int rate_local;
+
+    pa_assert(f);
+    pa_assert(rate);
+
+    r = pa_format_info_get_prop_int(f, PA_PROP_FORMAT_RATE, &rate_local);
+    if (r < 0)
+        return r;
+
+    if (!pa_sample_rate_valid(rate_local)) {
+        pa_log_debug("Invalid sample rate: %i", rate_local);
+        return -PA_ERR_INVALID;
+    }
+
+    *rate = rate_local;
+
+    return 0;
+}
+
 int pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map) {
     int rate;
 

diff --git a/src/pulsecore/core-format.h b/src/pulsecore/core-format.h
index 829973059769e3a0e672188e56ff608e484d12f4..7e5d98297cfcf9bfebd1928eca5b8fc146fdfe78 100644 (file)
--- a/src/pulsecore/core-format.h
+++ b/src/pulsecore/core-format.h
@@ -27,6 +27,11 @@
  * -PA_ERR_NOENTITY. */
 int pa_format_info_get_sample_format(pa_format_info *f, pa_sample_format_t *sf);
 
+/* Gets the sample rate stored in the format info. Returns a negative error
+ * code on failure. If the sample rate property is not set at all, returns
+ * -PA_ERR_NOENTITY. */
+int pa_format_info_get_rate(pa_format_info *f, uint32_t *rate);
+
 /* For compressed formats. Converts the format info into a sample spec and a
  * channel map that an ALSA device can use as its configuration parameters when
  * playing back the compressed data. That is, the returned sample spec doesn't