March 2024 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/5.1 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 22:08:54 2024 +0100| [59dccea6ef8fb2cb649b02a65eeec0b5ce461837] | committer: Marton Balint avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified In this case in_channel_idx was never set and the default 0 was used. Suprisingly no one noticed that the respective fate test output was wrong. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59dccea6ef8fb2cb6… --- libavfilter/af_channelmap.c | 2 +- tests/fate/filter-audio.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index dd323b992b..aa2468f941 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -375,7 +375,7 @@ static int channelmap_config_input(AVFilterLink *inlink) for (i = 0; i < s->nch; i++) { struct ChannelMap *m = &s->map[i]; - if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR) { + if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR || s->mode == MAP_ONE_STR) { m->in_channel_idx = av_channel_layout_index_from_channel( &inlink->ch_layout, m->in_channel); } diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index eff32b9f81..9cc09919c7 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -285,7 +285,7 @@ fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.w fate-filter-channelmap-one-str: tests/data/asynth-44100-2.wav fate-filter-channelmap-one-str: CMD = md5 -auto_conversion_filters -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -fflags +bitexact fate-filter-channelmap-one-str: CMP = oneline -fate-filter-channelmap-one-str: REF = 0ea3052e482c95d5d3bd9da6dac1b5fa +fate-filter-channelmap-one-str: REF = e18791f65ce5861e130b2c3e472ab90a FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP)

1 0

avfilter/af_channelmap: fix error message if FL source channel was missing
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/5.1 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 21:56:58 2024 +0100| [66430bf110b29b0b3fb8b47773572cbf70d45100] | committer: Marton Balint avfilter/af_channelmap: fix error message if FL source channel was missing FL channel ID is 0, so for an unset value we must check for ID < 0. Regression since 1f96db959c1235bb7079d354e09914a0a2608f62. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 9a5627ea9a213c4929020ee8c90bae74788f645c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66430bf110b29b0b3… --- libavfilter/af_channelmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index eb173d20c4..dd323b992b 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -167,7 +167,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx) for (i = 0; i < map_entries; i++) { int in_ch_idx = -1, out_ch_idx = -1; - int in_ch = 0, out_ch = 0; + int in_ch = -1, out_ch = -1; static const char err[] = "Failed to parse channel map\n"; switch (mode) { case MAP_ONE_INT: @@ -382,7 +382,7 @@ static int channelmap_config_input(AVFilterLink *inlink) if (m->in_channel_idx < 0 || m->in_channel_idx >= nb_channels) { av_channel_layout_describe(&inlink->ch_layout, layout_name, sizeof(layout_name)); - if (m->in_channel) { + if (m->in_channel >= 0) { av_channel_name(channel_name, sizeof(channel_name), m->in_channel); av_log(ctx, AV_LOG_ERROR, "input channel '%s' not available from input layout '%s'\n",

1 0

avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.0 | Marton Balint <cus(a)passwd.hu> | Sat Mar 23 16:10:22 2024 +0100| [aae59be4001a517f2b76dbf11f12341ce2401e02] | committer: Marton Balint avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one Fixes ffplay playback of unknown layouts, when SDL directly supports the audio format, such as: ffplay -f lavfi anullsrc=cl=2C,aformat=s16 Without the patch, "Channel layout change is not supported" errors are generated because buffersrc (unknown 2 channel) and buffersink (stereo) negotiated a stereo layout, but the stereo layout was never stored in the BufferSourceContext. This fixes a regression of 7251f909721a570726775acf61b2b9c28a950c76, but this is more of a regression of the avfilter channel layout conversion (1f96db959c1235bb7079d354e09914a0a2608f62). Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 2df2b4067ed01b9076a5dda073521551a32336cd) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aae59be4001a517f2… --- libavfilter/buffersrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index ba17450b93..bca4b87ffc 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -446,7 +446,7 @@ static int config_props(AVFilterLink *link) } break; case AVMEDIA_TYPE_AUDIO: - if (!c->ch_layout.nb_channels) { + if (!c->ch_layout.nb_channels || c->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { int ret = av_channel_layout_copy(&c->ch_layout, &link->ch_layout); if (ret < 0) return ret;

1 0

avfilter/af_channelmap: disallow channel index 64
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.0 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 23:35:26 2024 +0100| [fc8775ae966179a66fef4bd126169f74d9ac60fb] | committer: Marton Balint avfilter/af_channelmap: disallow channel index 64 MAX_CH is 64, therefore the maximum index is 63. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 2f754a96bd4ae4932923fe03c2d53f8273b6273c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc8775ae966179a66… --- libavfilter/af_channelmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index aa2468f941..18355eb43b 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -85,7 +85,7 @@ static char* split(char *message, char delim) { return next; } -static int get_channel_idx(char **map, int *ch, char delim, int max_ch) +static int get_channel_idx(char **map, int *ch, char delim, int max_nb_channels) { char *next; int len; @@ -99,7 +99,7 @@ static int get_channel_idx(char **map, int *ch, char delim, int max_ch) sscanf(*map, "%d%n", ch, &n); if (n != len) return AVERROR(EINVAL); - if (*ch < 0 || *ch > max_ch) + if (*ch < 0 || *ch >= max_nb_channels) return AVERROR(EINVAL); *map = next; return 0;

1 0

avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.0 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 22:08:54 2024 +0100| [1ad767bf27497687d72d9d683519603642f37eff] | committer: Marton Balint avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified In this case in_channel_idx was never set and the default 0 was used. Suprisingly no one noticed that the respective fate test output was wrong. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ad767bf27497687d… --- libavfilter/af_channelmap.c | 2 +- tests/fate/filter-audio.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index dd323b992b..aa2468f941 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -375,7 +375,7 @@ static int channelmap_config_input(AVFilterLink *inlink) for (i = 0; i < s->nch; i++) { struct ChannelMap *m = &s->map[i]; - if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR) { + if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR || s->mode == MAP_ONE_STR) { m->in_channel_idx = av_channel_layout_index_from_channel( &inlink->ch_layout, m->in_channel); } diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index eff32b9f81..9cc09919c7 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -285,7 +285,7 @@ fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.w fate-filter-channelmap-one-str: tests/data/asynth-44100-2.wav fate-filter-channelmap-one-str: CMD = md5 -auto_conversion_filters -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -fflags +bitexact fate-filter-channelmap-one-str: CMP = oneline -fate-filter-channelmap-one-str: REF = 0ea3052e482c95d5d3bd9da6dac1b5fa +fate-filter-channelmap-one-str: REF = e18791f65ce5861e130b2c3e472ab90a FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP)

1 0

avfilter/af_channelmap: fix error message if FL source channel was missing
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.0 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 21:56:58 2024 +0100| [ea2dcb9b3918fb4cbbe2e032c683dc68320145f3] | committer: Marton Balint avfilter/af_channelmap: fix error message if FL source channel was missing FL channel ID is 0, so for an unset value we must check for ID < 0. Regression since 1f96db959c1235bb7079d354e09914a0a2608f62. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 9a5627ea9a213c4929020ee8c90bae74788f645c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea2dcb9b3918fb4cb… --- libavfilter/af_channelmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index eb173d20c4..dd323b992b 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -167,7 +167,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx) for (i = 0; i < map_entries; i++) { int in_ch_idx = -1, out_ch_idx = -1; - int in_ch = 0, out_ch = 0; + int in_ch = -1, out_ch = -1; static const char err[] = "Failed to parse channel map\n"; switch (mode) { case MAP_ONE_INT: @@ -382,7 +382,7 @@ static int channelmap_config_input(AVFilterLink *inlink) if (m->in_channel_idx < 0 || m->in_channel_idx >= nb_channels) { av_channel_layout_describe(&inlink->ch_layout, layout_name, sizeof(layout_name)); - if (m->in_channel) { + if (m->in_channel >= 0) { av_channel_name(channel_name, sizeof(channel_name), m->in_channel); av_log(ctx, AV_LOG_ERROR, "input channel '%s' not available from input layout '%s'\n",

1 0

avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.1 | Marton Balint <cus(a)passwd.hu> | Sat Mar 23 16:10:22 2024 +0100| [aa5e6017a58ec4b647a35cea1605ce00a9d7054f] | committer: Marton Balint avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one Fixes ffplay playback of unknown layouts, when SDL directly supports the audio format, such as: ffplay -f lavfi anullsrc=cl=2C,aformat=s16 Without the patch, "Channel layout change is not supported" errors are generated because buffersrc (unknown 2 channel) and buffersink (stereo) negotiated a stereo layout, but the stereo layout was never stored in the BufferSourceContext. This fixes a regression of 7251f909721a570726775acf61b2b9c28a950c76, but this is more of a regression of the avfilter channel layout conversion (1f96db959c1235bb7079d354e09914a0a2608f62). Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 2df2b4067ed01b9076a5dda073521551a32336cd) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa5e6017a58ec4b64… --- libavfilter/buffersrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 453fc0fd5c..9e51320393 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -469,7 +469,7 @@ static int config_props(AVFilterLink *link) } break; case AVMEDIA_TYPE_AUDIO: - if (!c->ch_layout.nb_channels) { + if (!c->ch_layout.nb_channels || c->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { int ret = av_channel_layout_copy(&c->ch_layout, &link->ch_layout); if (ret < 0) return ret;

1 0

avfilter/af_channelmap: disallow channel index 64
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.1 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 23:35:26 2024 +0100| [8d1e092b245f6ac66dfe71f76a4a18dd2c11735e] | committer: Marton Balint avfilter/af_channelmap: disallow channel index 64 MAX_CH is 64, therefore the maximum index is 63. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 2f754a96bd4ae4932923fe03c2d53f8273b6273c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d1e092b245f6ac66… --- libavfilter/af_channelmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 1bfac69624..c8225fc65f 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -85,7 +85,7 @@ static char* split(char *message, char delim) { return next; } -static int get_channel_idx(char **map, int *ch, char delim, int max_ch) +static int get_channel_idx(char **map, int *ch, char delim, int max_nb_channels) { char *next; int len; @@ -99,7 +99,7 @@ static int get_channel_idx(char **map, int *ch, char delim, int max_ch) sscanf(*map, "%d%n", ch, &n); if (n != len) return AVERROR(EINVAL); - if (*ch < 0 || *ch > max_ch) + if (*ch < 0 || *ch >= max_nb_channels) return AVERROR(EINVAL); *map = next; return 0;

1 0

avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.1 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 22:08:54 2024 +0100| [0deb010ae7eec4df1d874b74c9f46571045bb48e] | committer: Marton Balint avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified In this case in_channel_idx was never set and the default 0 was used. Suprisingly no one noticed that the respective fate test output was wrong. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0deb010ae7eec4df1… --- libavfilter/af_channelmap.c | 2 +- tests/fate/filter-audio.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 302bd09a26..1bfac69624 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -375,7 +375,7 @@ static int channelmap_config_input(AVFilterLink *inlink) for (i = 0; i < s->nch; i++) { struct ChannelMap *m = &s->map[i]; - if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR) { + if (s->mode == MAP_PAIR_STR_INT || s->mode == MAP_PAIR_STR_STR || s->mode == MAP_ONE_STR) { m->in_channel_idx = av_channel_layout_index_from_channel( &inlink->ch_layout, m->in_channel); } diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 445c0f9217..4bbae5d8e0 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -285,7 +285,7 @@ fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.w fate-filter-channelmap-one-str: tests/data/asynth-44100-2.wav fate-filter-channelmap-one-str: CMD = md5 -auto_conversion_filters -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -fflags +bitexact fate-filter-channelmap-one-str: CMP = oneline -fate-filter-channelmap-one-str: REF = 0ea3052e482c95d5d3bd9da6dac1b5fa +fate-filter-channelmap-one-str: REF = e18791f65ce5861e130b2c3e472ab90a FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP)

1 0

avfilter/af_channelmap: fix error message if FL source channel was missing
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/6.1 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 21:56:58 2024 +0100| [88127b743f33ca90f7917b3203819b2ada018559] | committer: Marton Balint avfilter/af_channelmap: fix error message if FL source channel was missing FL channel ID is 0, so for an unset value we must check for ID < 0. Regression since 1f96db959c1235bb7079d354e09914a0a2608f62. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 9a5627ea9a213c4929020ee8c90bae74788f645c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88127b743f33ca90f… --- libavfilter/af_channelmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 09bc4cfbe1..302bd09a26 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -167,7 +167,7 @@ static av_cold int channelmap_init(AVFilterContext *ctx) for (i = 0; i < map_entries; i++) { int in_ch_idx = -1, out_ch_idx = -1; - int in_ch = 0, out_ch = 0; + int in_ch = -1, out_ch = -1; static const char err[] = "Failed to parse channel map\n"; switch (mode) { case MAP_ONE_INT: @@ -382,7 +382,7 @@ static int channelmap_config_input(AVFilterLink *inlink) if (m->in_channel_idx < 0 || m->in_channel_idx >= nb_channels) { av_channel_layout_describe(&inlink->ch_layout, layout_name, sizeof(layout_name)); - if (m->in_channel) { + if (m->in_channel >= 0) { av_channel_name(channel_name, sizeof(channel_name), m->in_channel); av_log(ctx, AV_LOG_ERROR, "input channel '%s' not available from input layout '%s'\n",

1 0