Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv29067/libmpcodecs
Modified Files:
Makefile vf.c
Added Files:
vf_denoise3d.c
Log Message:
new video filter: denoise3d - temporal&spatial noise reduction
patch by Daniel Moreno <comac2k(a)terra.es>
mpi/stride corrections and some bugfix by me
--- NEW FILE ---
/*
Copyright (C) 2003 Daniel Moreno <comac(a)comac.darktech.org>
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 <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <math.h>
#include "../config.h"
#include "../mp_msg.h"
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#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][512];
unsigned char *Line;
mp_image_t *pmpi;
};
/***************************************************************************/
static int config(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt){
if(vf->priv->Line) free(vf->priv->Line);
vf->priv->Line = malloc(width);
vf->priv->pmpi=NULL;
// 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)*Coef[Prev - Curr] + (Curr)*(65536-(Coef[Prev - Curr]))) / 65536)
static void deNoise(unsigned char *Frame, // mpi->planes[x]
unsigned char *FramePrev, // pmpi->planes[x]
unsigned char *FrameDest, // dmpi->planes[x]
unsigned char *LineAnt, // vf->priv->Line (width bytes)
int W, int H, int sStride, int pStride, int dStride,
int *Horizontal, int *Vertical, int *Temporal)
{
int X, Y;
int sLineOffs = 0, pLineOffs = 0, dLineOffs = 0;
unsigned char PixelAnt;
/* First pixel has no left nor top neightbour. Only previous frame */
LineAnt[0] = PixelAnt = Frame[0];
FrameDest[0] = LowPass(FramePrev[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++)
{
PixelAnt = LowPass(PixelAnt, Frame[X], Horizontal);
LineAnt[X] = PixelAnt;
FrameDest[X] = LowPass(FramePrev[X], LineAnt[X], Temporal);
}
for (Y = 1; Y < H; Y++)
{
sLineOffs += sStride, pLineOffs += pStride, dLineOffs += dStride;
/* First pixel on each line doesn't have previous pixel */
PixelAnt = Frame[sLineOffs];
LineAnt[0] = LowPass(LineAnt[0], PixelAnt, Vertical);
FrameDest[dLineOffs] = LowPass(FramePrev[pLineOffs], LineAnt[0], Temporal);
for (X = 1; X < W; X++)
{
/* The rest are normal */
PixelAnt = LowPass(PixelAnt, Frame[sLineOffs+X], Horizontal);
LineAnt[X] = LowPass(LineAnt[X], PixelAnt, Vertical);
FrameDest[dLineOffs+X] = LowPass(FramePrev[pLineOffs+X], 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_IP, MP_IMGFLAG_ACCEPT_STRIDE,
mpi->w,mpi->h);
if(!dmpi) return 0;
if (!vf->priv->pmpi) vf->priv->pmpi=mpi;
deNoise(mpi->planes[0], vf->priv->pmpi->planes[0], dmpi->planes[0],
vf->priv->Line, W, H,
mpi->stride[0], vf->priv->pmpi->stride[0], dmpi->stride[0],
vf->priv->Coefs[0] + 256,
vf->priv->Coefs[0] + 256,
vf->priv->Coefs[1] + 256);
deNoise(mpi->planes[1], vf->priv->pmpi->planes[1], dmpi->planes[1],
vf->priv->Line, cw, ch,
mpi->stride[1], vf->priv->pmpi->stride[1], dmpi->stride[1],
vf->priv->Coefs[2] + 256,
vf->priv->Coefs[2] + 256,
vf->priv->Coefs[3] + 256);
deNoise(mpi->planes[2], vf->priv->pmpi->planes[2], dmpi->planes[2],
vf->priv->Line, cw, ch,
mpi->stride[2], vf->priv->pmpi->stride[2], dmpi->stride[2],
vf->priv->Coefs[2] + 256,
vf->priv->Coefs[2] + 256,
vf->priv->Coefs[3] + 256);
vf->priv->pmpi=mpi; // save reference image
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 = -256; i <= 255; i++)
{
Simil = 1.0 - ABS(i) / 255.0;
Ct[256+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));
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 (variable lowpass filter)",
"denoise3d",
"Daniel Moreno",
"",
open
};
//===========================================================================//
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Makefile 23 Jan 2003 16:33:57 -0000 1.83
+++ Makefile 30 Jan 2003 22:53:32 -0000 1.84
@@ -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
Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vf.c 23 Jan 2003 16:33:57 -0000 1.65
+++ vf.c 30 Jan 2003 22:53:32 -0000 1.66
@@ -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
};
