| Message ID | CAPYw7P5SYPrr=t=Nn9nNp9rp5DeyNP+MmjBJC33JKafBuLkBWQ@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] new audio filter and misc improvements | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | fail | Make failed |
| andriy/make_x86 | fail | Make failed |
On Wed, Aug 09, 2023 at 11:36:16PM +0200, Paul B Mahol wrote: > Patches attached. > af_adeclick.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > b19bd0c3f05d5ebce92f7500dab61bd85d9b3661 0003-avfilter-af_adeclick-do-not-output-pointless-message.patch > From 2d8c330f543397642fa1afe0a01a67155008d4e1 Mon Sep 17 00:00:00 2001 > From: Paul B Mahol <onemda@gmail.com> > Date: Wed, 9 Aug 2023 21:53:04 +0200 > Subject: [PATCH 3/3] avfilter/af_adeclick: do not output pointless message > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > --- > libavfilter/af_adeclick.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) [...] > af_adeclick.c | 136 ++++++++++++++++++++++++++++------------------------------ > 1 file changed, 67 insertions(+), 69 deletions(-) > cfc7bc440f2f408f8570501f3afb2de235860221 0002-avfilter-af_adeclick-refactor-and-cleanup.patch > From 0a6de9b1482ece4402b1c7274501b43e43f5f56a Mon Sep 17 00:00:00 2001 > From: Paul B Mahol <onemda@gmail.com> > Date: Wed, 9 Aug 2023 21:49:19 +0200 > Subject: [PATCH 2/3] avfilter/af_adeclick: refactor and cleanup > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > --- > libavfilter/af_adeclick.c | 136 +++++++++++++++++++------------------- > 1 file changed, 67 insertions(+), 69 deletions(-) [...] > doc/filters.texi | 51 +++++++++++++++++++++++++ > libavfilter/Makefile | 1 > libavfilter/af_adeclick.c | 91 +++++++++++++++++++++++++++++++++++++++++++--- > libavfilter/allfilters.c | 1 > 4 files changed, 140 insertions(+), 4 deletions(-) > 61d03514ba9fa85d1ec308ce37037a0c07ad9a7f 0001-avfilter-add-adesurge-filter.patch > From af565f57f733af327edc1e1724e31a3c5f1fe44f Mon Sep 17 00:00:00 2001 > From: Paul B Mahol <onemda@gmail.com> > Date: Wed, 9 Aug 2023 18:21:25 +0200 > Subject: [PATCH 1/3] avfilter: add adesurge filter > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > --- > doc/filters.texi | 51 ++++++++++++++++++++++ > libavfilter/Makefile | 1 + > libavfilter/af_adeclick.c | 91 +++++++++++++++++++++++++++++++++++++-- > libavfilter/allfilters.c | 1 + > 4 files changed, 140 insertions(+), 4 deletions(-) It seems you forgot adding fate tests, please make sure fate tests are added when this or a future variant is applied thanks [...]
On Thu, Aug 10, 2023 at 11:48 AM Michael Niedermayer <michael@niedermayer.cc> wrote: > On Wed, Aug 09, 2023 at 11:36:16PM +0200, Paul B Mahol wrote: > > Patches attached. > > > af_adeclick.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > b19bd0c3f05d5ebce92f7500dab61bd85d9b3661 > 0003-avfilter-af_adeclick-do-not-output-pointless-message.patch > > From 2d8c330f543397642fa1afe0a01a67155008d4e1 Mon Sep 17 00:00:00 2001 > > From: Paul B Mahol <onemda@gmail.com> > > Date: Wed, 9 Aug 2023 21:53:04 +0200 > > Subject: [PATCH 3/3] avfilter/af_adeclick: do not output pointless > message > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > --- > > libavfilter/af_adeclick.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > [...] > > > af_adeclick.c | 136 > ++++++++++++++++++++++++++++------------------------------ > > 1 file changed, 67 insertions(+), 69 deletions(-) > > cfc7bc440f2f408f8570501f3afb2de235860221 > 0002-avfilter-af_adeclick-refactor-and-cleanup.patch > > From 0a6de9b1482ece4402b1c7274501b43e43f5f56a Mon Sep 17 00:00:00 2001 > > From: Paul B Mahol <onemda@gmail.com> > > Date: Wed, 9 Aug 2023 21:49:19 +0200 > > Subject: [PATCH 2/3] avfilter/af_adeclick: refactor and cleanup > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > --- > > libavfilter/af_adeclick.c | 136 +++++++++++++++++++------------------- > > 1 file changed, 67 insertions(+), 69 deletions(-) > > [...] > > > doc/filters.texi | 51 +++++++++++++++++++++++++ > > libavfilter/Makefile | 1 > > libavfilter/af_adeclick.c | 91 > +++++++++++++++++++++++++++++++++++++++++++--- > > libavfilter/allfilters.c | 1 > > 4 files changed, 140 insertions(+), 4 deletions(-) > > 61d03514ba9fa85d1ec308ce37037a0c07ad9a7f > 0001-avfilter-add-adesurge-filter.patch > > From af565f57f733af327edc1e1724e31a3c5f1fe44f Mon Sep 17 00:00:00 2001 > > From: Paul B Mahol <onemda@gmail.com> > > Date: Wed, 9 Aug 2023 18:21:25 +0200 > > Subject: [PATCH 1/3] avfilter: add adesurge filter > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > --- > > doc/filters.texi | 51 ++++++++++++++++++++++ > > libavfilter/Makefile | 1 + > > libavfilter/af_adeclick.c | 91 +++++++++++++++++++++++++++++++++++++-- > > libavfilter/allfilters.c | 1 + > > 4 files changed, 140 insertions(+), 4 deletions(-) > > It seems you forgot adding fate tests, please make sure fate tests are > added > when this or a future variant is applied > Sorry, Sir!, The filter modules are not mention for fate testing, and for obvious reasons like usage of non-integer math. > > thanks > > [...] > > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Rewriting code that is poorly written but fully understood is good. > Rewriting code that one doesnt understand is a sign that one is less smart > than the original author, trying to rewrite it will not make it better. > _______________________________________________ > 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". >
On Thu, Aug 10, 2023 at 12:10:49PM +0200, Paul B Mahol wrote: > On Thu, Aug 10, 2023 at 11:48 AM Michael Niedermayer <michael@niedermayer.cc> > wrote: > > > On Wed, Aug 09, 2023 at 11:36:16PM +0200, Paul B Mahol wrote: > > > Patches attached. > > > > > af_adeclick.c | 7 ++++--- > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > b19bd0c3f05d5ebce92f7500dab61bd85d9b3661 > > 0003-avfilter-af_adeclick-do-not-output-pointless-message.patch > > > From 2d8c330f543397642fa1afe0a01a67155008d4e1 Mon Sep 17 00:00:00 2001 > > > From: Paul B Mahol <onemda@gmail.com> > > > Date: Wed, 9 Aug 2023 21:53:04 +0200 > > > Subject: [PATCH 3/3] avfilter/af_adeclick: do not output pointless > > message > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > --- > > > libavfilter/af_adeclick.c | 7 ++++--- > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > [...] > > > > > af_adeclick.c | 136 > > ++++++++++++++++++++++++++++------------------------------ > > > 1 file changed, 67 insertions(+), 69 deletions(-) > > > cfc7bc440f2f408f8570501f3afb2de235860221 > > 0002-avfilter-af_adeclick-refactor-and-cleanup.patch > > > From 0a6de9b1482ece4402b1c7274501b43e43f5f56a Mon Sep 17 00:00:00 2001 > > > From: Paul B Mahol <onemda@gmail.com> > > > Date: Wed, 9 Aug 2023 21:49:19 +0200 > > > Subject: [PATCH 2/3] avfilter/af_adeclick: refactor and cleanup > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > --- > > > libavfilter/af_adeclick.c | 136 +++++++++++++++++++------------------- > > > 1 file changed, 67 insertions(+), 69 deletions(-) > > > > [...] > > > > > doc/filters.texi | 51 +++++++++++++++++++++++++ > > > libavfilter/Makefile | 1 > > > libavfilter/af_adeclick.c | 91 > > +++++++++++++++++++++++++++++++++++++++++++--- > > > libavfilter/allfilters.c | 1 > > > 4 files changed, 140 insertions(+), 4 deletions(-) > > > 61d03514ba9fa85d1ec308ce37037a0c07ad9a7f > > 0001-avfilter-add-adesurge-filter.patch > > > From af565f57f733af327edc1e1724e31a3c5f1fe44f Mon Sep 17 00:00:00 2001 > > > From: Paul B Mahol <onemda@gmail.com> > > > Date: Wed, 9 Aug 2023 18:21:25 +0200 > > > Subject: [PATCH 1/3] avfilter: add adesurge filter > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > --- > > > doc/filters.texi | 51 ++++++++++++++++++++++ > > > libavfilter/Makefile | 1 + > > > libavfilter/af_adeclick.c | 91 +++++++++++++++++++++++++++++++++++++-- > > > libavfilter/allfilters.c | 1 + > > > 4 files changed, 140 insertions(+), 4 deletions(-) > > > > It seems you forgot adding fate tests, please make sure fate tests are > > added > > when this or a future variant is applied > > > > Sorry, Sir!, > > The filter modules are not mention for fate testing, doc/developer.texi: 807 @item 808 Consider adding a regression test for your code. All new modules 809 should be covered by tests. That includes demuxers, muxers, decoders, encoders 810 filters, bitstream filters, parsers. If its not possible to do that, add 811 an explanation why to your patchset, its ok to not test if theres a reason. so yes, filters should be tested too > and for obvious > reasons like usage of non-integer math. A wide range of non integer modules are tested. thx [...]
On Thu, Aug 10, 2023 at 5:13 PM Michael Niedermayer <michael@niedermayer.cc> wrote: > On Thu, Aug 10, 2023 at 12:10:49PM +0200, Paul B Mahol wrote: > > On Thu, Aug 10, 2023 at 11:48 AM Michael Niedermayer < > michael@niedermayer.cc> > > wrote: > > > > > On Wed, Aug 09, 2023 at 11:36:16PM +0200, Paul B Mahol wrote: > > > > Patches attached. > > > > > > > af_adeclick.c | 7 ++++--- > > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > b19bd0c3f05d5ebce92f7500dab61bd85d9b3661 > > > 0003-avfilter-af_adeclick-do-not-output-pointless-message.patch > > > > From 2d8c330f543397642fa1afe0a01a67155008d4e1 Mon Sep 17 00:00:00 > 2001 > > > > From: Paul B Mahol <onemda@gmail.com> > > > > Date: Wed, 9 Aug 2023 21:53:04 +0200 > > > > Subject: [PATCH 3/3] avfilter/af_adeclick: do not output pointless > > > message > > > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > > --- > > > > libavfilter/af_adeclick.c | 7 ++++--- > > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > [...] > > > > > > > af_adeclick.c | 136 > > > ++++++++++++++++++++++++++++------------------------------ > > > > 1 file changed, 67 insertions(+), 69 deletions(-) > > > > cfc7bc440f2f408f8570501f3afb2de235860221 > > > 0002-avfilter-af_adeclick-refactor-and-cleanup.patch > > > > From 0a6de9b1482ece4402b1c7274501b43e43f5f56a Mon Sep 17 00:00:00 > 2001 > > > > From: Paul B Mahol <onemda@gmail.com> > > > > Date: Wed, 9 Aug 2023 21:49:19 +0200 > > > > Subject: [PATCH 2/3] avfilter/af_adeclick: refactor and cleanup > > > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > > --- > > > > libavfilter/af_adeclick.c | 136 > +++++++++++++++++++------------------- > > > > 1 file changed, 67 insertions(+), 69 deletions(-) > > > > > > [...] > > > > > > > doc/filters.texi | 51 +++++++++++++++++++++++++ > > > > libavfilter/Makefile | 1 > > > > libavfilter/af_adeclick.c | 91 > > > +++++++++++++++++++++++++++++++++++++++++++--- > > > > libavfilter/allfilters.c | 1 > > > > 4 files changed, 140 insertions(+), 4 deletions(-) > > > > 61d03514ba9fa85d1ec308ce37037a0c07ad9a7f > > > 0001-avfilter-add-adesurge-filter.patch > > > > From af565f57f733af327edc1e1724e31a3c5f1fe44f Mon Sep 17 00:00:00 > 2001 > > > > From: Paul B Mahol <onemda@gmail.com> > > > > Date: Wed, 9 Aug 2023 18:21:25 +0200 > > > > Subject: [PATCH 1/3] avfilter: add adesurge filter > > > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > > --- > > > > doc/filters.texi | 51 ++++++++++++++++++++++ > > > > libavfilter/Makefile | 1 + > > > > libavfilter/af_adeclick.c | 91 > +++++++++++++++++++++++++++++++++++++-- > > > > libavfilter/allfilters.c | 1 + > > > > 4 files changed, 140 insertions(+), 4 deletions(-) > > > > > > It seems you forgot adding fate tests, please make sure fate tests are > > > added > > > when this or a future variant is applied > > > > > > > Sorry, Sir!, > > > > The filter modules are not mention for fate testing, > > doc/developer.texi: > 807 @item > 808 Consider adding a regression test for your code. All new modules > 809 should be covered by tests. That includes demuxers, muxers, decoders, > encoders > 810 filters, bitstream filters, parsers. If its not possible to do that, > add > 811 an explanation why to your patchset, its ok to not test if theres a > reason. > > so yes, filters should be tested too > > > > and for obvious > > reasons like usage of non-integer math. > > A wide range of non integer modules are tested. > Not possible for non-trivial stuff. Please keep ignoring my patches as you did all these years. And your little SDR adventure inside FFmpeg will not make situation any better. > > thx > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > If you fake or manipulate statistics in a paper in physics you will never > get a job again. > If you fake or manipulate statistics in a paper in medicin you will get > a job for life at the pharma industry. > _______________________________________________ > 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". >
On Thu, Aug 10, 2023 at 06:49:50PM +0200, Paul B Mahol wrote: > On Thu, Aug 10, 2023 at 5:13 PM Michael Niedermayer <michael@niedermayer.cc> > wrote: > > > On Thu, Aug 10, 2023 at 12:10:49PM +0200, Paul B Mahol wrote: > > > On Thu, Aug 10, 2023 at 11:48 AM Michael Niedermayer < > > michael@niedermayer.cc> > > > wrote: > > > > > > > On Wed, Aug 09, 2023 at 11:36:16PM +0200, Paul B Mahol wrote: > > > > > Patches attached. > > > > > > > > > af_adeclick.c | 7 ++++--- > > > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > > b19bd0c3f05d5ebce92f7500dab61bd85d9b3661 > > > > 0003-avfilter-af_adeclick-do-not-output-pointless-message.patch > > > > > From 2d8c330f543397642fa1afe0a01a67155008d4e1 Mon Sep 17 00:00:00 > > 2001 > > > > > From: Paul B Mahol <onemda@gmail.com> > > > > > Date: Wed, 9 Aug 2023 21:53:04 +0200 > > > > > Subject: [PATCH 3/3] avfilter/af_adeclick: do not output pointless > > > > message > > > > > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > > > --- > > > > > libavfilter/af_adeclick.c | 7 ++++--- > > > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > [...] > > > > > > > > > af_adeclick.c | 136 > > > > ++++++++++++++++++++++++++++------------------------------ > > > > > 1 file changed, 67 insertions(+), 69 deletions(-) > > > > > cfc7bc440f2f408f8570501f3afb2de235860221 > > > > 0002-avfilter-af_adeclick-refactor-and-cleanup.patch > > > > > From 0a6de9b1482ece4402b1c7274501b43e43f5f56a Mon Sep 17 00:00:00 > > 2001 > > > > > From: Paul B Mahol <onemda@gmail.com> > > > > > Date: Wed, 9 Aug 2023 21:49:19 +0200 > > > > > Subject: [PATCH 2/3] avfilter/af_adeclick: refactor and cleanup > > > > > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > > > --- > > > > > libavfilter/af_adeclick.c | 136 > > +++++++++++++++++++------------------- > > > > > 1 file changed, 67 insertions(+), 69 deletions(-) > > > > > > > > [...] > > > > > > > > > doc/filters.texi | 51 +++++++++++++++++++++++++ > > > > > libavfilter/Makefile | 1 > > > > > libavfilter/af_adeclick.c | 91 > > > > +++++++++++++++++++++++++++++++++++++++++++--- > > > > > libavfilter/allfilters.c | 1 > > > > > 4 files changed, 140 insertions(+), 4 deletions(-) > > > > > 61d03514ba9fa85d1ec308ce37037a0c07ad9a7f > > > > 0001-avfilter-add-adesurge-filter.patch > > > > > From af565f57f733af327edc1e1724e31a3c5f1fe44f Mon Sep 17 00:00:00 > > 2001 > > > > > From: Paul B Mahol <onemda@gmail.com> > > > > > Date: Wed, 9 Aug 2023 18:21:25 +0200 > > > > > Subject: [PATCH 1/3] avfilter: add adesurge filter > > > > > > > > > > Signed-off-by: Paul B Mahol <onemda@gmail.com> > > > > > --- > > > > > doc/filters.texi | 51 ++++++++++++++++++++++ > > > > > libavfilter/Makefile | 1 + > > > > > libavfilter/af_adeclick.c | 91 > > +++++++++++++++++++++++++++++++++++++-- > > > > > libavfilter/allfilters.c | 1 + > > > > > 4 files changed, 140 insertions(+), 4 deletions(-) > > > > > > > > It seems you forgot adding fate tests, please make sure fate tests are > > > > added > > > > when this or a future variant is applied > > > > > > > > > > Sorry, Sir!, > > > > > > The filter modules are not mention for fate testing, > > > > doc/developer.texi: > > 807 @item > > 808 Consider adding a regression test for your code. All new modules > > 809 should be covered by tests. That includes demuxers, muxers, decoders, > > encoders > > 810 filters, bitstream filters, parsers. If its not possible to do that, > > add > > 811 an explanation why to your patchset, its ok to not test if theres a > > reason. > > > > so yes, filters should be tested too > > > > > > > and for obvious > > > reasons like usage of non-integer math. > > > > A wide range of non integer modules are tested. > > > > Not possible for non-trivial stuff. Its certainly possible to test float based filters like this. Theres a wide range of tests we have, we have tests that run synthetic input -> code to test -> md5/adler we have tests that run synthetic input -> code to test -> compare to reference / check similarity vs Constant > > Please keep ignoring my patches as you did all these years. That was never intentional, in fact i find many of the areas you work in quite interresting so iam probably not that bad a choice to review them. Its just a question of time and if there something more interresting to do elsewhere thx [...]
From af565f57f733af327edc1e1724e31a3c5f1fe44f Mon Sep 17 00:00:00 2001 From: Paul B Mahol <onemda@gmail.com> Date: Wed, 9 Aug 2023 18:21:25 +0200 Subject: [PATCH 1/3] avfilter: add adesurge filter Signed-off-by: Paul B Mahol <onemda@gmail.com> --- doc/filters.texi | 51 ++++++++++++++++++++++ libavfilter/Makefile | 1 + libavfilter/af_adeclick.c | 91 +++++++++++++++++++++++++++++++++++++-- libavfilter/allfilters.c | 1 + 4 files changed, 140 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index b30ff8240b..e041adc40f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -913,6 +913,57 @@ Compute derivative/integral of audio stream. Applying both filters one after another produces original audio. +@section adesurge +Remove big surge in audio samples from input audio. + +Samples detected as instant increase or decrease of volume are replaced by +interpolated samples using autoregressive modelling. + +@table @option +@item window, w +Set window size, in milliseconds. Allowed range is from @code{10} to +@code{100}. Default value is @code{85} milliseconds. +This sets size of window which will be processed at once. + +@item overlap, o +Set window overlap, in percentage of window size. Allowed range is from +@code{50} to @code{95}. Default value is @code{75} percent. +Setting this to a very high value may increases surges removal but makes +whole process much slower. + +@item arorder, a +Set autoregression order, in percentage of window size. Allowed range is from +@code{0} to @code{25}. Default value is @code{0.5} percent. This option also +controls quality of interpolated samples using neighbour good samples. + +@item threshold, t +Set threshold value. Allowed range is from @code{1} to @code{100}. +Default value is @code{20}. +This controls the strength of surges which is going to be removed. +The lower value, the more samples will be detected as surges. + +@item surges, s +Set surges size, in number of samples. Allowed range is @code{1} to +@code{50}. Default value is @code{5}. +For any sample detected as surge then also its surrounding samples of this size +will be interpolated also. + +@item method, m +Set overlap method. + +It accepts the following values: +@table @option +@item add, a +Select overlap-add method. Even not interpolated samples are slightly +changed with this method. + +@item save, s +Select overlap-save method. Not interpolated samples remain unchanged. +@end table + +Default value is @code{s}. +@end table + @section adrc Apply spectral dynamic range controller filter to input audio stream. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 30a0e22ef8..b26a85a7d2 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -49,6 +49,7 @@ OBJS-$(CONFIG_ADECORRELATE_FILTER) += af_adecorrelate.o OBJS-$(CONFIG_ADELAY_FILTER) += af_adelay.o OBJS-$(CONFIG_ADENORM_FILTER) += af_adenorm.o OBJS-$(CONFIG_ADERIVATIVE_FILTER) += af_aderivative.o +OBJS-$(CONFIG_ADESURGE_FILTER) += af_adesurge.o OBJS-$(CONFIG_ADRC_FILTER) += af_adrc.o OBJS-$(CONFIG_ADYNAMICEQUALIZER_FILTER) += af_adynamicequalizer.o OBJS-$(CONFIG_ADYNAMICSMOOTH_FILTER) += af_adynamicsmooth.o diff --git a/libavfilter/af_adeclick.c b/libavfilter/af_adeclick.c index 822f3065b8..1137dbe25b 100644 --- a/libavfilter/af_adeclick.c +++ b/libavfilter/af_adeclick.c @@ -25,6 +25,8 @@ #include "filters.h" #include "internal.h" +static const char *filter_modes[] = {"clicks", "clips", "surges" }; + typedef struct DeclickChannel { double *auxiliary; double *detection; @@ -55,8 +57,9 @@ typedef struct AudioDeclickContext { int method; int nb_hbins; - int is_declip; + int mode; int ar_order; + int nb_surge_samples; int nb_burst_samples; int window_size; int hop_size; @@ -468,6 +471,46 @@ static int detect_clicks(AudioDeclickContext *s, DeclickChannel *c, return nb_clicks; } +static int detect_surges(AudioDeclickContext *s, DeclickChannel *c, + double sigmae, + double *detection, double *acoefficients, + uint8_t *surge, int *index, + const double *src, double *dst) +{ + const double threshold = s->threshold; + const int size = s->nb_surge_samples * 2; + int i, j, nb_surges = 0; + + memset(detection, 0, s->window_size * sizeof(*detection)); + + for (i = s->ar_order; i < s->window_size; i++) { + for (j = 0; j <= s->ar_order; j++) { + detection[i] += acoefficients[j] * src[i - j]; + } + } + + for (i = 0; i < s->window_size; i++) { + surge[i] = fabs(detection[i]) > sigmae * threshold; + dst[i] = src[i]; + } + + for (i = 0; i < s->window_size;) { + if (!surge[i++]) + continue; + memset(surge + FFMAX(i - size/2, 0), 1, FFMIN(size, s->window_size - i)); + i += size/2; + } + + memset(surge, 0, s->ar_order * sizeof(*surge)); + memset(surge + (s->window_size - s->ar_order), 0, s->ar_order * sizeof(*surge)); + + for (i = s->ar_order; i < s->window_size - s->ar_order; i++) + if (surge[i]) + index[nb_surges++] = i; + + return nb_surges; +} + typedef struct ThreadData { AVFrame *out; } ThreadData; @@ -661,10 +704,14 @@ static av_cold int init(AVFilterContext *ctx) { AudioDeclickContext *s = ctx->priv; - s->is_declip = !strcmp(ctx->filter->name, "adeclip"); - if (s->is_declip) { + if (!strcmp(ctx->filter->name, "adesurge")) { + s->mode = 2; + s->detector = detect_surges; + } else if (!strcmp(ctx->filter->name, "adeclip")) { + s->mode = 1; s->detector = detect_clips; } else { + s->mode = 0; s->detector = detect_clicks; } @@ -677,7 +724,7 @@ static av_cold void uninit(AVFilterContext *ctx) int i; av_log(ctx, AV_LOG_INFO, "Detected %s in %"PRId64" of %"PRId64" samples (%g%%).\n", - s->is_declip ? "clips" : "clicks", s->detected_errors, + filter_modes[s->mode], s->detected_errors, s->nb_samples, 100. * s->detected_errors / s->nb_samples); av_audio_fifo_free(s->fifo); @@ -772,3 +819,39 @@ const AVFilter ff_af_adeclip = { FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; + +static const AVOption adesurge_options[] = { + { "window", "set window size", OFFSET(w), AV_OPT_TYPE_DOUBLE, {.dbl=85}, 10, 100, AF }, + { "w", "set window size", OFFSET(w), AV_OPT_TYPE_DOUBLE, {.dbl=85}, 10, 100, AF }, + { "overlap", "set window overlap", OFFSET(overlap), AV_OPT_TYPE_DOUBLE, {.dbl=75}, 50, 95, AF }, + { "o", "set window overlap", OFFSET(overlap), AV_OPT_TYPE_DOUBLE, {.dbl=75}, 50, 95, AF }, + { "arorder", "set autoregression order", OFFSET(ar), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 25, AF }, + { "a", "set autoregression order", OFFSET(ar), AV_OPT_TYPE_DOUBLE, {.dbl=0.5}, 0, 25, AF }, + { "threshold", "set threshold", OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl=20}, 1, 100, AF }, + { "t", "set threshold", OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl=20}, 1, 100, AF }, + { "surges", "set surge size", OFFSET(nb_surge_samples), AV_OPT_TYPE_INT, {.i64=5}, 1, 50, AF }, + { "s", "set surge size", OFFSET(nb_surge_samples), AV_OPT_TYPE_INT, {.i64=5}, 1, 50, AF }, + { "method", "set overlap method", OFFSET(method), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, AF, "m" }, + { "m", "set overlap method", OFFSET(method), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, AF, "m" }, + { "add", "overlap-add", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "m" }, + { "a", "overlap-add", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, AF, "m" }, + { "save", "overlap-save", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "m" }, + { "s", "overlap-save", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, AF, "m" }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(adesurge); + +const AVFilter ff_af_adesurge = { + .name = "adesurge", + .description = NULL_IF_CONFIG_SMALL("Remove surges from input audio."), + .priv_size = sizeof(AudioDeclickContext), + .priv_class = &adesurge_class, + .init = init, + .activate = activate, + .uninit = uninit, + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(ff_audio_default_filterpad), + FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_DBLP), + .flags = AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 089ad3a0ed..286e601799 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -35,6 +35,7 @@ extern const AVFilter ff_af_adecorrelate; extern const AVFilter ff_af_adelay; extern const AVFilter ff_af_adenorm; extern const AVFilter ff_af_aderivative; +extern const AVFilter ff_af_adesurge; extern const AVFilter ff_af_adrc; extern const AVFilter ff_af_adynamicequalizer; extern const AVFilter ff_af_adynamicsmooth; -- 2.39.1