eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 06:05:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavu/channel_layout: change av_get_channel_layout() behavior at the next bump

Browse Source 
The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.

With the new parser the string:
1234

is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.

ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.

The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.
This commit is contained in:
Stefano Sabatini
2013-10-04 15:20:50 +02:00
parent b236eb49e1
commit d96e377c39
4 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libavutil/channel_layout.c
View File

@@ -103,7 +103,11 @@ static const struct {
{ "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, },
};
#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
static uint64_t get_channel_layout_single(const char *name, int name_len, int compat)
#else
static uint64_t get_channel_layout_single(const char *name, int name_len)
#endif
{
int i;
char *end;
@@ -120,16 +124,40 @@ static uint64_t get_channel_layout_single(const char *name, int name_len)
!memcmp(channel_names[i].name, 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'))
#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
if (compat) {
if (end - name == name_len ||
(end + 1 - name == name_len && *end == 'c')) {
layout = av_get_default_channel_layout(i);
if (end - name == name_len) {
av_log(NULL, AV_LOG_WARNING,
"Single channel layout '%.*s' is interpreted as a number of channels, "
"switch to the syntax '%.*sc' otherwise it will be interpreted as a "
"channel layout number in a later version\n",
name_len, name, name_len, name);
return layout;
}
}
} else {
#endif
if ((end + 1 - name == name_len && *end == 'c'))
return av_get_default_channel_layout(i);
#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
}
#endif
layout = strtoll(name, &end, 0);
if (end - name == name_len)
return FFMAX(layout, 0);
return 0;
}
#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
uint64_t ff_get_channel_layout(const char *name, int compat)
#else
uint64_t av_get_channel_layout(const char *name)
#endif
{
const char *n, *e;
const char *name_end = name + strlen(name);
@@ -137,7 +165,11 @@ uint64_t av_get_channel_layout(const char *name)
for (n = name; n < name_end; n = e + 1) {
for (e = n; e < name_end && *e != '+' && *e != '|'; e++);
#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
layout_single = get_channel_layout_single(n, e - n, compat);
#else
layout_single = get_channel_layout_single(n, e - n);
#endif
if (!layout_single)
return 0;
layout |= layout_single;
@@ -145,6 +177,13 @@ uint64_t av_get_channel_layout(const char *name)
return layout;
}
#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
uint64_t av_get_channel_layout(const char *name)
{
return ff_get_channel_layout(name, 1);
}
#endif
void av_bprint_channel_layout(struct AVBPrint *bp,
int nb_channels, uint64_t channel_layout)
{