virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

avfilter/avf_showwavespic: add filter mode

Browse Source
This commit is contained in:
Paul B Mahol
2020-07-17 14:25:13 +02:00
parent d363afb30e
commit 3a37aa597f
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/filters.texi
View File

@ -25483,6 +25483,20 @@ Draw every sample directly.
@end table @end table
Default value is @code{scale}. Default value is @code{scale}.
@item filter
Set the filter mode.
Available values are:
@table @samp
@item average
Use average samples values for each drawn sample.
@item peak
Use peak samples values for each drawn sample.
@end table
Default value is @code{average}.
@end table @end table
@subsection Examples @subsection Examples

21
libavfilter/avf_showwaves.c
View File

@ -57,6 +57,12 @@ enum ShowWavesDrawMode {
DRAW_NB, DRAW_NB,
}; };
enum ShowWavesFilterMode {
FILTER_AVERAGE,
FILTER_PEAK,
FILTER_NB,
};
struct frame_node { struct frame_node {
AVFrame *frame; AVFrame *frame;
struct frame_node *next; struct frame_node *next;
@ -77,6 +83,7 @@ typedef struct ShowWavesContext {
int scale; ///< ShowWavesScale int scale; ///< ShowWavesScale
int draw_mode; ///< ShowWavesDrawMode int draw_mode; ///< ShowWavesDrawMode
int split_channels; int split_channels;
int filter_mode;
uint8_t *fg; uint8_t *fg;
int (*get_h)(int16_t sample, int height); int (*get_h)(int16_t sample, int height);
@ -590,12 +597,21 @@ static int push_single_pic(AVFilterLink *outlink)
int64_t max_samples = col == outlink->w - 1 ? last_column_samples: column_max_samples; int64_t max_samples = col == outlink->w - 1 ? last_column_samples: column_max_samples;
int ch; int ch;
switch (showwaves->filter_mode) {
case FILTER_AVERAGE:
for (ch = 0; ch < nb_channels; ch++) for (ch = 0; ch < nb_channels; ch++)
sum[ch] += abs(p[ch + i*nb_channels]) << 1; sum[ch] += abs(p[ch + i*nb_channels]) << 1;
break;
case FILTER_PEAK:
for (ch = 0; ch < nb_channels; ch++)
sum[ch] = FFMAX(sum[ch], abs(p[ch + i*nb_channels]));
break;
}
n++; n++;
if (n == max_samples) { if (n == max_samples) {
for (ch = 0; ch < nb_channels; ch++) { for (ch = 0; ch < nb_channels; ch++) {
int16_t sample = sum[ch] / max_samples; int16_t sample = sum[ch] / (showwaves->filter_mode == FILTER_AVERAGE ? max_samples : 1);
uint8_t *buf = out->data[0] + col * pixstep; uint8_t *buf = out->data[0] + col * pixstep;
int h; int h;
@ -792,6 +808,9 @@ static const AVOption showwavespic_options[] = {
{ "draw", "set draw mode", OFFSET(draw_mode), AV_OPT_TYPE_INT, {.i64 = DRAW_SCALE}, 0, DRAW_NB-1, FLAGS, .unit="draw" }, { "draw", "set draw mode", OFFSET(draw_mode), AV_OPT_TYPE_INT, {.i64 = DRAW_SCALE}, 0, DRAW_NB-1, FLAGS, .unit="draw" },
{ "scale", "scale pixel values for each drawn sample", 0, AV_OPT_TYPE_CONST, {.i64=DRAW_SCALE}, .flags=FLAGS, .unit="draw"}, { "scale", "scale pixel values for each drawn sample", 0, AV_OPT_TYPE_CONST, {.i64=DRAW_SCALE}, .flags=FLAGS, .unit="draw"},
{ "full", "draw every pixel for sample directly", 0, AV_OPT_TYPE_CONST, {.i64=DRAW_FULL}, .flags=FLAGS, .unit="draw"}, { "full", "draw every pixel for sample directly", 0, AV_OPT_TYPE_CONST, {.i64=DRAW_FULL}, .flags=FLAGS, .unit="draw"},
{ "filter", "set filter mode", OFFSET(filter_mode), AV_OPT_TYPE_INT, {.i64 = FILTER_AVERAGE}, 0, FILTER_NB-1, FLAGS, .unit="filter" },
{ "average", "use average samples", 0, AV_OPT_TYPE_CONST, {.i64=FILTER_AVERAGE}, .flags=FLAGS, .unit="filter"},
{ "peak", "use peak samples", 0, AV_OPT_TYPE_CONST, {.i64=FILTER_PEAK}, .flags=FLAGS, .unit="filter"},
{ NULL } { NULL }
}; };