[FFmpeg-devel] [PATCH 1/2] libavfilter: add vf_hue.c
Stefano Sabatini
stefasab at gmail.com
Sun Aug 12 19:10:38 CEST 2012
On date Sunday 2012-08-12 13:26:17 +0200, Jérémy Tran encoded:
> This is a port of the MPlayer hue filter (libmpcodecs/vf_hue.c)
>
> Signed-off-by: Jérémy Tran <tran.jeremy.av at gmail.com>
> ---
> doc/filters.texi | 20 +++++
> libavfilter/Makefile | 1 +
> libavfilter/allfilters.c | 1 +
> libavfilter/vf_hue.c | 194 +++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 216 insertions(+)
> create mode 100644 libavfilter/vf_hue.c
>
> diff --git a/doc/filters.texi b/doc/filters.texi
> index 18be723..71f6670 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -2187,6 +2187,26 @@ a float number which specifies chroma temporal strength, defaults to
> @var{luma_tmp}*@var{chroma_spatial}/@var{luma_spatial}
> @end table
>
> + at section hue
> +
> +Modify the hue and/or the saturation of the input.
> +
> +The filter supports the following syntaxes:
> + at example
> +# hue = 100 ; saturation = 1
> +ffmpeg -i in.avi -vf hue=100:1
> +
> +# same command but using named options
> +ffmpeg -i in.avi -vf hue=h=100:s=1
> + at end example
> +
> + at table @option
> + at item hue
> +A float number that specifies the hue in the [-360;360] range, defaults to 0.0.
> + at item saturation
> +A float number that specifies the saturation in the [0;2] range, defaults to 1.0.
> + at end table
> +
Simpler:
This filter accepts the optional parameters: @var{hue}:@var{saturation}.
@var{hue} must be a float number that specifies the hue in the
[-360,360] range, and defaults to 0.0.
@var{saturation} must be a float number that specifies the saturation
in the [0,2] range, and defaults to 1.0.
> @section idet
>
> Interlaceing detect filter. This filter tries to detect if the input is
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index 727ab4e..66b5d52 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -98,6 +98,7 @@ OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o
> OBJS-$(CONFIG_GRADFUN_FILTER) += vf_gradfun.o
> OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
> OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
> +OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o
> OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o
> OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o
> OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o
> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> index 403383d..f097bcf 100644
> --- a/libavfilter/allfilters.c
> +++ b/libavfilter/allfilters.c
> @@ -88,6 +88,7 @@ void avfilter_register_all(void)
> REGISTER_FILTER (GRADFUN, gradfun, vf);
> REGISTER_FILTER (HFLIP, hflip, vf);
> REGISTER_FILTER (HQDN3D, hqdn3d, vf);
> + REGISTER_FILTER (HUE, hue, vf);
> REGISTER_FILTER (IDET, idet, vf);
> REGISTER_FILTER (LUT, lut, vf);
> REGISTER_FILTER (LUTRGB, lutrgb, vf);
> diff --git a/libavfilter/vf_hue.c b/libavfilter/vf_hue.c
> new file mode 100644
> index 0000000..8523e66
> --- /dev/null
> +++ b/libavfilter/vf_hue.c
> @@ -0,0 +1,194 @@
> +/*
> + * Copyright (c) 2003 Michael Niedermayer
> + * Copyright (c) 2012 Jeremy Tran
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 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 General Public License for more details.
> + *
> + * You should have received a copy of the GNU 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
> + * Apply a hue/saturation filter to the input video
> + * Ported from MPlayer libmpcodecs/vf_hue.c
> + */
> +
> +#include "libavutil/imgutils.h"
Is this required?
> +#include "libavutil/pixdesc.h"
> +
> +#include "avfilter.h"
> +#include "formats.h"
> +#include "internal.h"
> +#include "video.h"
> +
> +typedef struct {
> + float hue;
> + float saturation;
> + int hsub;
> + int vsub;
> + uint32_t hue_sin;
> + uint32_t hue_cos;
int32_t?
> +} HueContext;
> +
> +static av_cold int init(AVFilterContext *ctx, const char *args)
> +{
> + HueContext *hue = ctx->priv;
> + float h = 0, s = 1;
> + int32_t ret;
> + char c1 = 0, c2 = 0;
> +
> + if (args) {
> + ret = sscanf(args, "%f%c%f%c", &h, &c1, &s, &c2);
> + if (!ret || c1 != ':' || c2) {
> + av_log(ctx, AV_LOG_ERROR,
> + "Error parsing the options string: %s\n", args);
> + return AVERROR(EINVAL);
> + }
> + }
> +
> + if (s < 0 || s > 2) {
> + av_log(ctx, AV_LOG_ERROR,
> + "Invalid value for s:%0.1f : must be included in the range 0-2\n",
> + s);
> + return AVERROR(EINVAL);
> + }
> +
> + /* Convert angle from degree to radian */
> + hue->hue = h * M_PI / 180;
> + hue->saturation = s;
> +
> + return 0;
> +}
> +
> +static int query_formats(AVFilterContext *ctx)
> +{
> + static const enum PixelFormat pix_fmts[] = {
> + PIX_FMT_YUV444P, PIX_FMT_YUV422P,
> + PIX_FMT_YUV420P, PIX_FMT_YUV411P,
> + PIX_FMT_YUV410P, PIX_FMT_YUV440P,
> + PIX_FMT_YUVA420P,
> + PIX_FMT_NONE
> + };
> +
> + ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
> +
> + return 0;
> +}
> +
> +static int config_props(AVFilterLink *inlink)
> +{
> + HueContext *hue = inlink->dst->priv;
> + const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[inlink->format];
> +
> + hue->hsub = desc->log2_chroma_w;
> + hue->vsub = desc->log2_chroma_h;
> + /*
> + * Scale the value to the norm of the resulting (U,V) vector, that is
> + * the saturation.
> + * This will be useful in the process_chrominance function.
> + */
> + hue->hue_sin = rint(sin(hue->hue) * (1 << 16) * hue->saturation);
> + hue->hue_cos = rint(cos(hue->hue) * (1 << 16) * hue->saturation);
> +
> + return 0;
> +}
> +
> +static void process_chrominance(uint8_t *udst, uint8_t *vdst, const int dst_linesize,
> + uint8_t *usrc, uint8_t *vsrc, const int src_linesize,
> + int w, int h,
> + const int32_t c, const int32_t s)
> +{
> + uint32_t i;
> + uint32_t u, v;
int32_t
[...]
Should be OK otherwise (no need to send another patch), assuming that
the output is equivalent to mp=hue.
--
FFmpeg = Fostering and Free Mean Pure Evangelical Gadget
More information about the ffmpeg-devel
mailing list