[FFmpeg-devel] [PATCH] lavfi: add perms and aperms filters.
Stefano Sabatini
stefasab at gmail.com
Thu Mar 14 22:47:28 CET 2013
On date Thursday 2013-03-14 21:22:46 +0100, Clément Bœsch encoded:
> On Wed, Mar 13, 2013 at 06:43:28AM +0100, Clément Bœsch wrote:
> > On Wed, Mar 13, 2013 at 06:08:53AM +0100, Clément Bœsch wrote:
> > > TODO: bump micro
> > > TODO: Changelog
> > > ---
> > > Is kind of helpful to test with gradfun, hue, etc. Could be part of FATE. I
> > > could also add a random setting if someone is interested (note that if part of
> > > FATE, it will be useful to have a real random, but that might be problematic in
> > > a library)
We have several pseudo-RNG routines, but then I'm not sure what you're
writing about.
> > > ---
> > > doc/filters.texi | 21 +++++++
> > > libavfilter/Makefile | 2 +
> > > libavfilter/allfilters.c | 2 +
> > > libavfilter/f_perms.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++
> > > 4 files changed, 165 insertions(+)
> > > create mode 100644 libavfilter/f_perms.c
> > >
> >
> > New version with the random and simplifications.
> >
>
> Ping.
>
> I moved to the AVOption, and changed various things. Comments welcome. I'd
> like to push this in the next days so we can consider integrating them to
> FATE for various filters.
>
> --
> Clément B.
> From 5c9107ad2911b757073c9092278c7f00bb2fb213 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
> Date: Wed, 13 Mar 2013 05:59:20 +0100
> Subject: [PATCH] lavfi: add perms and aperms filters.
>
> TODO: bump micro
> TODO: Changelog
> ---
> doc/filters.texi | 37 ++++++++++
> libavfilter/Makefile | 2 +
> libavfilter/allfilters.c | 2 +
> libavfilter/f_perms.c | 183 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 224 insertions(+)
> create mode 100644 libavfilter/f_perms.c
>
> diff --git a/doc/filters.texi b/doc/filters.texi
> index 3c5955e..41903c9 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -662,6 +662,7 @@ afade=t=out:ss=875:d=25
> @end example
> @end itemize
>
> + at anchor{aformat}
> @section aformat
>
> Set output format constraints for the input audio. The framework will
> @@ -3028,6 +3029,7 @@ framework.
>
> The filter does not take parameters.
>
> + at anchor{format}
> @section format
>
> Convert the input video to one of the specified pixel formats.
> @@ -6085,6 +6087,41 @@ tools.
>
> Below is a description of the currently available multimedia filters.
>
> + at section aperms, perms
> +Set read/write permissions for the output frames.
Nit++: empty line after @section ...
> +
> +These filters are mainly aimed at developers to test direct path in the
> +following filter in the filtergraph.
> +
> +The filters accept parameters as a list of @var{key}=@var{value} pairs,
> +separated by ":". If the key of the first options is omitted, the argument is
> +assumed to be the @var{mode}.
> +
> +A description of the accepted parameters follows.
> +
> + at table @option
> + at item mode
> +Select the permissions mode.
> +
It accepts the following values:
> + at table @option
@samp is the latest fashion out there.
> + at item none
> +Do nothing. This is the default.
> + at item ro
> +Set all the output frames read-only.
> + at item rw
> +Set all the output frames directly writable.
> + at item toggle
> +Make the frame read-only if writable, and writable if read-only.
> + at item random
> +Set each output frame read-only or writable randomly.
> + at end table
> + at end table
> +
> +Note: in case of auto-inserted filter between the permission filter and the
> +following one, the permission might not be received as expected in that
> +following filter. Inserting a @ref{format} or @ref{aformat} filter before the
> +perms/aperms filter can avoid this problem.
> +
> @section aselect, select
> Select frames to pass in output.
>
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index a1d58d3..b8b991c 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -80,6 +80,7 @@ OBJS-$(CONFIG_HIGHPASS_FILTER) += af_biquads.o
> OBJS-$(CONFIG_JOIN_FILTER) += af_join.o
> OBJS-$(CONFIG_LOWPASS_FILTER) += af_biquads.o
> OBJS-$(CONFIG_PAN_FILTER) += af_pan.o
> +OBJS-$(CONFIG_APERMS_FILTER) += f_perms.o
order
> OBJS-$(CONFIG_RESAMPLE_FILTER) += af_resample.o
> OBJS-$(CONFIG_SILENCEDETECT_FILTER) += af_silencedetect.o
> OBJS-$(CONFIG_TREBLE_FILTER) += af_biquads.o
> @@ -139,6 +140,7 @@ OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
> OBJS-$(CONFIG_OCV_FILTER) += vf_libopencv.o
> OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
> OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
> +OBJS-$(CONFIG_PERMS_FILTER) += f_perms.o
> OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
> OBJS-$(CONFIG_PP_FILTER) += vf_pp.o
> OBJS-$(CONFIG_REMOVELOGO_FILTER) += bbox.o lswsutils.o lavfutils.o vf_removelogo.o
> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> index 51d7996..ed5eb1b 100644
> --- a/libavfilter/allfilters.c
> +++ b/libavfilter/allfilters.c
> @@ -75,6 +75,7 @@ void avfilter_register_all(void)
> REGISTER_FILTER(HIGHPASS, highpass, af);
> REGISTER_FILTER(JOIN, join, af);
> REGISTER_FILTER(LOWPASS, lowpass, af);
> + REGISTER_FILTER(APERMS, aperms, af);
ditto
> REGISTER_FILTER(PAN, pan, af);
> REGISTER_FILTER(RESAMPLE, resample, af);
> REGISTER_FILTER(SILENCEDETECT, silencedetect, af);
> @@ -135,6 +136,7 @@ void avfilter_register_all(void)
> REGISTER_FILTER(OCV, ocv, vf);
> REGISTER_FILTER(OVERLAY, overlay, vf);
> REGISTER_FILTER(PAD, pad, vf);
> + REGISTER_FILTER(PERMS, perms, vf);
> REGISTER_FILTER(PIXDESCTEST, pixdesctest, vf);
> REGISTER_FILTER(PP, pp, vf);
> REGISTER_FILTER(REMOVELOGO, removelogo, vf);
> diff --git a/libavfilter/f_perms.c b/libavfilter/f_perms.c
> new file mode 100644
> index 0000000..2fcdda8
> --- /dev/null
> +++ b/libavfilter/f_perms.c
> @@ -0,0 +1,183 @@
> +/*
> + * 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
> + */
> +
> +#include "libavutil/lfg.h"
> +#include "libavutil/opt.h"
> +#include "libavutil/random_seed.h"
> +#include "audio.h"
> +#include "video.h"
> +
> +enum mode {
> + MODE_DONOTHING,
nit: MODE_NONE for internal consistency
> + MODE_RO,
> + MODE_RW,
> + MODE_TOGGLE,
> + MODE_RANDOM,
> + NB_MODES
> +};
> +
> +typedef struct {
> + const AVClass *class;
> + AVLFG lfg;
> + enum mode mode;
> +} PermsContext;
> +
> +#define OFFSET(x) offsetof(PermsContext, x)
> +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM
> +
> +static const AVOption options[] = {
> + { "mode", "select permissions mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = MODE_DONOTHING}, MODE_DONOTHING, NB_MODES-1, FLAGS, "mode" },
> + { "none", "do nothing", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_DONOTHING}, INT_MIN, INT_MAX, FLAGS, "mode" },
> + { "ro", "set all output frames read-only", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_RO}, INT_MIN, INT_MAX, FLAGS, "mode" },
> + { "rw", "set all output frames writable", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_RW}, INT_MIN, INT_MAX, FLAGS, "mode" },
> + { "toggle", "switch permissions", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_TOGGLE}, INT_MIN, INT_MAX, FLAGS, "mode" },
> + { "random", "set permissions randomly", 0, AV_OPT_TYPE_CONST, {.i64 = MODE_RANDOM}, INT_MIN, INT_MAX, FLAGS, "mode" },
> + { NULL }
> +};
> +
> +static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class)
> +{
> + int ret;
> + PermsContext *perms = ctx->priv;
> + static const char *shorthand[] = { "mode", NULL };
> +
> + perms->class = class;
> + av_opt_set_defaults(perms);
> +
> + if ((ret = av_opt_set_from_string(perms, args, shorthand, "=", ":")) < 0)
> + return ret;
> +
> + if (perms->mode == MODE_RANDOM)
> + av_lfg_init(&perms->lfg, av_get_random_seed());
a "seed" option may be useful for testing purposes
> +
> + av_opt_free(perms);
> + return 0;
> +}
> +
> +enum perm { RO, RW };
> +static const char *perm_str[2] = { "RO", "RW" };
> +
> +static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
> +{
> + int ret;
> + AVFilterContext *ctx = inlink->dst;
> + PermsContext *perms = ctx->priv;
> + AVFrame *out = frame;
> + enum perm in_perm = av_frame_is_writable(frame) ? RW : RO;
> + enum perm out_perm;
> +
> + switch (perms->mode) {
> + case MODE_TOGGLE: out_perm = in_perm == RO ? RW : RO; break;
> + case MODE_RANDOM: out_perm = av_lfg_get(&perms->lfg) & 1 ? RW : RO; break;
> + case MODE_RO: out_perm = RO; break;
> + case MODE_RW: out_perm = RW; break;
> + default: out_perm = in_perm; break;
> + }
> +
> + av_log(ctx, AV_LOG_VERBOSE, "%s -> %s%s\n",
> + perm_str[in_perm], perm_str[out_perm],
> + in_perm == out_perm ? " (no-op)" : "");
> +
> + if (in_perm == RO && out_perm == RW) {
> + if ((ret = av_frame_make_writable(frame)) < 0)
> + return ret;
> + } else if (in_perm == RW && out_perm == RO) {
> + out = av_frame_clone(frame);
> + if (!out)
> + return AVERROR(ENOMEM);
> + av_frame_free(&frame);
> + }
> +
> + return ff_filter_frame(ctx->outputs[0], out);
> +}
[...]
LGTM and no more silly comments from me.
--
FFmpeg = Fantastic and Fiendish Mastering Problematic Experimenting God
More information about the ffmpeg-devel
mailing list