[FFmpeg-devel] [PATCH] hqdn3d libavfilter port
Stefano Sabatini
stefano.sabatini-lala
Tue Nov 23 19:50:41 CET 2010
On date Monday 2010-11-22 17:42:27 -0800, Baptiste Coudurier encoded:
> On 9/26/10 2:11 AM, Stefano Sabatini wrote:
> > On date Saturday 2010-09-25 17:09:33 -0700, Baptiste Coudurier encoded:
> >> On 9/25/10 4:56 PM, Stefano Sabatini wrote:
> >>> On date Saturday 2010-09-25 16:46:12 -0700, Baptiste Coudurier encoded:
> >>>> On 9/25/10 4:30 PM, Baptiste Coudurier wrote:
> >>> [...]
> >>>> Updated for latest svn.
> >>>>
> >>>> [...]
> >>
> >> Updated.
> >>
>
> Updated patch.
>
> --
> Baptiste COUDURIER
> Key fingerprint 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
> FFmpeg maintainer http://www.ffmpeg.org
> From 1f36c119637b0c2eef0452b4e0db3e0e9c650c11 Mon Sep 17 00:00:00 2001
> From: bcoudurier <baptiste.coudurier at gmail.com>
> Date: Sat, 25 Sep 2010 17:59:02 -0700
> Subject: [PATCH 01/13] HQDN3D video filter
>
> ---
> Changelog | 1 +
> doc/filters.texi | 25 ++++
> libavfilter/Makefile | 1 +
> libavfilter/allfilters.c | 1 +
> libavfilter/vf_hqdn3d.c | 351 ++++++++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 379 insertions(+), 0 deletions(-)
> create mode 100644 libavfilter/vf_hqdn3d.c
>
> diff --git a/Changelog b/Changelog
> index dc949cd..5d1b0d0 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -59,6 +59,7 @@ version <next>:
> - overlay filter added
> - rename aspect filter to setdar, and pixelaspect to setsar
> - IEC 61937 demuxer
> +- HQDN3D filter
Nit: "hqdn3d" should be less confusing.
>
>
> version 0.6:
> diff --git a/doc/filters.texi b/doc/filters.texi
> index 1cba2d6..ed0a4da 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -764,6 +764,31 @@ first, -1 to enable automatic detection.
>
> @end table
>
> + at section hqdn3d
> +
> +High precision/quality 3d denoise filter. This filter aims to reduce image noise producing smooth images and making still images really still (This should enhance compressibility.).
Nit: very long and line and weird format.
> +
> +Syntax:
> + at example
> +hqdn3d[@var{luma_spatial}[:@var{chroma_spatial}[:@var{luma_tmp}[:@var{chroma_tmp}]
> + at end example
I slightly prefer:
It accepts the following parameters:
@var{luma_spatial}:@var{chroma_spatial}...
> +
> + at table @option
> +
> + at item luma_spatial
> +spatial luma strength (default: 4)
> +
> + at item chroma_spatial
> +spatial chroma strength (default: 3)
> +
> + at item luma_tmp
> +luma temporal strength (default: 6)
> +
> + at item chroma_tmp
> +chroma temporal strength (default: luma_tmp*chroma_spatial/luma_spatial)
Please specify valid intervals if any, also mention they are *float*
values.
> +
> + at end table
> +
> @c man end VIDEO FILTERS
>
> @chapter Video Sources
> diff --git a/libavfilter/Makefile b/libavfilter/Makefile
> index a1c258b..f61cdc1 100644
> --- a/libavfilter/Makefile
> +++ b/libavfilter/Makefile
> @@ -28,6 +28,7 @@ OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o
> OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
> OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o
> OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
> +OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
> OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
> OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
> OBJS-$(CONFIG_OCV_SMOOTH_FILTER) += vf_libopencv.o
> diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
> index 98b305e..f623d68 100644
> --- a/libavfilter/allfilters.c
> +++ b/libavfilter/allfilters.c
> @@ -49,6 +49,7 @@ void avfilter_register_all(void)
> REGISTER_FILTER (FORMAT, format, vf);
> REGISTER_FILTER (FREI0R, frei0r, vf);
> REGISTER_FILTER (HFLIP, hflip, vf);
> + REGISTER_FILTER (HQDN3D, hqdn3d, vf);
> REGISTER_FILTER (NOFORMAT, noformat, vf);
> REGISTER_FILTER (NULL, null, vf);
> REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf);
> diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
> new file mode 100644
> index 0000000..7dcb673
> --- /dev/null
> +++ b/libavfilter/vf_hqdn3d.c
> @@ -0,0 +1,351 @@
> +/*
> + * Copyright (C) 2003 Daniel Moreno <comac at comac.darktech.org>
You may add your name here if you care.
> + *
> + * This file is part of FFmpeg, ported from MPlayer.
Please avoid this, put the information that the filter was ported from
libmpcodecs/vf_hqdn3d.c in the @file notice.
> + *
> + * 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.
> + */
Did you try to contact Daniel Moreno? Otherwise remember to set the
GPL deps in configure.
> +
> +/**
> + * @file
> + * high quality 3d video denoiser
> + */
> +
> +#include "avfilter.h"
> +#include "libavutil/pixdesc.h"
> +
> +#define PARAM1_DEFAULT 4.0
> +#define PARAM2_DEFAULT 3.0
> +#define PARAM3_DEFAULT 6.0
> +
> +typedef struct {
> + int Coefs[4][512*16];
> + unsigned int *Line;
> + unsigned short *Frame[3];
> + int hsub, vsub;
> +} HQDN3DContext;
> +
> +static inline unsigned int LowPassMul(unsigned int PrevMul, unsigned int CurrMul, int* Coef)
> +{
> + // int dMul= (PrevMul&0xFFFFFF)-(CurrMul&0xFFFFFF);
> + int dMul= PrevMul-CurrMul;
> + unsigned int d=((dMul+0x10007FF)>>12);
> + return CurrMul + Coef[d];
> +}
> +
> +static void deNoiseTemporal(unsigned char *Frame,
> + unsigned char *FrameDest,
> + unsigned short *FrameAnt,
> + int W, int H, int sStride, int dStride,
> + int *Temporal)
> +{
> + long X, Y;
> + unsigned int PixelDst;
> +
> + for (Y = 0; Y < H; Y++) {
> + for (X = 0; X < W; X++) {
> + PixelDst = LowPassMul(FrameAnt[X]<<8, Frame[X]<<16, Temporal);
> + FrameAnt[X] = ((PixelDst+0x1000007F)>>8);
> + FrameDest[X]= ((PixelDst+0x10007FFF)>>16);
> + }
> + Frame += sStride;
> + FrameDest += dStride;
> + FrameAnt += W;
> + }
> +}
> +
> +static void deNoiseSpacial(unsigned char *Frame,
> + unsigned char *FrameDest,
> + unsigned int *LineAnt,
> + int W, int H, int sStride, int dStride,
> + int *Horizontal, int *Vertical)
> +{
> + long X, Y;
> + long sLineOffs = 0, dLineOffs = 0;
> + unsigned int PixelAnt;
> + unsigned int PixelDst;
> +
> + /* First pixel has no left nor top neighbor. */
> + PixelDst = LineAnt[0] = PixelAnt = Frame[0]<<16;
> + FrameDest[0]= ((PixelDst+0x10007FFF)>>16);
> +
> + /* First line has no top neighbor, only left. */
> + for (X = 1; X < W; X++) {
> + PixelDst = LineAnt[X] = LowPassMul(PixelAnt, Frame[X]<<16, Horizontal);
> + FrameDest[X]= ((PixelDst+0x10007FFF)>>16);
> + }
> +
> + for (Y = 1; Y < H; Y++) {
> + unsigned int PixelAnt;
> + sLineOffs += sStride, dLineOffs += dStride;
> + /* First pixel on each line doesn't have previous pixel */
> + PixelAnt = Frame[sLineOffs]<<16;
> + PixelDst = LineAnt[0] = LowPassMul(LineAnt[0], PixelAnt, Vertical);
> + FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16);
> +
> + for (X = 1; X < W; X++) {
> + unsigned int PixelDst;
> + /* The rest are normal */
> + PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal);
> + PixelDst = LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical);
> + FrameDest[dLineOffs+X]= ((PixelDst+0x10007FFF)>>16);
> + }
> + }
> +}
> +
> +static void deNoise(unsigned char *Frame,
> + unsigned char *FrameDest,
> + unsigned int *LineAnt,
> + unsigned short **FrameAntPtr,
> + int W, int H, int sStride, int dStride,
> + int *Horizontal, int *Vertical, int *Temporal)
> +{
> + long X, Y;
> + long sLineOffs = 0, dLineOffs = 0;
> + unsigned int PixelAnt;
> + unsigned int PixelDst;
> + unsigned short* FrameAnt=(*FrameAntPtr);
> +
> + if (!FrameAnt) {
> + (*FrameAntPtr) = FrameAnt = av_malloc(W*H*sizeof(unsigned short));
> + for (Y = 0; Y < H; Y++) {
> + unsigned short* dst=&FrameAnt[Y*W];
> + unsigned char* src=Frame+Y*sStride;
> + for (X = 0; X < W; X++) dst[X]=src[X]<<8;
> + }
> + }
> +
> + if (!Horizontal[0] && !Vertical[0]) {
> + deNoiseTemporal(Frame, FrameDest, FrameAnt,
> + W, H, sStride, dStride, Temporal);
> + return;
> + }
> + if (!Temporal[0]) {
> + deNoiseSpacial(Frame, FrameDest, LineAnt,
> + W, H, sStride, dStride, Horizontal, Vertical);
> + return;
> + }
> +
> + /* First pixel has no left nor top neighbor. Only previous frame */
> + LineAnt[0] = PixelAnt = Frame[0]<<16;
> + PixelDst = LowPassMul(FrameAnt[0]<<8, PixelAnt, Temporal);
> + FrameAnt[0] = ((PixelDst+0x1000007F)>>8);
> + FrameDest[0]= ((PixelDst+0x10007FFF)>>16);
> +
> + /* First line has no top neighbor. Only left one for each pixel and
> + * last frame */
> + for (X = 1; X < W; X++) {
> + LineAnt[X] = PixelAnt = LowPassMul(PixelAnt, Frame[X]<<16, Horizontal);
> + PixelDst = LowPassMul(FrameAnt[X]<<8, PixelAnt, Temporal);
> + FrameAnt[X] = ((PixelDst+0x1000007F)>>8);
> + FrameDest[X]= ((PixelDst+0x10007FFF)>>16);
> + }
> +
> + for (Y = 1; Y < H; Y++) {
> + unsigned int PixelAnt;
> + unsigned short* LinePrev=&FrameAnt[Y*W];
> + sLineOffs += sStride, dLineOffs += dStride;
> + /* First pixel on each line doesn't have previous pixel */
> + PixelAnt = Frame[sLineOffs]<<16;
> + LineAnt[0] = LowPassMul(LineAnt[0], PixelAnt, Vertical);
> + PixelDst = LowPassMul(LinePrev[0]<<8, LineAnt[0], Temporal);
> + LinePrev[0] = ((PixelDst+0x1000007F)>>8);
> + FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16);
> +
> + for (X = 1; X < W; X++) {
> + unsigned int PixelDst;
> + /* The rest are normal */
> + PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal);
> + LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical);
> + PixelDst = LowPassMul(LinePrev[X]<<8, LineAnt[X], Temporal);
> + LinePrev[X] = ((PixelDst+0x1000007F)>>8);
> + FrameDest[dLineOffs+X]= ((PixelDst+0x10007FFF)>>16);
> + }
> + }
> +}
> +
> +static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
> +{
nit: link->inlink
picref->inpicref
for enhanced consistency/readability.
> + HQDN3DContext *hqdn3d = link->dst->priv;
> + AVFilterLink *outlink = link->dst->outputs[0];
> + AVFilterBufferRef *outpicref;
> +
> + hqdn3d->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
> + hqdn3d->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
This can be set once in config_input.
> +
> + outpicref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h);
> + avfilter_copy_buffer_ref_props(outpicref, picref);
> +
> + outlink->out_buf = outpicref;
> +
> + avfilter_start_frame(outlink, avfilter_ref_buffer(outpicref, ~0));
> +}
For the rest this looks like avfilter_default_start_frame, maybe you
can use that instead.
> +static void null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir)
> +{
> +}
> +
> +static int query_formats(AVFilterContext *ctx)
> +{
> + static const enum PixelFormat pix_fmts[] = {
> + PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV411P,
> + };
> +
> + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
> +
> + return 0;
> +}
> +
> +static int config_input(AVFilterLink *link)
> +{
> + HQDN3DContext *hqdn3d = link->dst->priv;
> +
> + hqdn3d->Line = av_malloc(link->w * sizeof(*hqdn3d->Line));
> + if (!hqdn3d->Line)
> + return AVERROR(ENOMEM);
> +
> + return 0;
> +}
> +
> +static void PrecalcCoefs(int *Ct, double Dist25)
> +{
> + int i;
> + double Gamma, Simil, C;
> +
> + Gamma = log(0.25) / log(1.0 - Dist25/255.0 - 0.00001);
> +
> + for (i = -255*16; i <= 255*16; i++) {
> + Simil = 1.0 - FFABS(i) / (16*255.0);
> + C = pow(Simil, Gamma) * 65536.0 * i / 16.0;
> + Ct[16*256+i] = lrint(C);
> + }
> +
> + Ct[0] = !!Dist25;
> +}
> +
> +
Nit+++: one line is enough
> +static int init(AVFilterContext *ctx, const char *args, void *opaque)
> +{
> + HQDN3DContext *hqdn3d = ctx->priv;
> + double LumSpac, LumTmp, ChromSpac, ChromTmp;
> + double Param1, Param2, Param3, Param4;
> +
> + LumSpac = PARAM1_DEFAULT;
> + LumTmp = PARAM3_DEFAULT;
> + ChromSpac = PARAM2_DEFAULT;
> + ChromTmp = LumTmp * ChromSpac / LumSpac;
> +
> + if (args) {
> + switch(sscanf(args, "%lf:%lf:%lf:%lf",
> + &Param1, &Param2, &Param3, &Param4)) {
> + case 1:
> + LumSpac = Param1;
> + LumTmp = PARAM3_DEFAULT * Param1 / PARAM1_DEFAULT;
> + ChromSpac = PARAM2_DEFAULT * Param1 / PARAM1_DEFAULT;
> + ChromTmp = LumTmp * ChromSpac / LumSpac;
> + break;
> + case 2:
> + LumSpac = Param1;
> + LumTmp = PARAM3_DEFAULT * Param1 / PARAM1_DEFAULT;
> + ChromSpac = Param2;
> + ChromTmp = LumTmp * ChromSpac / LumSpac;
> + break;
> + case 3:
> + LumSpac = Param1;
> + LumTmp = Param3;
> + ChromSpac = Param2;
> + ChromTmp = LumTmp * ChromSpac / LumSpac;
> + break;
> + case 4:
> + LumSpac = Param1;
> + LumTmp = Param3;
> + ChromSpac = Param2;
> + ChromTmp = Param4;
> + break;
> + }
> + }
Nit: vertical align
> +
> + PrecalcCoefs(hqdn3d->Coefs[0], LumSpac);
> + PrecalcCoefs(hqdn3d->Coefs[1], LumTmp);
> + PrecalcCoefs(hqdn3d->Coefs[2], ChromSpac);
> + PrecalcCoefs(hqdn3d->Coefs[3], ChromTmp);
> +
> + return 0;
> +}
> +
> +static void end_frame(AVFilterLink *link)
> +{
nit: link->inlink
> + HQDN3DContext *hqdn3d = link->dst->priv;
> + AVFilterBufferRef *outpic = link->dst->outputs[0]->out_buf;
> + AVFilterBufferRef *pic = link->cur_buf;
> + int cw = pic->video->w >> hqdn3d->hsub;
> + int ch = pic->video->h >> hqdn3d->vsub;
> +
> + deNoise(pic->data[0], outpic->data[0],
> + hqdn3d->Line, &hqdn3d->Frame[0], pic->video->w, pic->video->h,
> + pic->linesize[0], outpic->linesize[0],
> + hqdn3d->Coefs[0],
> + hqdn3d->Coefs[0],
> + hqdn3d->Coefs[1]);
> + deNoise(pic->data[1], outpic->data[1],
> + hqdn3d->Line, &hqdn3d->Frame[1], cw, ch,
> + pic->linesize[1], outpic->linesize[1],
> + hqdn3d->Coefs[2],
> + hqdn3d->Coefs[2],
> + hqdn3d->Coefs[3]);
> + deNoise(pic->data[2], outpic->data[2],
> + hqdn3d->Line, &hqdn3d->Frame[2], cw, ch,
> + pic->linesize[2], outpic->linesize[2],
> + hqdn3d->Coefs[2],
> + hqdn3d->Coefs[2],
> + hqdn3d->Coefs[3]);
Maybe a for() is more readable, ignore if you prefer the other way.
[...]
--
FFmpeg = Fierce & Fierce Minimalistic Philosofic Elitist Gigant
More information about the ffmpeg-devel
mailing list