diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2013-12-26 13:39:49 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2014-08-20 22:18:38 +0200 |
| commit | e35fb5add45ca27ab0568f3e0c2828246e8ff5c9 (patch) | |
| tree | a68a238e0a6abcc2c36dfb6838f06dd67425b916 | |
| parent | ba29746feb541f5cde4154795041ff2faa15bedf (diff) | |
| download | ffmpeg-e35fb5add45ca27ab0568f3e0c2828246e8ff5c9.tar.gz | |
avfilter/showwaves: add split_channels option
| -rw-r--r-- | doc/filters.texi | 3 | ||||
| -rw-r--r-- | libavfilter/avf_showwaves.c | 14 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 2d39fca6c7..47a1587ada 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10830,6 +10830,9 @@ is not explicitly specified. Set the (approximate) output frame rate. This is done by setting the option @var{n}. Default value is "25". +@item split_channels +Set if channels should be drawn separately or overlap. Default value is 0. + @end table @subsection Examples diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 3ffc4a260b..804badd555 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -51,6 +51,7 @@ typedef struct { int n; int sample_count_mod; enum ShowWavesMode mode; + int split_channels; void (*draw_sample)(uint8_t *buf, int height, int linesize, int16_t sample, int16_t *prev_y, int intensity); } ShowWavesContext; @@ -69,6 +70,7 @@ static const AVOption showwaves_options[] = { { "n", "set how many samples to show in the same point", OFFSET(n), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, FLAGS }, { "rate", "set video rate", OFFSET(rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, { "r", "set video rate", OFFSET(rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, 0, FLAGS }, + { "split_channels", "draw channels separately", OFFSET(split_channels), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, FLAGS }, { NULL } }; @@ -241,7 +243,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) int nb_channels = inlink->channels; int i, j, ret = 0; const int n = showwaves->n; - const int x = 255 / (nb_channels * n); /* multiplication factor, pre-computed to avoid in-loop divisions */ + const int x = 255 / ((showwaves->split_channels ? 1 : nb_channels) * n); /* multiplication factor, pre-computed to avoid in-loop divisions */ + const int ch_height = showwaves->split_channels ? outlink->h / nb_channels : outlink->h; /* draw data in the buffer */ for (i = 0; i < nb_samples; i++) { @@ -260,10 +263,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) for (j = 0; j < outlink->h; j++) memset(outpicref->data[0] + j * linesize, 0, outlink->w); } - for (j = 0; j < nb_channels; j++) - showwaves->draw_sample(outpicref->data[0] + showwaves->buf_idx, - outlink->h, linesize, *p++, + for (j = 0; j < nb_channels; j++) { + uint8_t *buf = outpicref->data[0] + showwaves->buf_idx; + if (showwaves->split_channels) + buf += j*ch_height*linesize; + showwaves->draw_sample(buf, ch_height, linesize, *p++, &showwaves->buf_idy[j], x); + } showwaves->sample_count_mod++; if (showwaves->sample_count_mod == n) { diff --git a/libavfilter/version.h b/libavfilter/version.h index 2003b76ba1..28c510e023 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 5 #define LIBAVFILTER_VERSION_MINOR 0 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |