| Message ID | 20180110075805.51382-1-dmitry.gumenyuk@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com wrote: > +@table @option > +@item d > +Dimensions @code{WxH}. > +@code{W} - number of data values in json, values will be scaled according to @code{H}. > +The default value is @var{640x480} > + > +@item s > +Samples count per value per channel In most other filters/filtersources, s+size is used for dimensions, d+duration for time, and n for an amount/number of frames/samples or so. Might be a good idea to align with this. And use aliases (i.e. implement both "s" and "size"). > +static const AVOption dumpwave_options[] = { > + { "d", "set width and height", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, FLAGS }, > + { "s", "set number of samples per value per channel", OFFSET(s), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, > + { "json", "set json dump file", OFFSET(json), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, > + { NULL } [...] > +static av_cold int init(AVFilterContext *ctx) > +{ > + DumpWaveContext *dumpwave = ctx->priv; > + if(!dumpwave->s) { > + dumpwave->is_disabled = 1; > + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value config\n"); > + } > + return 0; I don't like the idea of having to provide the "s" parameter. Is there really no useful default? And now, if s=0, what does the filter do? Just sit around? Couldn't it fail instead? Apart from that: "if (" is the bracket style ffmpeg uses. > + if (dumpwave->json && !(dump_fp = av_fopen_utf8(dumpwave->json, "w"))) > + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); I would appreciate evaluation of errno and printing the appropriate string (using av_strerror(), I believe). > + switch (inlink->format) { > + case AV_SAMPLE_FMT_DBLP: As Kyle hinted: Can this not force a conversion (implicit insertion of aformat filter) to e.g. double by only supporting this format, and reducing this switch to one or two cases? (The filter's output isn't really meant for transparent reuse anyway? af_volumedetect e.g. also supports only one, meaning its output can be a different format than its input.) It's also really hard to go through and later to maintain. It the big switch/case remains, one or two code macros would be appropriate. > + for (i = 0; i < buf->nb_samples; i++) { > + for (c = 0; c < channels; c++, src++) > + calc_db_rms(dumpwave, *src); > + }} I believe the curly brackets need to be placed differently. > + .description = NULL_IF_CONFIG_SMALL("Dumps RMS amplitude to JSON file"), Imperative, i.e. "Dump RMS ...". > +FATE_AFILTER-$(call FILTERDEMDEC, DUMPWAVE, WAV, PCM_S16LE) += fate-filter-dumpwave > +fate-filter-dumpwave: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav > +fate-filter-dumpwave: CMD = ffmpeg -i $(SRC) -af dumpwave=d=1800x140:s=147:json=$(TARGET_PATH)/tests/data/fate/filter-dumpwave.out -f null - && cat $(TARGET_PATH)/tests/data/fate/filter-dumpwave.out > + If you need to implement all formats, you might want to test them all. Just a thought. Moritz
Hello 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: > On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com wrote: > >> +@table @option >> +@item d >> +Dimensions @code{WxH}. >> +@code{W} - number of data values in json, values will be scaled according to @code{H}. >> +The default value is @var{640x480} >> + >> +@item s >> +Samples count per value per channel > > In most other filters/filtersources, s+size is used for dimensions, > d+duration for time, and n for an amount/number of frames/samples or > so. Might be a good idea to align with this. And use aliases (i.e. > implement both "s" and "size"). > >> +static const AVOption dumpwave_options[] = { >> + { "d", "set width and height", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, FLAGS }, >> + { "s", "set number of samples per value per channel", OFFSET(s), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >> + { "json", "set json dump file", OFFSET(json), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, >> + { NULL } > [...] >> +static av_cold int init(AVFilterContext *ctx) >> +{ >> + DumpWaveContext *dumpwave = ctx->priv; >> + if(!dumpwave->s) { >> + dumpwave->is_disabled = 1; >> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value config\n"); >> + } >> + return 0; > > I don't like the idea of having to provide the "s" parameter. Is there > really no useful default? > > And now, if s=0, what does the filter do? Just sit around? Couldn't it > fail instead? > > Apart from that: > "if (" is the bracket style ffmpeg uses. > >> + if (dumpwave->json && !(dump_fp = av_fopen_utf8(dumpwave->json, "w"))) >> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); > > I would appreciate evaluation of errno and printing the appropriate > string (using av_strerror(), I believe). > >> + switch (inlink->format) { >> + case AV_SAMPLE_FMT_DBLP: > > As Kyle hinted: Can this not force a conversion (implicit insertion of > aformat filter) to e.g. double by only supporting this format, and > reducing this switch to one or two cases? (The filter's output isn't > really meant for transparent reuse anyway? af_volumedetect e.g. also > supports only one, meaning its output can be a different format than > its input.) It's also really hard to go through and later to maintain. > It the big switch/case remains, one or two code macros would be > appropriate. I checked solution used in volumedetect and couldn't find a way to read across formats. How would you implement such macros? Since version 3.2 astats filter uses same approach for reading different formats and as far as I know macros harder to debug >> + for (i = 0; i < buf->nb_samples; i++) { >> + for (c = 0; c < channels; c++, src++) >> + calc_db_rms(dumpwave, *src); >> + }} > > I believe the curly brackets need to be placed differently. > >> + .description = NULL_IF_CONFIG_SMALL("Dumps RMS amplitude to JSON file"), > > Imperative, i.e. "Dump RMS ...". > >> +FATE_AFILTER-$(call FILTERDEMDEC, DUMPWAVE, WAV, PCM_S16LE) += fate-filter-dumpwave >> +fate-filter-dumpwave: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav >> +fate-filter-dumpwave: CMD = ffmpeg -i $(SRC) -af dumpwave=d=1800x140:s=147:json=$(TARGET_PATH)/tests/data/fate/filter-dumpwave.out -f null - && cat $(TARGET_PATH)/tests/data/fate/filter-dumpwave.out >> + > > If you need to implement all formats, you might want to test them all. > Just a thought. > > Moritz > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: > Hello > > 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: >> On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com wrote: >> >>> +@table @option >>> +@item d >>> +Dimensions @code{WxH}. >>> +@code{W} - number of data values in json, values will be scaled >>> according to @code{H}. >>> +The default value is @var{640x480} >>> + >>> +@item s >>> +Samples count per value per channel >> >> In most other filters/filtersources, s+size is used for dimensions, >> d+duration for time, and n for an amount/number of frames/samples or >> so. Might be a good idea to align with this. And use aliases (i.e. >> implement both "s" and "size"). >> >>> +static const AVOption dumpwave_options[] = { >>> + { "d", "set width and height", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, >>> {.str = "640x480"}, 0, 0, FLAGS }, >>> + { "s", "set number of samples per value per channel", OFFSET(s), >>> AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >>> + { "json", "set json dump file", OFFSET(json), AV_OPT_TYPE_STRING, { >>> .str = NULL }, 0, 0, FLAGS }, >>> + { NULL } >> [...] >>> +static av_cold int init(AVFilterContext *ctx) >>> +{ >>> + DumpWaveContext *dumpwave = ctx->priv; >>> + if(!dumpwave->s) { >>> + dumpwave->is_disabled = 1; >>> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value config\n"); >>> + } >>> + return 0; >> >> I don't like the idea of having to provide the "s" parameter. Is there >> really no useful default? >> >> And now, if s=0, what does the filter do? Just sit around? Couldn't it >> fail instead? >> >> Apart from that: >> "if (" is the bracket style ffmpeg uses. >> >>> + if (dumpwave->json && !(dump_fp = av_fopen_utf8(dumpwave->json, >>> "w"))) >>> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); >> >> I would appreciate evaluation of errno and printing the appropriate >> string (using av_strerror(), I believe). >> >>> + switch (inlink->format) { >>> + case AV_SAMPLE_FMT_DBLP: >> >> As Kyle hinted: Can this not force a conversion (implicit insertion of >> aformat filter) to e.g. double by only supporting this format, and >> reducing this switch to one or two cases? (The filter's output isn't >> really meant for transparent reuse anyway? af_volumedetect e.g. also >> supports only one, meaning its output can be a different format than >> its input.) It's also really hard to go through and later to maintain. >> It the big switch/case remains, one or two code macros would be >> appropriate. > > I checked solution used in volumedetect and couldn't find a way to > read across formats. I do not understand what you are trying to do. > How would you implement such macros? Since version 3.2 astats filter > uses same approach for reading different formats and as far as I know > macros harder to debug astats is using all formats because of numerous reasons. astats uses raw values, your filter just convert each raw value to float representation. This filter does not need support for so many formats, it could support just s16.
> On 11 Jan 2018, at 22:41, Paul B Mahol <onemda@gmail.com> wrote: > >> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >> Hello >> >> 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: >>>> On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com wrote: >>>> >>>> +@table @option >>>> +@item d >>>> +Dimensions @code{WxH}. >>>> +@code{W} - number of data values in json, values will be scaled >>>> according to @code{H}. >>>> +The default value is @var{640x480} >>>> + >>>> +@item s >>>> +Samples count per value per channel >>> >>> In most other filters/filtersources, s+size is used for dimensions, >>> d+duration for time, and n for an amount/number of frames/samples or >>> so. Might be a good idea to align with this. And use aliases (i.e. >>> implement both "s" and "size"). >>> >>>> +static const AVOption dumpwave_options[] = { >>>> + { "d", "set width and height", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, >>>> {.str = "640x480"}, 0, 0, FLAGS }, >>>> + { "s", "set number of samples per value per channel", OFFSET(s), >>>> AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >>>> + { "json", "set json dump file", OFFSET(json), AV_OPT_TYPE_STRING, { >>>> .str = NULL }, 0, 0, FLAGS }, >>>> + { NULL } >>> [...] >>>> +static av_cold int init(AVFilterContext *ctx) >>>> +{ >>>> + DumpWaveContext *dumpwave = ctx->priv; >>>> + if(!dumpwave->s) { >>>> + dumpwave->is_disabled = 1; >>>> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value config\n"); >>>> + } >>>> + return 0; >>> >>> I don't like the idea of having to provide the "s" parameter. Is there >>> really no useful default? >>> >>> And now, if s=0, what does the filter do? Just sit around? Couldn't it >>> fail instead? >>> >>> Apart from that: >>> "if (" is the bracket style ffmpeg uses. >>> >>>> + if (dumpwave->json && !(dump_fp = av_fopen_utf8(dumpwave->json, >>>> "w"))) >>>> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); >>> >>> I would appreciate evaluation of errno and printing the appropriate >>> string (using av_strerror(), I believe). >>> >>>> + switch (inlink->format) { >>>> + case AV_SAMPLE_FMT_DBLP: >>> >>> As Kyle hinted: Can this not force a conversion (implicit insertion of >>> aformat filter) to e.g. double by only supporting this format, and >>> reducing this switch to one or two cases? (The filter's output isn't >>> really meant for transparent reuse anyway? af_volumedetect e.g. also >>> supports only one, meaning its output can be a different format than >>> its input.) It's also really hard to go through and later to maintain. >>> It the big switch/case remains, one or two code macros would be >>> appropriate. >> >> I checked solution used in volumedetect and couldn't find a way to >> read across formats. > > I do not understand what you are trying to do. Sorry, I'm trying to add support for 8, 16, 24, 32, 64 bit sample formats >> How would you implement such macros? Since version 3.2 astats filter >> uses same approach for reading different formats and as far as I know >> macros harder to debug > > astats is using all formats because of numerous reasons. astats uses raw values, > your filter just convert each raw value to float representation. Is this wrong, as I'd like to have high precision? > This filter does not need support for so many formats, it could > support just s16. > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: > >> On 11 Jan 2018, at 22:41, Paul B Mahol <onemda@gmail.com> wrote: >> >>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>> Hello >>> >>> 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: >>>>> On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com >>>>> wrote: >>>>> >>>>> +@table @option >>>>> +@item d >>>>> +Dimensions @code{WxH}. >>>>> +@code{W} - number of data values in json, values will be scaled >>>>> according to @code{H}. >>>>> +The default value is @var{640x480} >>>>> + >>>>> +@item s >>>>> +Samples count per value per channel >>>> >>>> In most other filters/filtersources, s+size is used for dimensions, >>>> d+duration for time, and n for an amount/number of frames/samples or >>>> so. Might be a good idea to align with this. And use aliases (i.e. >>>> implement both "s" and "size"). >>>> >>>>> +static const AVOption dumpwave_options[] = { >>>>> + { "d", "set width and height", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, >>>>> {.str = "640x480"}, 0, 0, FLAGS }, >>>>> + { "s", "set number of samples per value per channel", OFFSET(s), >>>>> AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >>>>> + { "json", "set json dump file", OFFSET(json), AV_OPT_TYPE_STRING, >>>>> { >>>>> .str = NULL }, 0, 0, FLAGS }, >>>>> + { NULL } >>>> [...] >>>>> +static av_cold int init(AVFilterContext *ctx) >>>>> +{ >>>>> + DumpWaveContext *dumpwave = ctx->priv; >>>>> + if(!dumpwave->s) { >>>>> + dumpwave->is_disabled = 1; >>>>> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value >>>>> config\n"); >>>>> + } >>>>> + return 0; >>>> >>>> I don't like the idea of having to provide the "s" parameter. Is there >>>> really no useful default? >>>> >>>> And now, if s=0, what does the filter do? Just sit around? Couldn't it >>>> fail instead? >>>> >>>> Apart from that: >>>> "if (" is the bracket style ffmpeg uses. >>>> >>>>> + if (dumpwave->json && !(dump_fp = >>>>> av_fopen_utf8(dumpwave->json, >>>>> "w"))) >>>>> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); >>>> >>>> I would appreciate evaluation of errno and printing the appropriate >>>> string (using av_strerror(), I believe). >>>> >>>>> + switch (inlink->format) { >>>>> + case AV_SAMPLE_FMT_DBLP: >>>> >>>> As Kyle hinted: Can this not force a conversion (implicit insertion of >>>> aformat filter) to e.g. double by only supporting this format, and >>>> reducing this switch to one or two cases? (The filter's output isn't >>>> really meant for transparent reuse anyway? af_volumedetect e.g. also >>>> supports only one, meaning its output can be a different format than >>>> its input.) It's also really hard to go through and later to maintain. >>>> It the big switch/case remains, one or two code macros would be >>>> appropriate. >>> >>> I checked solution used in volumedetect and couldn't find a way to >>> read across formats. >> >> I do not understand what you are trying to do. > Sorry, I'm trying to add support for 8, 16, 24, 32, 64 bit sample formats >>> How would you implement such macros? Since version 3.2 astats filter >>> uses same approach for reading different formats and as far as I know >>> macros harder to debug >> >> astats is using all formats because of numerous reasons. astats uses raw >> values, >> your filter just convert each raw value to float representation. > Is this wrong, as I'd like to have high precision? For rendering to small size image?
> On 11 Jan 2018, at 23:02, Paul B Mahol <onemda@gmail.com> wrote: > >> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >> >>>> On 11 Jan 2018, at 22:41, Paul B Mahol <onemda@gmail.com> wrote: >>>> >>>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>>> Hello >>>> >>>> 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: >>>>>> On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com >>>>>> wrote: >>>>>> >>>>>> +@table @option >>>>>> +@item d >>>>>> +Dimensions @code{WxH}. >>>>>> +@code{W} - number of data values in json, values will be scaled >>>>>> according to @code{H}. >>>>>> +The default value is @var{640x480} >>>>>> + >>>>>> +@item s >>>>>> +Samples count per value per channel >>>>> >>>>> In most other filters/filtersources, s+size is used for dimensions, >>>>> d+duration for time, and n for an amount/number of frames/samples or >>>>> so. Might be a good idea to align with this. And use aliases (i.e. >>>>> implement both "s" and "size"). >>>>> >>>>>> +static const AVOption dumpwave_options[] = { >>>>>> + { "d", "set width and height", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, >>>>>> {.str = "640x480"}, 0, 0, FLAGS }, >>>>>> + { "s", "set number of samples per value per channel", OFFSET(s), >>>>>> AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >>>>>> + { "json", "set json dump file", OFFSET(json), AV_OPT_TYPE_STRING, >>>>>> { >>>>>> .str = NULL }, 0, 0, FLAGS }, >>>>>> + { NULL } >>>>> [...] >>>>>> +static av_cold int init(AVFilterContext *ctx) >>>>>> +{ >>>>>> + DumpWaveContext *dumpwave = ctx->priv; >>>>>> + if(!dumpwave->s) { >>>>>> + dumpwave->is_disabled = 1; >>>>>> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value >>>>>> config\n"); >>>>>> + } >>>>>> + return 0; >>>>> >>>>> I don't like the idea of having to provide the "s" parameter. Is there >>>>> really no useful default? >>>>> >>>>> And now, if s=0, what does the filter do? Just sit around? Couldn't it >>>>> fail instead? >>>>> >>>>> Apart from that: >>>>> "if (" is the bracket style ffmpeg uses. >>>>> >>>>>> + if (dumpwave->json && !(dump_fp = >>>>>> av_fopen_utf8(dumpwave->json, >>>>>> "w"))) >>>>>> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); >>>>> >>>>> I would appreciate evaluation of errno and printing the appropriate >>>>> string (using av_strerror(), I believe). >>>>> >>>>>> + switch (inlink->format) { >>>>>> + case AV_SAMPLE_FMT_DBLP: >>>>> >>>>> As Kyle hinted: Can this not force a conversion (implicit insertion of >>>>> aformat filter) to e.g. double by only supporting this format, and >>>>> reducing this switch to one or two cases? (The filter's output isn't >>>>> really meant for transparent reuse anyway? af_volumedetect e.g. also >>>>> supports only one, meaning its output can be a different format than >>>>> its input.) It's also really hard to go through and later to maintain. >>>>> It the big switch/case remains, one or two code macros would be >>>>> appropriate. >>>> >>>> I checked solution used in volumedetect and couldn't find a way to >>>> read across formats. >>> >>> I do not understand what you are trying to do. >> Sorry, I'm trying to add support for 8, 16, 24, 32, 64 bit sample formats >>>> How would you implement such macros? Since version 3.2 astats filter >>>> uses same approach for reading different formats and as far as I know >>>> macros harder to debug >>> >>> astats is using all formats because of numerous reasons. astats uses raw >>> values, >>> your filter just convert each raw value to float representation. >> Is this wrong, as I'd like to have high precision? > > For rendering to small size image? Data can be used for analysis as well. Any size I would say as user may define size > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: > >> On 11 Jan 2018, at 23:02, Paul B Mahol <onemda@gmail.com> wrote: >> >>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>> >>>>> On 11 Jan 2018, at 22:41, Paul B Mahol <onemda@gmail.com> wrote: >>>>> >>>>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>>>> Hello >>>>> >>>>> 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: >>>>>>> On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com >>>>>>> wrote: >>>>>>> >>>>>>> +@table @option >>>>>>> +@item d >>>>>>> +Dimensions @code{WxH}. >>>>>>> +@code{W} - number of data values in json, values will be scaled >>>>>>> according to @code{H}. >>>>>>> +The default value is @var{640x480} >>>>>>> + >>>>>>> +@item s >>>>>>> +Samples count per value per channel >>>>>> >>>>>> In most other filters/filtersources, s+size is used for dimensions, >>>>>> d+duration for time, and n for an amount/number of frames/samples or >>>>>> so. Might be a good idea to align with this. And use aliases (i.e. >>>>>> implement both "s" and "size"). >>>>>> >>>>>>> +static const AVOption dumpwave_options[] = { >>>>>>> + { "d", "set width and height", OFFSET(w), >>>>>>> AV_OPT_TYPE_IMAGE_SIZE, >>>>>>> {.str = "640x480"}, 0, 0, FLAGS }, >>>>>>> + { "s", "set number of samples per value per channel", >>>>>>> OFFSET(s), >>>>>>> AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >>>>>>> + { "json", "set json dump file", OFFSET(json), >>>>>>> AV_OPT_TYPE_STRING, >>>>>>> { >>>>>>> .str = NULL }, 0, 0, FLAGS }, >>>>>>> + { NULL } >>>>>> [...] >>>>>>> +static av_cold int init(AVFilterContext *ctx) >>>>>>> +{ >>>>>>> + DumpWaveContext *dumpwave = ctx->priv; >>>>>>> + if(!dumpwave->s) { >>>>>>> + dumpwave->is_disabled = 1; >>>>>>> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value >>>>>>> config\n"); >>>>>>> + } >>>>>>> + return 0; >>>>>> >>>>>> I don't like the idea of having to provide the "s" parameter. Is >>>>>> there >>>>>> really no useful default? >>>>>> >>>>>> And now, if s=0, what does the filter do? Just sit around? Couldn't >>>>>> it >>>>>> fail instead? >>>>>> >>>>>> Apart from that: >>>>>> "if (" is the bracket style ffmpeg uses. >>>>>> >>>>>>> + if (dumpwave->json && !(dump_fp = >>>>>>> av_fopen_utf8(dumpwave->json, >>>>>>> "w"))) >>>>>>> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); >>>>>> >>>>>> I would appreciate evaluation of errno and printing the appropriate >>>>>> string (using av_strerror(), I believe). >>>>>> >>>>>>> + switch (inlink->format) { >>>>>>> + case AV_SAMPLE_FMT_DBLP: >>>>>> >>>>>> As Kyle hinted: Can this not force a conversion (implicit insertion >>>>>> of >>>>>> aformat filter) to e.g. double by only supporting this format, and >>>>>> reducing this switch to one or two cases? (The filter's output isn't >>>>>> really meant for transparent reuse anyway? af_volumedetect e.g. also >>>>>> supports only one, meaning its output can be a different format than >>>>>> its input.) It's also really hard to go through and later to >>>>>> maintain. >>>>>> It the big switch/case remains, one or two code macros would be >>>>>> appropriate. >>>>> >>>>> I checked solution used in volumedetect and couldn't find a way to >>>>> read across formats. >>>> >>>> I do not understand what you are trying to do. >>> Sorry, I'm trying to add support for 8, 16, 24, 32, 64 bit sample >>> formats >>>>> How would you implement such macros? Since version 3.2 astats filter >>>>> uses same approach for reading different formats and as far as I know >>>>> macros harder to debug >>>> >>>> astats is using all formats because of numerous reasons. astats uses >>>> raw >>>> values, >>>> your filter just convert each raw value to float representation. >>> Is this wrong, as I'd like to have high precision? >> >> For rendering to small size image? > Data can be used for analysis as well. Any size I would say as user may > define size Than use floats.
-- Best regards, Dmytro > On 11 Jan 2018, at 23:57, Paul B Mahol <onemda@gmail.com> wrote: > >> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >> >>>> On 11 Jan 2018, at 23:02, Paul B Mahol <onemda@gmail.com> wrote: >>>> >>>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>>> >>>>>> On 11 Jan 2018, at 22:41, Paul B Mahol <onemda@gmail.com> wrote: >>>>>> >>>>>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>>>>> Hello >>>>>> >>>>>> 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: >>>>>>>> On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com >>>>>>>> wrote: >>>>>>>> >>>>>>>> +@table @option >>>>>>>> +@item d >>>>>>>> +Dimensions @code{WxH}. >>>>>>>> +@code{W} - number of data values in json, values will be scaled >>>>>>>> according to @code{H}. >>>>>>>> +The default value is @var{640x480} >>>>>>>> + >>>>>>>> +@item s >>>>>>>> +Samples count per value per channel >>>>>>> >>>>>>> In most other filters/filtersources, s+size is used for dimensions, >>>>>>> d+duration for time, and n for an amount/number of frames/samples or >>>>>>> so. Might be a good idea to align with this. And use aliases (i.e. >>>>>>> implement both "s" and "size"). >>>>>>> >>>>>>>> +static const AVOption dumpwave_options[] = { >>>>>>>> + { "d", "set width and height", OFFSET(w), >>>>>>>> AV_OPT_TYPE_IMAGE_SIZE, >>>>>>>> {.str = "640x480"}, 0, 0, FLAGS }, >>>>>>>> + { "s", "set number of samples per value per channel", >>>>>>>> OFFSET(s), >>>>>>>> AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >>>>>>>> + { "json", "set json dump file", OFFSET(json), >>>>>>>> AV_OPT_TYPE_STRING, >>>>>>>> { >>>>>>>> .str = NULL }, 0, 0, FLAGS }, >>>>>>>> + { NULL } >>>>>>> [...] >>>>>>>> +static av_cold int init(AVFilterContext *ctx) >>>>>>>> +{ >>>>>>>> + DumpWaveContext *dumpwave = ctx->priv; >>>>>>>> + if(!dumpwave->s) { >>>>>>>> + dumpwave->is_disabled = 1; >>>>>>>> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value >>>>>>>> config\n"); >>>>>>>> + } >>>>>>>> + return 0; >>>>>>> >>>>>>> I don't like the idea of having to provide the "s" parameter. Is >>>>>>> there >>>>>>> really no useful default? >>>>>>> >>>>>>> And now, if s=0, what does the filter do? Just sit around? Couldn't >>>>>>> it >>>>>>> fail instead? >>>>>>> >>>>>>> Apart from that: >>>>>>> "if (" is the bracket style ffmpeg uses. >>>>>>> >>>>>>>> + if (dumpwave->json && !(dump_fp = >>>>>>>> av_fopen_utf8(dumpwave->json, >>>>>>>> "w"))) >>>>>>>> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); >>>>>>> >>>>>>> I would appreciate evaluation of errno and printing the appropriate >>>>>>> string (using av_strerror(), I believe). >>>>>>> >>>>>>>> + switch (inlink->format) { >>>>>>>> + case AV_SAMPLE_FMT_DBLP: >>>>>>> >>>>>>> As Kyle hinted: Can this not force a conversion (implicit insertion >>>>>>> of >>>>>>> aformat filter) to e.g. double by only supporting this format, and >>>>>>> reducing this switch to one or two cases? (The filter's output isn't >>>>>>> really meant for transparent reuse anyway? af_volumedetect e.g. also >>>>>>> supports only one, meaning its output can be a different format than >>>>>>> its input.) It's also really hard to go through and later to >>>>>>> maintain. >>>>>>> It the big switch/case remains, one or two code macros would be >>>>>>> appropriate. >>>>>> >>>>>> I checked solution used in volumedetect and couldn't find a way to >>>>>> read across formats. >>>>> >>>>> I do not understand what you are trying to do. >>>> Sorry, I'm trying to add support for 8, 16, 24, 32, 64 bit sample >>>> formats >>>>>> How would you implement such macros? Since version 3.2 astats filter >>>>>> uses same approach for reading different formats and as far as I know >>>>>> macros harder to debug >>>>> >>>>> astats is using all formats because of numerous reasons. astats uses >>>>> raw >>>>> values, >>>>> your filter just convert each raw value to float representation. >>>> Is this wrong, as I'd like to have high precision? >>> >>> For rendering to small size image? >> Data can be used for analysis as well. Any size I would say as user may >> define size > > Than use floats. Ok, will give it a try > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Hi, > On 12 Jan 2018, at 00:20, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: > -- > Best regards, > Dmytro > >> On 11 Jan 2018, at 23:57, Paul B Mahol <onemda@gmail.com> wrote: >> >>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>> >>>>> On 11 Jan 2018, at 23:02, Paul B Mahol <onemda@gmail.com> wrote: >>>>> >>>>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>>>> >>>>>>> On 11 Jan 2018, at 22:41, Paul B Mahol <onemda@gmail.com> wrote: >>>>>>> >>>>>>> On 1/11/18, Dmitry Gumenyuk <dmitry.gumenyuk@gmail.com> wrote: >>>>>>> Hello >>>>>>> >>>>>>> 2018-01-10 11:33 GMT+01:00 Moritz Barsnick <barsnick@gmx.net>: >>>>>>>>> On Wed, Jan 10, 2018 at 08:58:05 +0100, dmitry.gumenyuk@gmail.com >>>>>>>>> wrote: >>>>>>>>> >>>>>>>>> +@table @option >>>>>>>>> +@item d >>>>>>>>> +Dimensions @code{WxH}. >>>>>>>>> +@code{W} - number of data values in json, values will be scaled >>>>>>>>> according to @code{H}. >>>>>>>>> +The default value is @var{640x480} >>>>>>>>> + >>>>>>>>> +@item s >>>>>>>>> +Samples count per value per channel >>>>>>>> >>>>>>>> In most other filters/filtersources, s+size is used for dimensions, >>>>>>>> d+duration for time, and n for an amount/number of frames/samples or >>>>>>>> so. Might be a good idea to align with this. And use aliases (i.e. >>>>>>>> implement both "s" and "size"). >>>>>>>> >>>>>>>>> +static const AVOption dumpwave_options[] = { >>>>>>>>> + { "d", "set width and height", OFFSET(w), >>>>>>>>> AV_OPT_TYPE_IMAGE_SIZE, >>>>>>>>> {.str = "640x480"}, 0, 0, FLAGS }, >>>>>>>>> + { "s", "set number of samples per value per channel", >>>>>>>>> OFFSET(s), >>>>>>>>> AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, >>>>>>>>> + { "json", "set json dump file", OFFSET(json), >>>>>>>>> AV_OPT_TYPE_STRING, >>>>>>>>> { >>>>>>>>> .str = NULL }, 0, 0, FLAGS }, >>>>>>>>> + { NULL } >>>>>>>> [...] >>>>>>>>> +static av_cold int init(AVFilterContext *ctx) >>>>>>>>> +{ >>>>>>>>> + DumpWaveContext *dumpwave = ctx->priv; >>>>>>>>> + if(!dumpwave->s) { >>>>>>>>> + dumpwave->is_disabled = 1; >>>>>>>>> + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value >>>>>>>>> config\n"); >>>>>>>>> + } >>>>>>>>> + return 0; >>>>>>>> >>>>>>>> I don't like the idea of having to provide the "s" parameter. Is >>>>>>>> there >>>>>>>> really no useful default? >>>>>>>> >>>>>>>> And now, if s=0, what does the filter do? Just sit around? Couldn't >>>>>>>> it >>>>>>>> fail instead? >>>>>>>> >>>>>>>> Apart from that: >>>>>>>> "if (" is the bracket style ffmpeg uses. >>>>>>>> >>>>>>>>> + if (dumpwave->json && !(dump_fp = >>>>>>>>> av_fopen_utf8(dumpwave->json, >>>>>>>>> "w"))) >>>>>>>>> + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); >>>>>>>> >>>>>>>> I would appreciate evaluation of errno and printing the appropriate >>>>>>>> string (using av_strerror(), I believe). >>>>>>>> >>>>>>>>> + switch (inlink->format) { >>>>>>>>> + case AV_SAMPLE_FMT_DBLP: >>>>>>>> >>>>>>>> As Kyle hinted: Can this not force a conversion (implicit insertion >>>>>>>> of >>>>>>>> aformat filter) to e.g. double by only supporting this format, and >>>>>>>> reducing this switch to one or two cases? (The filter's output isn't >>>>>>>> really meant for transparent reuse anyway? af_volumedetect e.g. also >>>>>>>> supports only one, meaning its output can be a different format than >>>>>>>> its input.) It's also really hard to go through and later to >>>>>>>> maintain. >>>>>>>> It the big switch/case remains, one or two code macros would be >>>>>>>> appropriate. >>>>>>> >>>>>>> I checked solution used in volumedetect and couldn't find a way to >>>>>>> read across formats. >>>>>> >>>>>> I do not understand what you are trying to do. >>>>> Sorry, I'm trying to add support for 8, 16, 24, 32, 64 bit sample >>>>> formats >>>>>>> How would you implement such macros? Since version 3.2 astats filter >>>>>>> uses same approach for reading different formats and as far as I know >>>>>>> macros harder to debug >>>>>> >>>>>> astats is using all formats because of numerous reasons. astats uses >>>>>> raw >>>>>> values, >>>>>> your filter just convert each raw value to float representation. >>>>> Is this wrong, as I'd like to have high precision? >>>> >>>> For rendering to small size image? >>> Data can be used for analysis as well. Any size I would say as user may >>> define size >> >> Than use floats. > Ok, will give it a try Here is updated patch >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
diff --git a/Changelog b/Changelog index 61075b3392..40fd624449 100644 --- a/Changelog +++ b/Changelog @@ -38,6 +38,7 @@ version <next>: - Removed the ffserver program - Removed the ffmenc and ffmdec muxer and demuxer - VideoToolbox HEVC encoder and hwaccel +- dumpwave audio filter version 3.4: diff --git a/doc/filters.texi b/doc/filters.texi index d29c40080f..98e54aec6e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2529,6 +2529,29 @@ Optional. It should have a value much less than 1 (e.g. 0.05 or 0.02) and is used to prevent clipping. @end table +@section dumpwave +Dumps RMS amplitude to JSON file. +Converts samples to decibels and calculates RMS (Root-Mean-Square) audio power scaled to desired values. + +@table @option +@item d +Dimensions @code{WxH}. +@code{W} - number of data values in json, values will be scaled according to @code{H}. +The default value is @var{640x480} + +@item s +Samples count per value per channel + +@item json +Path to json file +@end table + +For example, to generate RMS amplitude for 44.1 kHz 6 seconds length audio +with dimensions @var{1800x140}, samples count @code{44100*6/1800=147} and store it to @var{/tmp/out.json}, you might use: +@example +dumpwave=d=1800x140:s=147:json=/tmp/out.json +@end example + @section dynaudnorm Dynamic Audio Normalizer. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ef4729dd3f..2ffbc9497a 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -87,6 +87,7 @@ OBJS-$(CONFIG_COMPENSATIONDELAY_FILTER) += af_compensationdelay.o OBJS-$(CONFIG_CROSSFEED_FILTER) += af_crossfeed.o OBJS-$(CONFIG_CRYSTALIZER_FILTER) += af_crystalizer.o OBJS-$(CONFIG_DCSHIFT_FILTER) += af_dcshift.o +OBJS-$(CONFIG_DUMPWAVE_FILTER) += af_dumpwave.o OBJS-$(CONFIG_DYNAUDNORM_FILTER) += af_dynaudnorm.o OBJS-$(CONFIG_EARWAX_FILTER) += af_earwax.o OBJS-$(CONFIG_EBUR128_FILTER) += f_ebur128.o diff --git a/libavfilter/af_dumpwave.c b/libavfilter/af_dumpwave.c new file mode 100644 index 0000000000..35b970af6c --- /dev/null +++ b/libavfilter/af_dumpwave.c @@ -0,0 +1,285 @@ +/* + * Copyright (c) 2017 Dmytro Humeniuk + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * waveform audio filter – dumps RMS amplitude to JSON file + */ + +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" +#include "libavutil/opt.h" +#include "libavutil/parseutils.h" +#include "avfilter.h" +#include "formats.h" +#include "audio.h" +#include "internal.h" + +typedef struct DumpWaveContext { + const AVClass *class; /**< class for AVOptions */ + int w; /**< number of data values in json */ + int h; /**< values will be scaled according to provided */ + int is_disabled; /**< disable filter in case it's misconfigured */ + int i; /**< index of value */ + char *json; /**< path to json */ + char *str; /**< comma separated values */ + double *values; /**< scaling factors */ + int64_t s; /**< samples per value per channel */ + int64_t n; /**< current number of samples counted */ + int64_t max_samples; /**< samples per value */ + double sum; /**< sum of the squared samples per value */ +} DumpWaveContext; + +#define OFFSET(x) offsetof(DumpWaveContext, x) +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM + +static const AVOption dumpwave_options[] = { + { "d", "set width and height", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, FLAGS }, + { "s", "set number of samples per value per channel", OFFSET(s), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, FLAGS }, + { "json", "set json dump file", OFFSET(json), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(dumpwave); + +static av_cold int init(AVFilterContext *ctx) +{ + DumpWaveContext *dumpwave = ctx->priv; + if(!dumpwave->s) { + dumpwave->is_disabled = 1; + av_log(ctx, AV_LOG_ERROR, "Invalid samples per value config\n"); + } + return 0; +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + DumpWaveContext *dumpwave = ctx->priv; + av_freep(&dumpwave->str); + av_freep(&dumpwave->values); +} + +static int config_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + DumpWaveContext *dumpwave = ctx->priv; + const int width = dumpwave->w; + dumpwave->values = av_realloc(NULL, width * sizeof(double)); + dumpwave->str = av_realloc(NULL, width * sizeof(int)); + dumpwave->max_samples = dumpwave->s * outlink->channels; + + return 0; +} + +static int dumpwave_request_frame(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + DumpWaveContext *dumpwave = ctx->priv; + const int width = dumpwave->w; + const int height = dumpwave->h; + char *p, *result = dumpwave->str; + FILE *dump_fp = NULL; + + AVFilterLink *inlink = ctx->inputs[0]; + int ret; + + ret = ff_request_frame(inlink); + + if (ret == AVERROR_EOF && !dumpwave->is_disabled) { + p = result; + + for(int i = 0; i < width; i++) + p += sprintf(p, "%d,", av_clip(dumpwave->h * dumpwave->values[i], 0, dumpwave->h)); + + p[-1] = '\0'; //removing trailing comma + + if (dumpwave->json && !(dump_fp = av_fopen_utf8(dumpwave->json, "w"))) + av_log(ctx, AV_LOG_WARNING, "Flushing dump failed\n"); + + if (dump_fp) { + fprintf(dump_fp, "{\"width\":%d,\"height\":%d,\"samples\":[%s]}", width, height, result); + fclose(dump_fp); + } + } + + return ret; +} + +/** + * Converts sample to dB and calculates root mean squared value + */ +static inline void calc_db_rms(DumpWaveContext *dumpwave, double smpl) +{ + if (smpl != 0) + smpl = (20 * log10(fabs(smpl)) + 60) / 60; + + dumpwave->sum += smpl * smpl; + + if (dumpwave->n++ == dumpwave->max_samples) { + dumpwave->values[dumpwave->i++] = av_clipd(sqrt(dumpwave->sum / dumpwave->max_samples), 0, 1.0); + dumpwave->sum = dumpwave->n = 0; + } +} + +static int dumpwave_filter_frame(AVFilterLink *inlink, AVFrame *buf) +{ + AVFilterContext *ctx = inlink->dst; + DumpWaveContext *dumpwave = ctx->priv; + const int channels = inlink->channels; + + int i, c; + + if (dumpwave->is_disabled) + goto end; + + switch (inlink->format) { + case AV_SAMPLE_FMT_DBLP: + for (c = 0; c < channels; c++) { + const double *src = (const double *)buf->extended_data[c]; + + for (i = 0; i < buf->nb_samples; i++, src++) + calc_db_rms(dumpwave, *src); + } + break; + case AV_SAMPLE_FMT_DBL: { + const double *src = (const double *)buf->extended_data[0]; + + for (i = 0; i < buf->nb_samples; i++) { + for (c = 0; c < channels; c++, src++) + calc_db_rms(dumpwave, *src); + }} + break; + case AV_SAMPLE_FMT_FLTP: + for (c = 0; c < channels; c++) { + const float *src = (const float *)buf->extended_data[c]; + + for (i = 0; i < buf->nb_samples; i++, src++) + calc_db_rms(dumpwave, *src); + } + break; + case AV_SAMPLE_FMT_FLT: { + const float *src = (const float *)buf->extended_data[0]; + + for (i = 0; i < buf->nb_samples; i++) { + for (c = 0; c < channels; c++, src++) + calc_db_rms(dumpwave, *src); + }} + break; + case AV_SAMPLE_FMT_S64P: + for (c = 0; c < channels; c++) { + const int64_t *src = (const int64_t *)buf->extended_data[c]; + + for (i = 0; i < buf->nb_samples; i++, src++) + calc_db_rms(dumpwave, *src / (double)INT64_MAX); + } + break; + case AV_SAMPLE_FMT_S64: { + const int64_t *src = (const int64_t *)buf->extended_data[0]; + + for (i = 0; i < buf->nb_samples; i++) { + for (c = 0; c < channels; c++, src++) + calc_db_rms(dumpwave, *src / (double)INT64_MAX); + }} + break; + case AV_SAMPLE_FMT_S32P: + for (c = 0; c < channels; c++) { + const int32_t *src = (const int32_t *)buf->extended_data[c]; + + for (i = 0; i < buf->nb_samples; i++, src++) + calc_db_rms(dumpwave, *src / (double)INT32_MAX); + } + break; + case AV_SAMPLE_FMT_S32: { + const int32_t *src = (const int32_t *)buf->extended_data[0]; + + for (i = 0; i < buf->nb_samples; i++) { + for (c = 0; c < channels; c++, src++) + calc_db_rms(dumpwave, *src / (double)INT32_MAX); + }} + break; + case AV_SAMPLE_FMT_S16P: + for (c = 0; c < channels; c++) { + const int16_t *src = (const int16_t *)buf->extended_data[c]; + + for (i = 0; i < buf->nb_samples; i++, src++) + calc_db_rms(dumpwave, *src / (double)INT16_MAX); + } + break; + case AV_SAMPLE_FMT_S16: { + const int16_t *src = (const int16_t *)buf->extended_data[0]; + + for (i = 0; i < buf->nb_samples; i++) { + for (c = 0; c < channels; c++, src++) + calc_db_rms(dumpwave, *src / (double)INT16_MAX); + }} + break; + case AV_SAMPLE_FMT_U8P: + for (c = 0; c < channels; c++) { + const int8_t *src = (const int8_t *)buf->extended_data[c]; + + for (i = 0; i < buf->nb_samples; i++, src++) + calc_db_rms(dumpwave, *src / (double)INT8_MAX); + } + break; + case AV_SAMPLE_FMT_U8: { + const int8_t *src = (const int8_t *)buf->extended_data[0]; + + for (i = 0; i < buf->nb_samples; i++) { + for (c = 0; c < channels; c++, src++) + calc_db_rms(dumpwave, *src / (double)INT8_MAX); + }} + break; + default: + break; + } +end: + return ff_filter_frame(ctx->outputs[0], buf); +} + +static const AVFilterPad dumpwave_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_frame = dumpwave_filter_frame, + }, + { NULL } +}; + +static const AVFilterPad dumpwave_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .request_frame = dumpwave_request_frame, + .config_props = config_output + }, + { NULL } +}; + +AVFilter ff_af_dumpwave = { + .name = "dumpwave", + .description = NULL_IF_CONFIG_SMALL("Dumps RMS amplitude to JSON file"), + .init = init, + .uninit = uninit, + .priv_size = sizeof(DumpWaveContext), + .inputs = dumpwave_inputs, + .outputs = dumpwave_outputs, + .priv_class = &dumpwave_class, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 42516bbdf9..2539ee9e9a 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -98,6 +98,7 @@ static void register_all(void) REGISTER_FILTER(CROSSFEED, crossfeed, af); REGISTER_FILTER(CRYSTALIZER, crystalizer, af); REGISTER_FILTER(DCSHIFT, dcshift, af); + REGISTER_FILTER(DUMPWAVE, dumpwave, af); REGISTER_FILTER(DYNAUDNORM, dynaudnorm, af); REGISTER_FILTER(EARWAX, earwax, af); REGISTER_FILTER(EBUR128, ebur128, af); diff --git a/libavfilter/version.h b/libavfilter/version.h index 0f11721822..ca096962bb 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 7 -#define LIBAVFILTER_VERSION_MINOR 11 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MINOR 12 +#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index bd8b3d3c35..9896527122 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -340,6 +340,10 @@ fate-filter-hdcd-s32p: CMD = md5 -i $(SRC) -af hdcd -f s32le fate-filter-hdcd-s32p: CMP = oneline fate-filter-hdcd-s32p: REF = 0c5513e83eedaa10ab6fac9ddc173cf5 +FATE_AFILTER-$(call FILTERDEMDEC, DUMPWAVE, WAV, PCM_S16LE) += fate-filter-dumpwave +fate-filter-dumpwave: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav +fate-filter-dumpwave: CMD = ffmpeg -i $(SRC) -af dumpwave=d=1800x140:s=147:json=$(TARGET_PATH)/tests/data/fate/filter-dumpwave.out -f null - && cat $(TARGET_PATH)/tests/data/fate/filter-dumpwave.out + FATE_AFILTER-yes += fate-filter-formats fate-filter-formats: libavfilter/tests/formats$(EXESUF) fate-filter-formats: CMD = run libavfilter/tests/formats @@ -347,3 +351,4 @@ fate-filter-formats: CMD = run libavfilter/tests/formats FATE_SAMPLES_AVCONV += $(FATE_AFILTER_SAMPLES-yes) FATE_FFMPEG += $(FATE_AFILTER-yes) fate-afilter: $(FATE_AFILTER-yes) $(FATE_AFILTER_SAMPLES-yes) + diff --git a/tests/ref/fate/filter-dumpwave b/tests/ref/fate/filter-dumpwave new file mode 100644 index 0000000000..bd07098ef8 --- /dev/null +++ b/tests/ref/fate/filter-dumpwave @@ -0,0 +1 @@ +{"width":1800,"height":140,"samples":[103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,102,104,103,102,104,104,102,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,102,104,103,102,104,104,102,103,104,102,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,102,104,104,102,103,104,102,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,102,103,104,102,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,102,104,103,103,103,104,103,103,104,103,103,104,103,103,104,103,103,103,104,103,103,104,103,103,104,103,102,104,103,102,104,103,102,103,104,102,103,104,103,101,104,105,104,103,102,104,104,102,102,103,104,104,103,103,104,104,102,103,103,103,104,103,103,103,104,102,104,103,103,104,103,103,103,103,103,103,103,103,103,104,103,103,103,104,103,103,103,103,104,103,103,103,103,103,103,103,104,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,104,104,103,103,103,103,103,103,103,103,103,103,103,102,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,104,103,103,105,103,103,103,103,103,103,104,103,103,103,104,103,103,103,104,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,106,106,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,100,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,96,98,100,97,99,98,97,97,97,96,98,97,98,97,99,98,97,95,98,97,98,101,96,95,96,94,97,99,99,95,98,96,98,98,98,98,98,98,99,98,96,97,99,97,98,99,99,99,96,98,97,98,98,99,99,97,100,95,98,97,99,94,98,96,99,98,97,99,98,97,96,98,95,96,97,100,99,96,99,97,97,97,99,98,97,96,97,97,99,99,100,95,99,98,95,96,99,97,99,99,95,98,96,97,96,99,96,97,98,96,97,95,97,99,99,96,99,96,98,98,96,96,97,96,99,98,97,98,100,98,100,96,98,98,99,97,99,99,99,97,99,97,99,99,98,96,100,97,95,112,119,121,121,118,122,122,120,121,123,121,120,118,121,120,121,123,124,122,120,124,121,122,121,120,121,122,122,120,119,118,122,121,122,121,120,123,120,121,122,121,121,119,120,119,120,121,121,120,122,120,122,123,122,124,122,120,122,121,121,119,122,123,123,122,120,121,119,123,121,125,119,121,119,120,121,121,121,123,122,120,122,123,120,120,123,121,119,122,120,122,123,121,123,121,121,123,120,120,121,123,123,120,122,122,119,120,122,122,120,122,122,120,123,120,121,120,121,121,123,120,121,119,122,117,124,122,122,119,120,122,121,121,123,121,120,121,122,120,121,123,121,119,123,120,123,125,121,120,121,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,104,103,104,103,103,104,103,104,103,104,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,104,103,104,102,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,104,103,103,103,104,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,104,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,103,104,103,103,103,103,103,103,103,102,81,75,74,74,75,76,78,78,79,81,81,82,84,84,84,86,86,86,87,88,88,88,90,88,89,90,89,89,90,89,89,89,89,88,88,89,87,87,87,85,85,85,83,83,82,81,80,79,78,76,75,75,73,75,80,76,79,75,74,74,76,77,77,79,81,80,82,84,83,84,86,86,86,88,87,87,89,89,88,89,90,89,89,90,89,89,90,89,88,89,88,87,87,87,86,85,86,84,83,83,81,80,80,78,77,76,75,73,74,76,81,81,76,73,74,75,76,76,79,79,80,82,83,83,84,85,85,86,87,87,87,89,88,88,90,89,89,89,90,89,89,90,89,89,89,88,87,88,87,86,86,86,84,84,84,82,81,81,78,77,77,75,74,74,74,79,76,79,74,74,75,75,76,78,78,80,81,82,82,84,84,85,86,87,86,87,89,88,88,90,89,89,90,89,89,90,89,89,89,89,88,88,89,87,86,87,85,84,85,83,82,82,81,79,79,78,75,75,75,73,75,81,80,76,74,74,75,76,77,78,79,81,81,82,84,84,84,86,86,86,88,88,87,88,89,88,89,90,89,89,90,89,89,90,89,88,89,88,87,87,87,85,85,85,83,83,83,81,80,80,78,76,75,75,73,74,78,76,79,75,74,74,75,77,77,79,80,80,82,84,83,84,86,85,86,88,87,87,89,89,88,89,90,89,89,90,89,89,90,89,88,89,88,87,88,87,86,86,85,84,83,83,81,80,80,78,77,76,75,74,74,75,81,80,77,73,74,75,75,76,79,79,80,82,82,83,84,85,85,86,87,87,87,89,88,88,90,89,89,90,90,89,89,90,89,89,89,88,88,88,87,86,86,85,84,84,83,82,81,81,79,78,78,75,74,75,74,77,76,80,75,74,74,75,76,78,78,80,81,81,82,84,84,85,86,87,86,87,88,88,88,90,89,89,90,89,89,90,89,89,89,89,88,88,89,87,87,87,85,84,85,83,82,82,81,79,79,78,76,75,75,73,75,80,81,76,75,74,75,76,77,78,79,81,81,82,84,84,84,86,86,86,88,88,87,89,89,88,89,90,89,89,90,89,89,90,89,88,89,88,87,87,87,85,85,86,83,83,83,81,80,80,78,77,76,75,73,74,77,78,79,76,74,74,75,76,77,79,80,80,82,83,83,84,86,85,86,88,87,87,89,88,88,90,89,89,90,90,89,89,90,89,88,89,88,87,88,87,86,86,85,84,84,83,81,81,80,78,77,77,75,74,74,75,80,81,78,74,74,75,75,76,79,79,80,82,82,82,85,85,85,86,87,86,87,89,88,88,90,89,89,90,89,89,90,90,89,89,89,88,88,88,87,86,87,85,84,0,0,0,0,0,0,0]}