diff -Naur orig/libmpcodecs/Makefile modif/libmpcodecs/Makefile --- orig/libmpcodecs/Makefile 2003-01-29 16:53:25.000000000 +0100 +++ modif/libmpcodecs/Makefile 2003-01-29 16:58:33.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 modif/libmpcodecs/vf.c --- orig/libmpcodecs/vf.c 2003-01-29 16:53:25.000000000 +0100 +++ modif/libmpcodecs/vf.c 2003-01-29 16:58:44.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 modif/libmpcodecs/vf_denoise3d.c --- orig/libmpcodecs/vf_denoise3d.c 1970-01-01 01:00:00.000000000 +0100 +++ modif/libmpcodecs/vf_denoise3d.c 2003-01-29 16:59:17.000000000 +0100 @@ -0,0 +1,246 @@ +/* + 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 6.0 + +//===========================================================================// + +struct vf_priv_s { + int Coefs[3][511]; + int firstframe; +}; + + +/***************************************************************************/ + + +static int config(struct vf_instance_s* vf, + int width, int height, int d_width, int d_height, + unsigned int flags, unsigned int outfmt){ + + return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); +} + + +#define Pixel(I, x, y, w, h) I[(x) + (y)*w] +#define LOWP(Prev, Curr, Coef) ( ( (Prev)*(Coef) + (Curr)*(65536-(Coef)) ) / 65536 ) + + +static void deNoise(unsigned char *Frame, + unsigned char *FrameAnt, + unsigned char *LineAnt, + int W, int H, + int *Hcoefs, int *Vcoefs, int *Tcoefs) +{ + int X, Y; + int LpA, LpB; + unsigned char PixelAnt; + + /* First pixel has no left nor top neightbour. Only previous frame */ + PixelAnt = Pixel(Frame, 0, 0, W, H); + LpA = Pixel(FrameAnt, 0, 0, W, H); + LpB = PixelAnt; + Pixel(FrameAnt, 0, 0, W, H) = LOWP(LpA, LpB, Tcoefs[LpA - LpB]); + + /* Fist line has no top neightbour. Only left one for each pixel and + * last frame. */ + for (X = 1; X < W; X++) + { + LpA = PixelAnt; + LpB = Pixel(Frame, X, 0, W, H); + PixelAnt = LOWP(LpA, LpB, Hcoefs[LpA - LpB]); + + LpA = Pixel(FrameAnt, X, 0, W, H); + LpB = PixelAnt; + Pixel(FrameAnt, X, 0, W, H) = LOWP(LpA, LpB, Tcoefs[LpA - LpB]); + LineAnt[X] = Pixel(FrameAnt, X, 0, W, H); + } + + for (Y = 1; Y < H; Y++) + { + PixelAnt = Pixel(Frame, 0, Y, W, H); + LpA = LineAnt[0]; + LpB = PixelAnt; + LineAnt[0] = LOWP(LpA, LpB, Vcoefs[LpA - LpB]); + + LpA = Pixel(FrameAnt, 0, Y, W, H); + LpB = LineAnt[0]; + Pixel(FrameAnt, 0, Y, W, H) = LOWP(LpA, LpB, Tcoefs[LpA - LpB]); + for (X = 1; X < W; X++) + { + LpA = PixelAnt; + LpB = Pixel(Frame, X, Y, W, H); + PixelAnt = LOWP(LpA, LpB, Hcoefs[LpA - LpB]); + + LpA = LineAnt[X]; + LpB = PixelAnt; + LineAnt[X] = LOWP(LpA, LpB, Vcoefs[LpA - LpB]); + + LpA = Pixel(FrameAnt, X, Y, W, H); + LpB = LineAnt[X]; + Pixel(FrameAnt, X, Y, W, H) = LOWP(LpA, LpB, Tcoefs[LpA - LpB]); + } + } +} + + + +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; + static unsigned char *Line = NULL; + + mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, + MP_IMGTYPE_TEMP, 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; + } + + if (!Line) { Line = malloc(W); } + deNoise(mpi->planes[0], dmpi->planes[0], Line, W, H, + vf->priv->Coefs[0] + 255, + vf->priv->Coefs[1] + 255, + vf->priv->Coefs[2] + 255); + deNoise(mpi->planes[1], dmpi->planes[1], Line, cw, ch, + vf->priv->Coefs[0] + 255, + vf->priv->Coefs[1] + 255, + vf->priv->Coefs[2] + 255); + deNoise(mpi->planes[2], dmpi->planes[2], Line, cw, ch, + vf->priv->Coefs[0] + 255, + vf->priv->Coefs[1] + 255, + vf->priv->Coefs[2] + 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) ) +#define MAX(A, B) ( (A) > (B) ? (A) : (B) ) +#define MIN(A, B) ( (A) < (B) ? (A) : (B) ) + +static void PrecalcCoefs(int *Ct, double Dist25, double MinDif) +{ + int i; + double Gamma, Simil; + + Gamma = log(0.25) / log(1.0 - Dist25/255.0); + + for (i = -255; i <= 255; i++) + { + Simil = MIN(255, (255-ABS(i)) * (255 + MinDif) / 255); + Simil = Simil / 255.0; + Ct[255+i] = pow(Simil, Gamma) * 65536; + } +} + + +static int open(vf_instance_t *vf, char* args){ + double Param1, Param2; + + vf->config=config; + vf->put_image=put_image; + vf->query_format=query_format; + 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", + &Param1, &Param2 + )) + { + case 0: + Param1 = PARAM1_DEFAULT; + Param2 = PARAM2_DEFAULT; + break; + + case 1: + Param2 = Param1; + break; + + default: + } + } + else + { + Param1 = PARAM1_DEFAULT; + Param2 = PARAM2_DEFAULT; + } + + PrecalcCoefs(vf->priv->Coefs[0], Param1, 0); + PrecalcCoefs(vf->priv->Coefs[1], Param1, 0); + PrecalcCoefs(vf->priv->Coefs[2], Param2, 0); + + return 1; +} + +vf_info_t vf_info_denoise3d = { + "3D Denoiser", + "d3d", + "Daniel Moreno", + "", + open +}; + +//===========================================================================//