[FFmpeg-cvslog] avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
ffmpeg | branch: release/5.1 | Marton Balint | 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
(cherry picked from commit 1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59dccea6ef8fb2cb649b02a65eeec0b5ce461837
---
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 = >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(
>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)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
ffmpeg | branch: release/6.0 | Marton Balint | 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
(cherry picked from commit 1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ad767bf27497687d72d9d683519603642f37eff
---
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 = >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(
>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)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
ffmpeg | branch: release/6.1 | Marton Balint | 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
(cherry picked from commit 1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0deb010ae7eec4df1d874b74c9f46571045bb48e
---
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 = >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(
>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)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/af_channelmap: fix mapping if in_channel was a string but out_channel was not specified
ffmpeg | branch: master | Marton Balint | Mon Mar 18 22:08:54
2024 +0100| [1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b] | 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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bea3e9ee2f3521182eea6066fc8e8e1f8910c5b
---
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 d13dcc317d..35dc4c4618 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -342,7 +342,7 @@ static int channelmap_config_input(AVFilterLink *inlink)
for (i = 0; i < s->nch; i++) {
struct ChannelMap *m = >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(
>ch_layout, m->in_channel);
}
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak
index 8d05e6bd77..3f22db1e05 100644
--- a/tests/fate/filter-audio.mak
+++ b/tests/fate/filter-audio.mak
@@ -302,7 +302,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 $(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 ARESAMPLE, WAV, PCM_S16LE,
PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
