From cb0c97dae7655eda60cabc06df0d1da4666392ec Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:29:07 +0200 Subject: add new API function pa_channel_map_compatible() --- src/pulse/channelmap.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/pulse/channelmap.c') diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index 1766e729..7a21998e 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -560,3 +560,10 @@ int pa_channel_map_valid(const pa_channel_map *map) { return 1; } + +int pa_channel_map_compatible(const pa_channel_map *map, const pa_sample_spec *ss) { + pa_assert(map); + pa_assert(ss); + + return map->channels == ss->channels; +} -- cgit From 34290725043274ddc88aeb203892f3d8bb7bbecf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:30:25 +0200 Subject: introduce upper channel map definition limit PA_CHANNEL_MAP_DEF_MAX --- src/pulse/channelmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/pulse/channelmap.c') diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index 7a21998e..7df6d6df 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -198,6 +198,7 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p pa_assert(m); pa_assert(channels > 0); pa_assert(channels <= PA_CHANNELS_MAX); + pa_assert(def < PA_CHANNEL_MAP_DEF_MAX); pa_channel_map_init(m); @@ -391,7 +392,7 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p default: - return NULL; + pa_assert_not_reached(); } } @@ -401,6 +402,7 @@ pa_channel_map* pa_channel_map_init_extend(pa_channel_map *m, unsigned channels, pa_assert(m); pa_assert(channels > 0); pa_assert(channels <= PA_CHANNELS_MAX); + pa_assert(def < PA_CHANNEL_MAP_DEF_MAX); pa_channel_map_init(m); -- cgit From b56f344b97e9520828a76cf54d81663fa48cbd33 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 5 Sep 2008 01:30:48 +0200 Subject: a few minor clean-ups --- src/pulse/channelmap.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/pulse/channelmap.c') diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index 7df6d6df..37308751 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -288,9 +288,6 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p case PA_CHANNEL_MAP_AUX: { unsigned i; - if (channels >= PA_CHANNELS_MAX) - return NULL; - for (i = 0; i < channels; i++) m->map[i] = PA_CHANNEL_POSITION_AUX0 + i; @@ -491,7 +488,7 @@ pa_channel_map *pa_channel_map_parse(pa_channel_map *rmap, const char *s) { pa_assert(rmap); pa_assert(s); - memset(&map, 0, sizeof(map)); + pa_channel_map_init(&map); if (strcmp(s, "stereo") == 0) { map.channels = 2; @@ -554,11 +551,9 @@ int pa_channel_map_valid(const pa_channel_map *map) { if (map->channels <= 0 || map->channels > PA_CHANNELS_MAX) return 0; - for (c = 0; c < map->channels; c++) { - - if (map->map[c] < 0 ||map->map[c] >= PA_CHANNEL_POSITION_MAX) + for (c = 0; c < map->channels; c++) + if (map->map[c] < 0 || map->map[c] >= PA_CHANNEL_POSITION_MAX) return 0; - } return 1; } -- cgit