diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2011-11-08 16:32:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-09 21:03:47 +0100 |
commit | e7062a1e9fae9c4846a6989dee8b0e78454b69ae (patch) | |
tree | fcd87863c25385c5dd57906399727b5ab0681bcd /libavutil/audioconvert.c | |
parent | 8cd210700b831f014d527fcb39a4623b8fa926fd (diff) | |
download | ffmpeg-e7062a1e9fae9c4846a6989dee8b0e78454b69ae.tar.gz |
audioconvert: make av_get_channel_layout accept composite names.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/audioconvert.c')
-rw-r--r-- | libavutil/audioconvert.c | 47 |
1 files changed, 38 insertions, 9 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index 0bcc9b72e5..30f6074e2a 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -72,23 +72,52 @@ static const struct { { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 }, { "7.1", 8, AV_CH_LAYOUT_7POINT1 }, { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE }, - { "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, }, - { "7.1+downmix", 10, AV_CH_LAYOUT_7POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, }, + { "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, }, { 0 } }; -int64_t av_get_channel_layout(const char *name) +static int64_t get_channel_layout_single(const char *name, int name_len) { - int i = 0; - do { - if (!strcmp(channel_layout_map[i].name, name)) - return channel_layout_map[i].layout; - i++; - } while (channel_layout_map[i].name); + int i; + char *end; + int64_t layout; + for (i = 0; i < FF_ARRAY_ELEMS(channel_layout_map) - 1; i++) { + if (strlen(channel_layout_map[i].name) == name_len && + !memcmp(channel_layout_map[i].name, name, name_len)) + return channel_layout_map[i].layout; + } + for (i = 0; i < FF_ARRAY_ELEMS(channel_names); i++) + if (channel_names[i] && + strlen(channel_names[i]) == name_len && + !memcmp(channel_names[i], name, name_len)) + return (int64_t)1 << i; + i = strtol(name, &end, 10); + if (end - name == name_len || + (end + 1 - name == name_len && *end == 'c')) + return av_get_default_channel_layout(i); + layout = strtoll(name, &end, 0); + if (end - name == name_len) + return FFMAX(layout, 0); return 0; } +int64_t av_get_channel_layout(const char *name) +{ + const char *n, *e; + const char *name_end = name + strlen(name); + int64_t layout = 0, layout_single; + + for (n = name; n < name_end; n = e + 1) { + for (e = n; e < name_end && *e != '+' && *e != '|'; e++); + layout_single = get_channel_layout_single(n, e - n); + if (!layout_single) + return 0; + layout |= layout_single; + } + return layout; +} + void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout) { |