diff -Naur orig/DOCS/tech/vop.txt modi/DOCS/tech/vop.txt --- orig/DOCS/tech/vop.txt 2003-01-04 16:10:36.000000000 +0100 +++ modi/DOCS/tech/vop.txt 2003-01-30 14:16:45.000000000 +0100 @@ -220,3 +220,13 @@ -vop perspective=x0:y0:x1:y1:x2:y2:x3:y3:t x0,y0,... coordinates of the topleft, topright, bottomleft, bottomright corners t 0-> linear, 1->cubic resampling + +-vop d3d=[luma:chroma:time] + luma spatial luma strength (default = 4) + chroma spatial chroma strength (default = 3) + time temporal strength (default = 6) + This filter aims to reduce image noise producing smooth images and + making stills realy still. (it should enhance compressibility) + Can be given from 0 to 3 parameters. Parameters not given will be + infered from the given ones. (ie: providing only one of them acts as an + "scale factor") diff -Naur orig/libmpcodecs/Makefile modi/libmpcodecs/Makefile --- orig/libmpcodecs/Makefile 2003-01-29 15:49:16.000000000 +0100 +++ modi/libmpcodecs/Makefile 2003-01-30 19:27:13.000000000 +0100 @@ -14,7 +14,7 @@ VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT) -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_field.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_field.c vf_denoise3d.c ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c diff -Naur orig/libmpcodecs/vf.c modi/libmpcodecs/vf.c --- orig/libmpcodecs/vf.c 2003-01-29 15:49:19.000000000 +0100 +++ modi/libmpcodecs/vf.c 2003-01-30 19:27:33.000000000 +0100 @@ -53,6 +53,7 @@ extern vf_info_t vf_info_smartblur; extern vf_info_t vf_info_perspective; extern vf_info_t vf_info_field; +extern vf_info_t vf_info_denoise3d; char** vo_plugin_args=(char**) NULL; @@ -99,6 +100,7 @@ &vf_info_smartblur, &vf_info_perspective, &vf_info_field, + &vf_info_denoise3d, NULL }; diff -Naur orig/libmpcodecs/vf_denoise3d.c modi/libmpcodecs/vf_denoise3d.c --- orig/libmpcodecs/vf_denoise3d.c 1970-01-01 01:00:00.000000000 +0100 +++ modi/libmpcodecs/vf_denoise3d.c 2003-01-30 19:15:23.000000000 +0100 @@ -0,0 +1,276 @@ +/* + Copyright (C) 2003 Daniel Moreno + + This program 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. + + This program 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 this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#include +#include +#include +#include +#include +#include + +#include "../config.h" +#include "../mp_msg.h" + +#ifdef HAVE_MALLOC_H +#include +#endif + +#include "img_format.h" +#include "mp_image.h" +#include "vf.h" +#include "../libvo/fastmemcpy.h" + +#define PARAM1_DEFAULT 4.0 +#define PARAM2_DEFAULT 3.0 +#define PARAM3_DEFAULT 6.0 + +//===========================================================================// + +struct vf_priv_s { + int Coefs[4][511]; + int firstframe; + unsigned char *Line; +}; + + +/***************************************************************************/ + + +static int config(struct vf_instance_s* vf, + int width, int height, int d_width, int d_height, + unsigned int flags, unsigned int outfmt){ + + vf->priv->Line = malloc(d_width); + vf->default_caps &= !VFCAP_ACCEPT_STRIDE; + + return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); +} + + +void uninit(struct vf_instance_s* vf) +{ + free(vf->priv->Line); +} + + +#define LowPass(Prev, Curr, Coef) Prev = ((Prev)*Coef[Prev - Curr] + (Curr)*(65536-(Coef[Prev - Curr]))) / 65536 + + +static void deNoise(unsigned char *Frame, + unsigned char *FrameAnt, + unsigned char *LineAnt, + int W, int H, int sStride, int dStride, + int *Horizontal, int *Vertical, int *Temporal) +{ + int X, Y; + int sLineOffs = sStride+1, dLineOffs = dStride+1; + unsigned char PixelAnt; + + /* Stride = Stride - W + 1 + * "+1" becouse the first pixel is treated outside the loop */ + sStride -= W - 1; + dStride -= W - 1; + + /* First pixel has no left nor top neightbour. Only previous frame */ + PixelAnt = Frame[0]; + LineAnt[0] = PixelAnt; + LowPass(FrameAnt[0], LineAnt[0], Temporal); + + /* Fist line has no top neightbour. Only left one for each pixel and + * last frame */ + for (X = 1; X < W; X++) + { + LowPass(PixelAnt, Frame[X], Horizontal); + LineAnt[X] = PixelAnt; + LowPass(FrameAnt[X], LineAnt[X], Temporal); + } + + for (Y = 1; Y < H; Y++, sLineOffs += sStride, dLineOffs += dStride) + { + /* First pixel on each line doesn't have previous pixel */ + PixelAnt = Frame[sLineOffs]; + LowPass(LineAnt[0], PixelAnt, Vertical); + LowPass(FrameAnt[dLineOffs], LineAnt[0], Temporal); + + for (X = 1; X < W; X++, sLineOffs++, dLineOffs++) + { + /* The rest are normal */ + LowPass(PixelAnt, Frame[sLineOffs], Horizontal); + LowPass(LineAnt[X], PixelAnt, Vertical); + LowPass(FrameAnt[dLineOffs], LineAnt[X], Temporal); + } + } +} + + + +static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ + int cw= mpi->w >> mpi->chroma_x_shift; + int ch= mpi->h >> mpi->chroma_y_shift; + int W = mpi->w, H = mpi->h; + + mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, + MP_IMGTYPE_TEMP, 0/*MP_IMGFLAG_ACCEPT_STRIDE*/, + mpi->w,mpi->h); + + assert(mpi->flags&MP_IMGFLAG_PLANAR); + + if (vf->priv->firstframe) + { + memmove(dmpi->planes[0], mpi->planes[0], W*H + 2*cw*ch); + vf->priv->firstframe = 0; + } + + deNoise(mpi->planes[0], dmpi->planes[0], vf->priv->Line, W, H, + mpi->stride[0], dmpi->stride[0], + vf->priv->Coefs[0] + 255, + vf->priv->Coefs[0] + 255, + vf->priv->Coefs[1] + 255); + deNoise(mpi->planes[1], dmpi->planes[1], vf->priv->Line, cw, ch, + mpi->stride[1], dmpi->stride[1], + vf->priv->Coefs[2] + 255, + vf->priv->Coefs[2] + 255, + vf->priv->Coefs[3] + 255); + deNoise(mpi->planes[2], dmpi->planes[2], vf->priv->Line, cw, ch, + mpi->stride[2], dmpi->stride[2], + vf->priv->Coefs[2] + 255, + vf->priv->Coefs[2] + 255, + vf->priv->Coefs[3] + 255); + + return vf_next_put_image(vf,dmpi); +} + +//===========================================================================// + +static int query_format(struct vf_instance_s* vf, unsigned int fmt){ + switch(fmt) + { + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + case IMGFMT_YVU9: + case IMGFMT_444P: + case IMGFMT_422P: + case IMGFMT_411P: + return vf_next_query_format(vf, fmt); + } + return 0; +} + + +#define ABS(A) ( (A) > 0 ? (A) : -(A) ) + +static void PrecalcCoefs(int *Ct, double Dist25) +{ + int i; + double Gamma, Simil; + + Gamma = log(0.25) / log(1.0 - Dist25/255.0); + + for (i = -255; i <= 255; i++) + { + Simil = 1.0 - ABS(i) / 255.0; + Ct[255+i] = pow(Simil, Gamma) * 65536; + } +} + + +static int open(vf_instance_t *vf, char* args){ + double LumSpac, LumTmp, ChromSpac, ChromTmp; + double Param1, Param2, Param3; + + vf->config=config; + vf->put_image=put_image; + vf->query_format=query_format; + vf->uninit=uninit; + vf->priv=malloc(sizeof(struct vf_priv_s)); + memset(vf->priv, 0, sizeof(struct vf_priv_s)); + vf->priv->firstframe = 1; + + if (args) + { + switch(sscanf(args, "%lf:%lf:%lf", + &Param1, &Param2, &Param3 + )) + { + case 0: + LumSpac = PARAM1_DEFAULT; + LumTmp = PARAM3_DEFAULT; + + ChromSpac = PARAM2_DEFAULT; + ChromTmp = LumTmp * ChromSpac / LumSpac; + break; + + 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; + + default: + LumSpac = PARAM1_DEFAULT; + LumTmp = PARAM3_DEFAULT; + + ChromSpac = PARAM2_DEFAULT; + ChromTmp = LumTmp * ChromSpac / LumSpac; + } + } + else + { + LumSpac = PARAM1_DEFAULT; + LumTmp = PARAM3_DEFAULT; + + ChromSpac = PARAM2_DEFAULT; + ChromTmp = LumTmp * ChromSpac / LumSpac; + } + + PrecalcCoefs(vf->priv->Coefs[0], LumSpac); + PrecalcCoefs(vf->priv->Coefs[1], LumTmp); + PrecalcCoefs(vf->priv->Coefs[2], ChromSpac); + PrecalcCoefs(vf->priv->Coefs[3], ChromTmp); + + return 1; +} + +vf_info_t vf_info_denoise3d = { + "3D Denoiser", + "d3d", + "Daniel Moreno", + "3D variable lowpass filter", + open +}; + +//===========================================================================//