* [FFmpeg-devel] [PATCH] avfilter: fix af_pan regression
@ 2023-02-04 20:48 Paul B Mahol
2023-02-05 19:58 ` Michael Niedermayer
0 siblings, 1 reply; 4+ messages in thread
From: Paul B Mahol @ 2023-02-04 20:48 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1: Type: text/plain, Size: 16 bytes --]
Patch attached.
[-- Attachment #2: 0001-avfilter-af_pan-fix-regression-introduced-with-switc.patch --]
[-- Type: text/x-patch, Size: 1286 bytes --]
From b53fa290876af0f540a99f733193f270103bf8ad Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Sat, 4 Feb 2023 21:46:15 +0100
Subject: [PATCH] avfilter/af_pan: fix regression introduced with switch to new
channel layout API
Fixes #10168
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavfilter/af_pan.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 067f646805..504e0fb5d3 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -313,6 +313,7 @@ static int config_props(AVFilterLink *link)
pan->channel_map[i] = ch_id;
}
+ av_opt_set_chlayout(pan->swr, "ichl", &pan->out_channel_layout, 0);
av_opt_set_int(pan->swr, "uch", pan->nb_output_channels, 0);
swr_set_channel_mapping(pan->swr, pan->channel_map);
} else {
@@ -333,6 +334,8 @@ static int config_props(AVFilterLink *link)
for (j = 0; j < link->ch_layout.nb_channels; j++)
pan->gain[i][j] /= t;
}
+ av_opt_set_chlayout(pan->swr, "ichl", &link->ch_layout, 0);
+ av_opt_set_chlayout(pan->swr, "ochl", &pan->out_channel_layout, 0);
swr_set_matrix(pan->swr, pan->gain[0], pan->gain[1] - pan->gain[0]);
}
--
2.39.1
[-- Attachment #3: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avfilter: fix af_pan regression
2023-02-04 20:48 [FFmpeg-devel] [PATCH] avfilter: fix af_pan regression Paul B Mahol
@ 2023-02-05 19:58 ` Michael Niedermayer
2023-02-05 20:37 ` Paul B Mahol
0 siblings, 1 reply; 4+ messages in thread
From: Michael Niedermayer @ 2023-02-05 19:58 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1.1: Type: text/plain, Size: 3709 bytes --]
On Sat, Feb 04, 2023 at 09:48:38PM +0100, Paul B Mahol wrote:
> Patch attached.
> af_pan.c | 3 +++
> 1 file changed, 3 insertions(+)
> bf878b3bd193e6462d1babf5e6e45a056a3a0f65 0001-avfilter-af_pan-fix-regression-introduced-with-switc.patch
> From b53fa290876af0f540a99f733193f270103bf8ad Mon Sep 17 00:00:00 2001
> From: Paul B Mahol <onemda@gmail.com>
> Date: Sat, 4 Feb 2023 21:46:15 +0100
> Subject: [PATCH] avfilter/af_pan: fix regression introduced with switch to new
> channel layout API
>
> Fixes #10168
>
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
> libavfilter/af_pan.c | 3 +++
> 1 file changed, 3 insertions(+)
This seems to change fate output
@@ -3,23 +3,23 @@
#codec_id 0: pcm_s16le
#sample_rate 0: 44100
#channel_layout_name 0: mono
-0, 0, 0, 1024, 2048, 0x750f0a66
-0, 1024, 1024, 1024, 2048, 0x155cf063
-0, 2048, 2048, 1024, 2048, 0x1e43fc32
-0, 3072, 3072, 1024, 2048, 0x282ffc28
-0, 4096, 4096, 1024, 2048, 0x6d7bf000
-0, 5120, 5120, 1024, 2048, 0xc0b2f411
-0, 6144, 6144, 1024, 2048, 0xd711fb03
-0, 7168, 7168, 1024, 2048, 0x3164189c
-0, 8192, 8192, 1024, 2048, 0x8c69e827
-0, 9216, 9216, 1024, 2048, 0x562d0518
-0, 10240, 10240, 1024, 2048, 0x380aee27
-0, 11264, 11264, 1024, 2048, 0x990a03e4
-0, 12288, 12288, 1024, 2048, 0x68d7ef60
-0, 13312, 13312, 1024, 2048, 0xd13fef9e
-0, 14336, 14336, 1024, 2048, 0x009306e4
-0, 15360, 15360, 1024, 2048, 0x51850390
-0, 16384, 16384, 1024, 2048, 0xcd3ceeae
-0, 17408, 17408, 1024, 2048, 0x189ff277
-0, 18432, 18432, 1024, 2048, 0x4b98f68c
-0, 19456, 19456, 1024, 2048, 0x34eaf544
+0, 0, 0, 1024, 2048, 0xd883fc1d
+0, 1024, 1024, 1024, 2048, 0xbfd0f2a0
+0, 2048, 2048, 1024, 2048, 0x88b90294
+0, 3072, 3072, 1024, 2048, 0x60dcf6f4
+0, 4096, 4096, 1024, 2048, 0x2cde0191
+0, 5120, 5120, 1024, 2048, 0x4543e9ea
+0, 6144, 6144, 1024, 2048, 0x4f73f86b
+0, 7168, 7168, 1024, 2048, 0x1a600893
+0, 8192, 8192, 1024, 2048, 0x02f3fe62
+0, 9216, 9216, 1024, 2048, 0xdbf200ac
+0, 10240, 10240, 1024, 2048, 0xd806ebf7
+0, 11264, 11264, 1024, 2048, 0xb2d9f805
+0, 12288, 12288, 1024, 2048, 0x47bb087b
+0, 13312, 13312, 1024, 2048, 0x96520fb5
+0, 14336, 14336, 1024, 2048, 0xfb8efbd5
+0, 15360, 15360, 1024, 2048, 0xbf2f03ed
+0, 16384, 16384, 1024, 2048, 0xde80fd74
+0, 17408, 17408, 1024, 2048, 0xf204e97d
+0, 18432, 18432, 1024, 2048, 0x260cf5d2
+0, 19456, 19456, 1024, 2048, 0x0d02ff6c
Test filter-pan-mono1 failed. Look at tests/data/fate/filter-pan-mono1.err for details.
tests/Makefile:306: recipe for target 'fate-filter-pan-mono1' failed
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
Old school: Use the lowest level language in which you can solve the problem
conveniently.
New school: Use the highest level language in which the latest supercomputer
can solve the problem without the user falling asleep waiting.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avfilter: fix af_pan regression
2023-02-05 19:58 ` Michael Niedermayer
@ 2023-02-05 20:37 ` Paul B Mahol
2023-02-07 17:04 ` Paul B Mahol
0 siblings, 1 reply; 4+ messages in thread
From: Paul B Mahol @ 2023-02-05 20:37 UTC (permalink / raw)
To: FFmpeg development discussions and patches
[-- Attachment #1: Type: text/plain, Size: 3870 bytes --]
On 2/5/23, Michael Niedermayer <michael@niedermayer.cc> wrote:
> On Sat, Feb 04, 2023 at 09:48:38PM +0100, Paul B Mahol wrote:
>> Patch attached.
>
>> af_pan.c | 3 +++
>> 1 file changed, 3 insertions(+)
>> bf878b3bd193e6462d1babf5e6e45a056a3a0f65
>> 0001-avfilter-af_pan-fix-regression-introduced-with-switc.patch
>> From b53fa290876af0f540a99f733193f270103bf8ad Mon Sep 17 00:00:00 2001
>> From: Paul B Mahol <onemda@gmail.com>
>> Date: Sat, 4 Feb 2023 21:46:15 +0100
>> Subject: [PATCH] avfilter/af_pan: fix regression introduced with switch to
>> new
>> channel layout API
>>
>> Fixes #10168
>>
>> Signed-off-by: Paul B Mahol <onemda@gmail.com>
>> ---
>> libavfilter/af_pan.c | 3 +++
>> 1 file changed, 3 insertions(+)
>
> This seems to change fate output
Oh, fixed, new patch attached.
>
> @@ -3,23 +3,23 @@
> #codec_id 0: pcm_s16le
> #sample_rate 0: 44100
> #channel_layout_name 0: mono
> -0, 0, 0, 1024, 2048, 0x750f0a66
> -0, 1024, 1024, 1024, 2048, 0x155cf063
> -0, 2048, 2048, 1024, 2048, 0x1e43fc32
> -0, 3072, 3072, 1024, 2048, 0x282ffc28
> -0, 4096, 4096, 1024, 2048, 0x6d7bf000
> -0, 5120, 5120, 1024, 2048, 0xc0b2f411
> -0, 6144, 6144, 1024, 2048, 0xd711fb03
> -0, 7168, 7168, 1024, 2048, 0x3164189c
> -0, 8192, 8192, 1024, 2048, 0x8c69e827
> -0, 9216, 9216, 1024, 2048, 0x562d0518
> -0, 10240, 10240, 1024, 2048, 0x380aee27
> -0, 11264, 11264, 1024, 2048, 0x990a03e4
> -0, 12288, 12288, 1024, 2048, 0x68d7ef60
> -0, 13312, 13312, 1024, 2048, 0xd13fef9e
> -0, 14336, 14336, 1024, 2048, 0x009306e4
> -0, 15360, 15360, 1024, 2048, 0x51850390
> -0, 16384, 16384, 1024, 2048, 0xcd3ceeae
> -0, 17408, 17408, 1024, 2048, 0x189ff277
> -0, 18432, 18432, 1024, 2048, 0x4b98f68c
> -0, 19456, 19456, 1024, 2048, 0x34eaf544
> +0, 0, 0, 1024, 2048, 0xd883fc1d
> +0, 1024, 1024, 1024, 2048, 0xbfd0f2a0
> +0, 2048, 2048, 1024, 2048, 0x88b90294
> +0, 3072, 3072, 1024, 2048, 0x60dcf6f4
> +0, 4096, 4096, 1024, 2048, 0x2cde0191
> +0, 5120, 5120, 1024, 2048, 0x4543e9ea
> +0, 6144, 6144, 1024, 2048, 0x4f73f86b
> +0, 7168, 7168, 1024, 2048, 0x1a600893
> +0, 8192, 8192, 1024, 2048, 0x02f3fe62
> +0, 9216, 9216, 1024, 2048, 0xdbf200ac
> +0, 10240, 10240, 1024, 2048, 0xd806ebf7
> +0, 11264, 11264, 1024, 2048, 0xb2d9f805
> +0, 12288, 12288, 1024, 2048, 0x47bb087b
> +0, 13312, 13312, 1024, 2048, 0x96520fb5
> +0, 14336, 14336, 1024, 2048, 0xfb8efbd5
> +0, 15360, 15360, 1024, 2048, 0xbf2f03ed
> +0, 16384, 16384, 1024, 2048, 0xde80fd74
> +0, 17408, 17408, 1024, 2048, 0xf204e97d
> +0, 18432, 18432, 1024, 2048, 0x260cf5d2
> +0, 19456, 19456, 1024, 2048, 0x0d02ff6c
> Test filter-pan-mono1 failed. Look at tests/data/fate/filter-pan-mono1.err
> for details.
> tests/Makefile:306: recipe for target 'fate-filter-pan-mono1' failed
>
> [...]
>
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Old school: Use the lowest level language in which you can solve the
> problem
> conveniently.
> New school: Use the highest level language in which the latest
> supercomputer
> can solve the problem without the user falling asleep waiting.
>
[-- Attachment #2: 0001-avfilter-af_pan-fix-regression-introduced-with-switc.patch --]
[-- Type: text/x-patch, Size: 1473 bytes --]
From 8e948899d7db4e92c0b728c59f4f2501a4c72bb6 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Sat, 4 Feb 2023 21:46:15 +0100
Subject: [PATCH 1] avfilter/af_pan: fix regression introduced with switch to
new channel layout API
Fixes #10168
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavfilter/af_pan.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 067f646805..80c194b066 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -313,7 +313,9 @@ static int config_props(AVFilterLink *link)
pan->channel_map[i] = ch_id;
}
- av_opt_set_int(pan->swr, "uch", pan->nb_output_channels, 0);
+ av_opt_set_chlayout(pan->swr, "ichl", &link->ch_layout, 0);
+ av_opt_set_chlayout(pan->swr, "ochl", &pan->out_channel_layout, 0);
+ av_opt_set_int(pan->swr, "uch", link->ch_layout.nb_channels, 0);
swr_set_channel_mapping(pan->swr, pan->channel_map);
} else {
// renormalize
@@ -333,6 +335,8 @@ static int config_props(AVFilterLink *link)
for (j = 0; j < link->ch_layout.nb_channels; j++)
pan->gain[i][j] /= t;
}
+ av_opt_set_chlayout(pan->swr, "ichl", &link->ch_layout, 0);
+ av_opt_set_chlayout(pan->swr, "ochl", &pan->out_channel_layout, 0);
swr_set_matrix(pan->swr, pan->gain[0], pan->gain[1] - pan->gain[0]);
}
--
2.39.1
[-- Attachment #3: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avfilter: fix af_pan regression
2023-02-05 20:37 ` Paul B Mahol
@ 2023-02-07 17:04 ` Paul B Mahol
0 siblings, 0 replies; 4+ messages in thread
From: Paul B Mahol @ 2023-02-07 17:04 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On 2/5/23, Paul B Mahol <onemda@gmail.com> wrote:
> On 2/5/23, Michael Niedermayer <michael@niedermayer.cc> wrote:
>> On Sat, Feb 04, 2023 at 09:48:38PM +0100, Paul B Mahol wrote:
>>> Patch attached.
>>
>>> af_pan.c | 3 +++
>>> 1 file changed, 3 insertions(+)
>>> bf878b3bd193e6462d1babf5e6e45a056a3a0f65
>>> 0001-avfilter-af_pan-fix-regression-introduced-with-switc.patch
>>> From b53fa290876af0f540a99f733193f270103bf8ad Mon Sep 17 00:00:00 2001
>>> From: Paul B Mahol <onemda@gmail.com>
>>> Date: Sat, 4 Feb 2023 21:46:15 +0100
>>> Subject: [PATCH] avfilter/af_pan: fix regression introduced with switch
>>> to
>>> new
>>> channel layout API
>>>
>>> Fixes #10168
>>>
>>> Signed-off-by: Paul B Mahol <onemda@gmail.com>
>>> ---
>>> libavfilter/af_pan.c | 3 +++
>>> 1 file changed, 3 insertions(+)
>>
>> This seems to change fate output
>
> Oh, fixed, new patch attached.
>
>>
>> @@ -3,23 +3,23 @@
>> #codec_id 0: pcm_s16le
>> #sample_rate 0: 44100
>> #channel_layout_name 0: mono
>> -0, 0, 0, 1024, 2048, 0x750f0a66
>> -0, 1024, 1024, 1024, 2048, 0x155cf063
>> -0, 2048, 2048, 1024, 2048, 0x1e43fc32
>> -0, 3072, 3072, 1024, 2048, 0x282ffc28
>> -0, 4096, 4096, 1024, 2048, 0x6d7bf000
>> -0, 5120, 5120, 1024, 2048, 0xc0b2f411
>> -0, 6144, 6144, 1024, 2048, 0xd711fb03
>> -0, 7168, 7168, 1024, 2048, 0x3164189c
>> -0, 8192, 8192, 1024, 2048, 0x8c69e827
>> -0, 9216, 9216, 1024, 2048, 0x562d0518
>> -0, 10240, 10240, 1024, 2048, 0x380aee27
>> -0, 11264, 11264, 1024, 2048, 0x990a03e4
>> -0, 12288, 12288, 1024, 2048, 0x68d7ef60
>> -0, 13312, 13312, 1024, 2048, 0xd13fef9e
>> -0, 14336, 14336, 1024, 2048, 0x009306e4
>> -0, 15360, 15360, 1024, 2048, 0x51850390
>> -0, 16384, 16384, 1024, 2048, 0xcd3ceeae
>> -0, 17408, 17408, 1024, 2048, 0x189ff277
>> -0, 18432, 18432, 1024, 2048, 0x4b98f68c
>> -0, 19456, 19456, 1024, 2048, 0x34eaf544
>> +0, 0, 0, 1024, 2048, 0xd883fc1d
>> +0, 1024, 1024, 1024, 2048, 0xbfd0f2a0
>> +0, 2048, 2048, 1024, 2048, 0x88b90294
>> +0, 3072, 3072, 1024, 2048, 0x60dcf6f4
>> +0, 4096, 4096, 1024, 2048, 0x2cde0191
>> +0, 5120, 5120, 1024, 2048, 0x4543e9ea
>> +0, 6144, 6144, 1024, 2048, 0x4f73f86b
>> +0, 7168, 7168, 1024, 2048, 0x1a600893
>> +0, 8192, 8192, 1024, 2048, 0x02f3fe62
>> +0, 9216, 9216, 1024, 2048, 0xdbf200ac
>> +0, 10240, 10240, 1024, 2048, 0xd806ebf7
>> +0, 11264, 11264, 1024, 2048, 0xb2d9f805
>> +0, 12288, 12288, 1024, 2048, 0x47bb087b
>> +0, 13312, 13312, 1024, 2048, 0x96520fb5
>> +0, 14336, 14336, 1024, 2048, 0xfb8efbd5
>> +0, 15360, 15360, 1024, 2048, 0xbf2f03ed
>> +0, 16384, 16384, 1024, 2048, 0xde80fd74
>> +0, 17408, 17408, 1024, 2048, 0xf204e97d
>> +0, 18432, 18432, 1024, 2048, 0x260cf5d2
>> +0, 19456, 19456, 1024, 2048, 0x0d02ff6c
>> Test filter-pan-mono1 failed. Look at
>> tests/data/fate/filter-pan-mono1.err
>> for details.
>> tests/Makefile:306: recipe for target 'fate-filter-pan-mono1' failed
>>
>> [...]
>>
>> --
>> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>>
>> Old school: Use the lowest level language in which you can solve the
>> problem
>> conveniently.
>> New school: Use the highest level language in which the latest
>> supercomputer
>> can solve the problem without the user falling asleep
>> waiting.
>>
>
This is very big regression, so will apply ASAP!
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-07 17:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-04 20:48 [FFmpeg-devel] [PATCH] avfilter: fix af_pan regression Paul B Mahol
2023-02-05 19:58 ` Michael Niedermayer
2023-02-05 20:37 ` Paul B Mahol
2023-02-07 17:04 ` Paul B Mahol
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git