From c3839c76377ea7662f29364ae66718e8ac6233af Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Fri, 25 Feb 2011 12:35:14 +0530 Subject: core: Add a pa_format_info structure This will be used to represent the format of data provided by the client for both compressed and PCM formats in a new extended API. --- src/pulse/format.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 src/pulse/format.c (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c new file mode 100644 index 00000000..372ae1c5 --- /dev/null +++ b/src/pulse/format.c @@ -0,0 +1,71 @@ +/*** + This file is part of PulseAudio. + + Copyright 2011 Intel Corporation + Copyright 2011 Collabora Multimedia + Copyright 2011 Arun Raghavan + + PulseAudio is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2.1 of the License, + or (at your option) any later version. + + PulseAudio is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include +#include + +#include "format.h" + +pa_format_info* pa_format_info_new(void) { + pa_format_info *f = pa_xnew(pa_format_info, 1); + + f->encoding = PA_ENCODING_INVALID; + f->plist = pa_proplist_new(); + + return f; +} + +pa_format_info* pa_format_info_copy(const pa_format_info *src) { + pa_format_info *dest; + + pa_assert(src); + + dest = pa_xnew(pa_format_info, 1); + + dest->encoding = src->encoding; + + if (src->plist) + dest->plist = pa_proplist_copy(src->plist); + else + dest->plist = NULL; + + return dest; +} + +void pa_format_info_free(pa_format_info *f) { + pa_assert(f); + + pa_proplist_free(f->plist); + pa_xfree(f); +} + +int pa_format_info_valid(pa_format_info *f) { + return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); +} -- cgit From 3767c9c4e8107a3e78f387466b45384d64644d94 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Mon, 28 Feb 2011 10:53:41 +0530 Subject: format: Add some properties and internal API The properties will be used by clients to set the sample format, sampling rate, etc. The functions will be used internally. --- src/pulse/format.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index 372ae1c5..c3962de9 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -69,3 +69,90 @@ void pa_format_info_free(pa_format_info *f) { int pa_format_info_valid(pa_format_info *f) { return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); } + +pa_bool_t pa_format_info_is_compatible(pa_format_info *first, pa_format_info *second) { + const char *key; + void *state = NULL; + + pa_assert(first); + pa_assert(second); + + if (first->encoding != second->encoding) + return FALSE; + + while ((key = pa_proplist_iterate(first->plist, &state))) { + const char *value_one, *value_two; + + value_one = pa_proplist_gets(first->plist, key); + value_two = pa_proplist_gets(second->plist, key); + + if (!value_two || !pa_streq(value_one, value_two)) + return FALSE; + } + + return TRUE; +} + +pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_map *map) { + char cm[PA_CHANNEL_MAP_SNPRINT_MAX]; + pa_format_info *f; + + pa_assert(ss && pa_sample_spec_valid(ss)); + pa_assert(!map || pa_channel_map_valid(map)); + + f = pa_format_info_new(); + f->encoding = PA_ENCODING_PCM; + + pa_proplist_sets(f->plist, PA_PROP_FORMAT_SAMPLE_FORMAT, pa_sample_format_to_string(ss->format)); + pa_proplist_setf(f->plist, PA_PROP_FORMAT_RATE, "%u", (unsigned int) ss->rate); + pa_proplist_setf(f->plist, PA_PROP_FORMAT_CHANNELS, "%u", (unsigned int) ss->channels); + + if (map) { + pa_channel_map_snprint(cm, sizeof(cm), map); + pa_proplist_setf(f->plist, PA_PROP_FORMAT_CHANNEL_MAP, "%s", cm); + } + + return f; +} + +/* For PCM streams */ +void 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_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_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); + ss->channels = (uint8_t) channels; + + if (map) { + const char *m = pa_proplist_gets(f->plist, PA_PROP_FORMAT_CHANNEL_MAP); + pa_channel_map_init(map); + + if (m) + pa_assert(pa_channel_map_parse(map, m) != NULL); + } +} + +/* For compressed streams */ +void 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); + + 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); +} -- cgit From 54c391e6db550c5519df0ebb37f2197eed440c92 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 1 Mar 2011 16:34:06 +0530 Subject: format: Add convenience API to check if a format is PCM or not --- src/pulse/format.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index c3962de9..4ecd75ee 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -70,6 +70,10 @@ int pa_format_info_valid(pa_format_info *f) { return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); } +int pa_format_info_is_pcm(pa_format_info *f) { + return f->encoding == PA_ENCODING_PCM; +} + pa_bool_t pa_format_info_is_compatible(pa_format_info *first, pa_format_info *second) { const char *key; void *state = NULL; -- cgit From 13229fb39e7b8cff3f114c98f8236d9123442243 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 2 Mar 2011 11:16:07 +0530 Subject: sink-input: Don't assert on bad formats Handles bad format input more gracefully and returns an error instead. --- src/pulse/format.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index 4ecd75ee..af24eb2e 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -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; } -- cgit From e418e49ecbd643f3cac87438d00baaf86275927c Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 2 Mar 2011 11:31:51 +0530 Subject: format: Avoid some code duplication We frequently need to free an idxset containing pa_format_infos, so define an internal free function that can be used directly with this (instead of defining it once-per-file). --- src/pulse/format.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index af24eb2e..9bb76732 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -66,6 +66,10 @@ void pa_format_info_free(pa_format_info *f) { pa_xfree(f); } +void pa_format_info_free2(pa_format_info *f, void *userdata) { + pa_format_info_free(f); +} + int pa_format_info_valid(pa_format_info *f) { return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); } -- cgit From a3a004214404c6f91a82c1e2164444e5e08c26cf Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 8 Mar 2011 20:14:46 +0530 Subject: format: Const-ify some parameters --- src/pulse/format.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index 9bb76732..7ddfa7a1 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -70,11 +70,11 @@ void pa_format_info_free2(pa_format_info *f, void *userdata) { pa_format_info_free(f); } -int pa_format_info_valid(pa_format_info *f) { +int pa_format_info_valid(const pa_format_info *f) { return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); } -int pa_format_info_is_pcm(pa_format_info *f) { +int pa_format_info_is_pcm(const pa_format_info *f) { return f->encoding == PA_ENCODING_PCM; } -- cgit From 8631f4e2c44b47db76795bebdbab54914a1f3ea0 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 8 Mar 2011 20:15:36 +0530 Subject: format: Add some convenience functions for printing --- src/pulse/format.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index 7ddfa7a1..0c5c24b1 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -27,12 +27,28 @@ #include #include +#include #include #include #include "format.h" +const char *pa_encoding_to_string(pa_encoding_t e) { + static const char* const table[]= { + [PA_ENCODING_PCM] = "pcm", + [PA_ENCODING_AC3_IEC61937] = "ac3-iec61937", + [PA_ENCODING_EAC3_IEC61937] = "eac3-iec61937", + [PA_ENCODING_MPEG_IEC61937] = "mpeg-iec61937", + [PA_ENCODING_ANY] = "any", + }; + + if (e < 0 || e >= PA_ENCODING_MAX) + return NULL; + + return table[e]; +} + pa_format_info* pa_format_info_new(void) { pa_format_info *f = pa_xnew(pa_format_info, 1); @@ -78,6 +94,26 @@ int pa_format_info_is_pcm(const pa_format_info *f) { return f->encoding == PA_ENCODING_PCM; } +char *pa_format_info_snprint(char *s, size_t l, const pa_format_info *f) { + char *tmp; + + pa_assert(s); + pa_assert(l > 0); + pa_assert(f); + + pa_init_i18n(); + + if (!pa_format_info_valid(f)) + pa_snprintf(s, l, _("(invalid)")); + else { + tmp = pa_proplist_to_string_sep(f->plist, ", "); + pa_snprintf(s, l, _("%s, %s"), pa_encoding_to_string(f->encoding), tmp[0] ? tmp : _("(no properties)")); + pa_xfree(tmp); + } + + return s; +} + pa_bool_t pa_format_info_is_compatible(pa_format_info *first, pa_format_info *second) { const char *key; void *state = NULL; -- cgit From 9a39a3df10c3874bf0b5b091f721a6d8ab8750a5 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 9 Mar 2011 20:50:25 +0530 Subject: format: Add a type for DTS --- src/pulse/format.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index 0c5c24b1..e601d902 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -40,6 +40,7 @@ const char *pa_encoding_to_string(pa_encoding_t e) { [PA_ENCODING_AC3_IEC61937] = "ac3-iec61937", [PA_ENCODING_EAC3_IEC61937] = "eac3-iec61937", [PA_ENCODING_MPEG_IEC61937] = "mpeg-iec61937", + [PA_ENCODING_DTS_IEC61937] = "dts-iec61937", [PA_ENCODING_ANY] = "any", }; -- cgit From 13a33abf45f31417076f283ca7da9d9f74892286 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 29 Mar 2011 17:16:08 +0530 Subject: format: Export pa_format_info_is_compatible in API This allows clients to perform checks between formats as well. --- src/pulse/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index e601d902..a634b27b 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -115,7 +115,7 @@ char *pa_format_info_snprint(char *s, size_t l, const pa_format_info *f) { return s; } -pa_bool_t pa_format_info_is_compatible(pa_format_info *first, pa_format_info *second) { +int pa_format_info_is_compatible(pa_format_info *first, pa_format_info *second) { const char *key; void *state = NULL; -- cgit From d1f13fa781ec69e4dbed000902123d255baaba5f Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sat, 9 Apr 2011 09:36:25 +0530 Subject: format: Add correct sample spec conversion for E-AC3 IEC61937-encapsulated E-AC3 frames contain 6 audio blocks per substream, which corresponds to 1536 samples contained a 24576-byte frame. To cope with this, we maintain the s16le stereo sample spec, but quadruple the sample rate so that the conversion remains accurate. --- src/pulse/format.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index a634b27b..84df76b4 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -203,5 +203,8 @@ pa_bool_t pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec * 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); + if (f->encoding == PA_ENCODING_EAC3_IEC61937) + ss->rate *= 4; + return TRUE; } -- cgit From 8d076d09902fe618e69f3d71e42299bffe2af437 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 13 Apr 2011 14:05:18 +0530 Subject: format: Extend properties to handle lists/ranges This replaces the simple string used by pa_format_info's proplist with a JSON string (accessed via new API only). This allows us to express lists and ranges more cleanly, and embed type information for future extensibility. We use json-c for JSON parsing. This is a lightweight depdency (32 KB on my system) and avoids the hassle of having to reinvent a JSON parser. Also included is a test which verifies functionality and is valgrind-clean. --- src/pulse/format.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 250 insertions(+), 20 deletions(-) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index 84df76b4..1cb804ef 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -25,6 +25,8 @@ #include #endif +#include + #include #include #include @@ -34,6 +36,11 @@ #include "format.h" +#define PA_JSON_MIN_KEY "min" +#define PA_JSON_MAX_KEY "max" + +static int pa_format_info_prop_compatible(const char *one, const char *two); + const char *pa_encoding_to_string(pa_encoding_t e) { static const char* const table[]= { [PA_ENCODING_PCM] = "pcm", @@ -131,7 +138,7 @@ int pa_format_info_is_compatible(pa_format_info *first, pa_format_info *second) value_one = pa_proplist_gets(first->plist, key); value_two = pa_proplist_gets(second->plist, key); - if (!value_two || !pa_streq(value_one, value_two)) + if (!value_two || !pa_format_info_prop_compatible(value_one, value_two)) return FALSE; } @@ -148,13 +155,13 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m f = pa_format_info_new(); f->encoding = PA_ENCODING_PCM; - pa_proplist_sets(f->plist, PA_PROP_FORMAT_SAMPLE_FORMAT, pa_sample_format_to_string(ss->format)); - pa_proplist_setf(f->plist, PA_PROP_FORMAT_RATE, "%u", (unsigned int) ss->rate); - pa_proplist_setf(f->plist, PA_PROP_FORMAT_CHANNELS, "%u", (unsigned int) ss->channels); + pa_format_info_set_prop_string(f, PA_PROP_FORMAT_SAMPLE_FORMAT, pa_sample_format_to_string(ss->format)); + pa_format_info_set_prop_int(f, PA_PROP_FORMAT_RATE, ss->rate); + pa_format_info_set_prop_int(f, PA_PROP_FORMAT_CHANNELS, ss->channels); if (map) { pa_channel_map_snprint(cm, sizeof(cm), map); - pa_proplist_setf(f->plist, PA_PROP_FORMAT_CHANNEL_MAP, "%s", cm); + pa_format_info_set_prop_string(f, PA_PROP_FORMAT_CHANNEL_MAP, cm); } return f; @@ -162,36 +169,51 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m /* For PCM streams */ 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; + char *sf = NULL, *m = NULL; + int rate, channels; + pa_bool_t ret = FALSE; pa_assert(f); pa_assert(ss); pa_return_val_if_fail(f->encoding == PA_ENCODING_PCM, FALSE); - 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); + if (!pa_format_info_get_prop_string(f, PA_PROP_FORMAT_SAMPLE_FORMAT, &sf)) + goto out; + if (!pa_format_info_get_prop_int(f, PA_PROP_FORMAT_RATE, &rate)) + goto out; + if (!pa_format_info_get_prop_int(f, PA_PROP_FORMAT_CHANNELS, &channels)) + goto out; - 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); + if ((ss->format = pa_parse_sample_format(sf)) == PA_SAMPLE_INVALID) + goto out; + + ss->rate = (uint32_t) rate; ss->channels = (uint8_t) channels; if (map) { - const char *m = pa_proplist_gets(f->plist, PA_PROP_FORMAT_CHANNEL_MAP); pa_channel_map_init(map); - if (m) - pa_return_val_if_fail(pa_channel_map_parse(map, m) != NULL, FALSE); + if (!pa_format_info_get_prop_string(f, PA_PROP_FORMAT_CHANNEL_MAP, &m)) + goto out; + + if (m && pa_channel_map_parse(map, m) == NULL) + goto out; } - return TRUE; + ret = TRUE; + +out: + if (sf) + pa_xfree(sf); + if (m) + pa_xfree(m); + + return ret; } /* For compressed streams */ pa_bool_t pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec *ss) { - const char *r; + int rate; pa_assert(f); pa_assert(ss); @@ -200,11 +222,219 @@ pa_bool_t pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec * ss->format = PA_SAMPLE_S16LE; ss->channels = 2; - 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); + pa_return_val_if_fail(pa_format_info_get_prop_int(f, PA_PROP_FORMAT_RATE, &rate), FALSE); + ss->rate = (uint32_t) rate; if (f->encoding == PA_ENCODING_EAC3_IEC61937) ss->rate *= 4; return TRUE; } + +pa_bool_t pa_format_info_get_prop_int(pa_format_info *f, const char *key, int *v) { + const char *str; + json_object *o; + + pa_assert(f); + pa_assert(key); + pa_assert(v); + + pa_return_val_if_fail(str = pa_proplist_gets(f->plist, key), FALSE); + o = json_tokener_parse(str); + pa_return_val_if_fail(!is_error(o), FALSE); + if (json_object_get_type(o) != json_type_int) { + json_object_put(o); + return FALSE; + } + + *v = json_object_get_int(o); + json_object_put(o); + + return TRUE; +} + +pa_bool_t pa_format_info_get_prop_string(pa_format_info *f, const char *key, char **v) { + const char *str = NULL; + json_object *o; + + pa_assert(f); + pa_assert(key); + pa_assert(v); + + pa_return_val_if_fail(str = pa_proplist_gets(f->plist, key), FALSE); + o = json_tokener_parse(str); + pa_return_val_if_fail(!is_error(o), FALSE); + if (json_object_get_type(o) != json_type_string) { + json_object_put(o); + return FALSE; + } + + *v = pa_xstrdup(json_object_get_string(o)); + json_object_put(o); + + return TRUE; +} + +void pa_format_info_set_prop_int(pa_format_info *f, const char *key, int value) { + json_object *o; + + pa_assert(f); + pa_assert(key); + + o = json_object_new_int(value); + + pa_proplist_sets(f->plist, key, json_object_to_json_string(o)); + + json_object_put(o); +} + +void pa_format_info_set_prop_int_array(pa_format_info *f, const char *key, const int *values, int n_values) { + json_object *o; + int i; + + pa_assert(f); + pa_assert(key); + + o = json_object_new_array(); + + for (i = 0; i < n_values; i++) + json_object_array_add(o, json_object_new_int(values[i])); + + pa_proplist_sets(f->plist, key, json_object_to_json_string(o)); + + json_object_put(o); +} + +void pa_format_info_set_prop_int_range(pa_format_info *f, const char *key, int min, int max) { + json_object *o; + + pa_assert(f); + pa_assert(key); + + o = json_object_new_object(); + + json_object_object_add(o, PA_JSON_MIN_KEY, json_object_new_int(min)); + json_object_object_add(o, PA_JSON_MAX_KEY, json_object_new_int(max)); + + pa_proplist_sets(f->plist, key, json_object_to_json_string(o)); + + json_object_put(o); +} + +void pa_format_info_set_prop_string(pa_format_info *f, const char *key, const char *value) { + json_object *o; + + pa_assert(f); + pa_assert(key); + + o = json_object_new_string(value); + + pa_proplist_sets(f->plist, key, json_object_to_json_string(o)); + + json_object_put(o); +} + +void pa_format_info_set_prop_string_array(pa_format_info *f, const char *key, const char **values, int n_values) { + json_object *o; + int i; + + pa_assert(f); + pa_assert(key); + + o = json_object_new_array(); + + for (i = 0; i < n_values; i++) + json_object_array_add(o, json_object_new_string(values[i])); + + pa_proplist_sets(f->plist, key, json_object_to_json_string(o)); + + json_object_put(o); +} + +static pa_bool_t pa_json_is_fixed_type(json_object *o) +{ + switch(json_object_get_type(o)) { + case json_type_object: + case json_type_array: + return FALSE; + + default: + return TRUE; + } +} + +static int pa_json_value_equal(json_object *o1, json_object *o2) { + return (json_object_get_type(o1) == json_object_get_type(o2)) && + pa_streq(json_object_to_json_string(o1), json_object_to_json_string(o2)); +} + +static int pa_format_info_prop_compatible(const char *one, const char *two) { + json_object *o1 = NULL, *o2 = NULL; + int i, ret = 0; + + o1 = json_tokener_parse(one); + if (is_error(o1)) + goto out; + + o2 = json_tokener_parse(two); + if (is_error(o2)) + goto out; + + /* We don't deal with both values being non-fixed - just because there is no immediate need (FIXME) */ + pa_return_val_if_fail(pa_json_is_fixed_type(o1) || pa_json_is_fixed_type(o2), FALSE); + + if (pa_json_is_fixed_type(o1) && pa_json_is_fixed_type(o2)) { + ret = pa_json_value_equal(o1, o2); + goto out; + } + + if (pa_json_is_fixed_type(o1)) { + json_object *tmp = o2; + o2 = o1; + o1 = tmp; + } + + /* o2 is now a fixed type, and o1 is not */ + + if (json_object_get_type(o1) == json_type_array) { + for (i = 0; i < json_object_array_length(o1); i++) { + if (pa_json_value_equal(json_object_array_get_idx(o1, i), o2)) { + ret = 1; + break; + } + } + } else if (json_object_get_type(o1) == json_type_object) { + /* o1 should be a range type */ + int min, max, v; + json_object *o_min = NULL, *o_max = NULL; + + if (json_object_get_type(o2) != json_type_int) { + /* We don't support non-integer ranges */ + goto out; + } + + o_min = json_object_object_get(o1, PA_JSON_MIN_KEY); + if (!o_min || json_object_get_type(o_min) != json_type_int) + goto out; + + o_max = json_object_object_get(o1, PA_JSON_MAX_KEY); + if (!o_max || json_object_get_type(o_max) != json_type_int) + goto out; + + v = json_object_get_int(o2); + min = json_object_get_int(o_min); + max = json_object_get_int(o_max); + + ret = v >= min && v <= max; + } else { + pa_log_warn("Got a format type that we don't support"); + } + +out: + if (o1) + json_object_put(o1); + if (o2) + json_object_put(o2); + + return ret; +} -- cgit From 1404db3d47c77ef3a360feed4ae8932cc8e443a0 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 13 Apr 2011 15:37:25 +0530 Subject: format: Add some convenience API for setting properties Adds functions to set sample format, rate, channels and channel map on a format to make life easier for users of the API. --- src/pulse/format.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'src/pulse/format.c') diff --git a/src/pulse/format.c b/src/pulse/format.c index 1cb804ef..a1a0981b 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -155,9 +155,9 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m f = pa_format_info_new(); f->encoding = PA_ENCODING_PCM; - pa_format_info_set_prop_string(f, PA_PROP_FORMAT_SAMPLE_FORMAT, pa_sample_format_to_string(ss->format)); - pa_format_info_set_prop_int(f, PA_PROP_FORMAT_RATE, ss->rate); - pa_format_info_set_prop_int(f, PA_PROP_FORMAT_CHANNELS, ss->channels); + pa_format_info_set_sample_format(f, ss->format); + pa_format_info_set_rate(f, ss->rate); + pa_format_info_set_channels(f, ss->channels); if (map) { pa_channel_map_snprint(cm, sizeof(cm), map); @@ -231,6 +231,26 @@ pa_bool_t pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec * return TRUE; } +void pa_format_info_set_sample_format(pa_format_info *f, pa_sample_format_t sf) { + pa_format_info_set_prop_string(f, PA_PROP_FORMAT_SAMPLE_FORMAT, pa_sample_format_to_string(sf)); +} + +void pa_format_info_set_rate(pa_format_info *f, int rate) { + pa_format_info_set_prop_int(f, PA_PROP_FORMAT_RATE, rate); +} + +void pa_format_info_set_channels(pa_format_info *f, int channels) { + pa_format_info_set_prop_int(f, PA_PROP_FORMAT_CHANNELS, channels); +} + +void pa_format_info_set_channel_map(pa_format_info *f, const pa_channel_map *map) { + char map_str[PA_CHANNEL_MAP_SNPRINT_MAX]; + + pa_channel_map_snprint(map_str, sizeof(map_str), map); + + pa_format_info_set_prop_string(f, PA_PROP_FORMAT_CHANNEL_MAP, map_str); +} + pa_bool_t pa_format_info_get_prop_int(pa_format_info *f, const char *key, int *v) { const char *str; json_object *o; -- cgit