On Sun, Aug 03, 2014 at 07:31:43PM +0200, Nicolas George wrote: > Signed-off-by: Nicolas George <geo...@nsup.org> > --- > doc/filters.texi | 15 +++++++++++-- > libavfilter/avf_showspectrum.c | 50 > +++++++++++++++++++++++++++--------------- > 2 files changed, 45 insertions(+), 20 deletions(-) >
Cool. I have a local patch to do something similar in showwaves. I'll try
to submit it in a few days.
> diff --git a/doc/filters.texi b/doc/filters.texi
> index c5caa77..8739e84 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -10589,8 +10589,19 @@ the "Video size" section in the ffmpeg-utils manual.
> Default value is
> @code{640x512}.
>
> @item slide
> -Specify if the spectrum should slide along the window. Default value is
> -@code{0}.
> +Specify how the spectrum should slide along the window.
> +
> +It accepts the following values:
> +@table @samp
> +@item replace
> +the samples start again on the left when they reach the right
> +@item scroll
> +the samples scroll from right to left
> +@item fullframe
> +frames are only produced when the samples reach the right
> +@end table
> +
> +Default value is @code{replace}.
>
> @item mode
> Specify display mode.
> diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
> index b354571..56759ff 100644
> --- a/libavfilter/avf_showspectrum.c
> +++ b/libavfilter/avf_showspectrum.c
> @@ -38,6 +38,7 @@ enum DisplayMode { COMBINED, SEPARATE, NB_MODES };
> enum DisplayScale { LINEAR, SQRT, CBRT, LOG, NB_SCALES };
> enum ColorMode { CHANNEL, INTENSITY, NB_CLMODES };
> enum WindowFunc { WFUNC_NONE, WFUNC_HANN, WFUNC_HAMMING, WFUNC_BLACKMAN,
> NB_WFUNC };
> +enum SlideMode { REPLACE, SCROLL, FULLFRAME, NB_SLIDES };
>
> typedef struct {
> const AVClass *class;
> @@ -66,7 +67,10 @@ typedef struct {
> static const AVOption showspectrum_options[] = {
> { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str =
> "640x512"}, 0, 0, FLAGS },
> { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str =
> "640x512"}, 0, 0, FLAGS },
> - { "slide", "set sliding mode", OFFSET(sliding), AV_OPT_TYPE_INT, {.i64 =
> 0}, 0, 1, FLAGS },
> + { "slide", "set sliding mode", OFFSET(sliding), AV_OPT_TYPE_INT, {.i64 =
> 0}, 0, NB_SLIDES, FLAGS, "slide" },
> + { "replace", "replace old colums with new", 0, AV_OPT_TYPE_CONST,
> {.i64=REPLACE}, 0, 0, FLAGS, "slide" },
> + { "scroll", "scroll from right to left", 0, AV_OPT_TYPE_CONST,
> {.i64=SCROLL}, 0, 0, FLAGS, "slide" },
> + { "fullframe", "return full frames", 0, AV_OPT_TYPE_CONST,
> {.i64=FULLFRAME}, 0, 0, FLAGS, "slide" },
> { "mode", "set channel display mode", OFFSET(mode), AV_OPT_TYPE_INT,
> {.i64=COMBINED}, COMBINED, NB_MODES-1, FLAGS, "mode" },
> { "combined", "combined mode", 0, AV_OPT_TYPE_CONST,
> {.i64=COMBINED}, 0, 0, FLAGS, "mode" },
> { "separate", "separate mode", 0, AV_OPT_TYPE_CONST,
> {.i64=SEPARATE}, 0, 0, FLAGS, "mode" },
> @@ -244,6 +248,8 @@ static int config_output(AVFilterLink *outlink)
> s->xpos = 0;
>
> outlink->frame_rate = av_make_q(inlink->sample_rate, win_size);
> + if (s->sliding == FULLFRAME)
> + outlink->frame_rate.den *= outlink->w;
>
> inlink->min_samples = inlink->max_samples = inlink->partial_buf_size =
> win_size;
> @@ -257,27 +263,27 @@ static int config_output(AVFilterLink *outlink)
> return 0;
> }
>
> -inline static int push_frame(AVFilterLink *outlink)
> -{
> - ShowSpectrumContext *s = outlink->src->priv;
> -
> - s->xpos++;
> - if (s->xpos >= outlink->w)
> - s->xpos = 0;
> - s->req_fullfilled = 1;
> -
> - return ff_filter_frame(outlink, av_frame_clone(s->outpicref));
> -}
> -
> static int request_frame(AVFilterLink *outlink)
> {
> ShowSpectrumContext *s = outlink->src->priv;
> AVFilterLink *inlink = outlink->src->inputs[0];
> + unsigned i;
> int ret;
>
> s->req_fullfilled = 0;
> do {
> ret = ff_request_frame(inlink);
> + if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 &&
> + s->outpicref) {
> + for (i = 0; i < outlink->h; i++) {
> + memset(s->outpicref->data[0] + i * s->outpicref->linesize[0]
> + s->xpos, 0, outlink->w - s->xpos);
> + memset(s->outpicref->data[1] + i * s->outpicref->linesize[1]
> + s->xpos, 128, outlink->w - s->xpos);
> + memset(s->outpicref->data[2] + i * s->outpicref->linesize[2]
> + s->xpos, 128, outlink->w - s->xpos);
> + }
> + ret = ff_filter_frame(outlink, s->outpicref);
> + s->outpicref = NULL;
> + s->req_fullfilled = 1;
> + }
> } while (!s->req_fullfilled && ret >= 0);
>
> return ret;
> @@ -440,7 +446,7 @@ static int plot_spectrum_column(AVFilterLink *inlink,
> AVFrame *insamples)
> }
>
> /* copy to output */
> - if (s->sliding) {
> + if (s->sliding == SCROLL) {
> for (plane = 0; plane < 3; plane++) {
> for (y = 0; y < outlink->h; y++) {
> uint8_t *p = outpicref->data[plane] +
> @@ -460,10 +466,18 @@ static int plot_spectrum_column(AVFilterLink *inlink,
> AVFrame *insamples)
> }
> }
>
> - outpicref->pts = insamples->pts;
> - ret = push_frame(outlink);
> - if (ret < 0)
> - return ret;
> + if (s->sliding != FULLFRAME || s->xpos == 0)
> + outpicref->pts = insamples->pts;
> +
> + s->xpos++;
> + if (s->xpos >= outlink->w)
> + s->xpos = 0;
> + if (s->sliding != FULLFRAME || s->xpos == 0) {
> + s->req_fullfilled = 1;
> + ret = ff_filter_frame(outlink, av_frame_clone(s->outpicref));
> + if (ret < 0)
> + return ret;
> + }
>
> return win_size;
LGTM
--
Clément B.
pgpioKeu2ZhLp.pgp
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
