diff options
author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-07-03 02:24:28 +0000 |
---|---|---|
committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-07-03 02:24:28 +0000 |
commit | fd5347763569f9b3367d80079c99c6a4b1721149 (patch) | |
tree | 4190f37f711199e766d1e5d03c26c1d356b095c9 | |
parent | 78e0677b67c6b52e7d00db8fd855f6df8215a281 (diff) | |
download | xine-lib-fd5347763569f9b3367d80079c99c6a4b1721149.tar.gz xine-lib-fd5347763569f9b3367d80079c99c6a4b1721149.tar.bz2 |
remove //
CVS patchset: 5126
CVS date: 2003/07/03 02:24:28
-rw-r--r-- | src/post/planar/Makefile.am | 5 | ||||
-rw-r--r-- | src/post/planar/boxblur.c | 3 | ||||
-rw-r--r-- | src/post/planar/denoise3d.c | 10 | ||||
-rw-r--r-- | src/post/planar/eq2.c | 4 | ||||
-rw-r--r-- | src/post/planar/unsharp.c | 11 |
5 files changed, 13 insertions, 20 deletions
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 37abdc6c9..4a4db3af4 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -6,9 +6,8 @@ libdir = $(XINE_PLUGINDIR)/post lib_LTLIBRARIES = xineplug_post_planar.la -#xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c boxblur.c \ -# denoise3d.c eq.c eq2.c unsharp.c -xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c eq.c +xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c boxblur.c \ + denoise3d.c eq.c eq2.c unsharp.c xineplug_post_planar_la_LIBADD = $(XINE_LIB) -lm xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c index 32aea491e..d28ee12da 100644 --- a/src/post/planar/boxblur.c +++ b/src/post/planar/boxblur.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: boxblur.c,v 1.1 2003/06/29 18:56:24 miguelfreitas Exp $ + * $Id: boxblur.c,v 1.2 2003/07/03 02:24:28 miguelfreitas Exp $ * * mplayer's boxblur * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at> @@ -386,7 +386,6 @@ static void hBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int s } } -//FIXME optimize (x before y !!!) static void vBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){ int x; diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c index 53bab335f..ab9ece93f 100644 --- a/src/post/planar/denoise3d.c +++ b/src/post/planar/denoise3d.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: denoise3d.c,v 1.1 2003/06/29 18:56:24 miguelfreitas Exp $ + * $Id: denoise3d.c,v 1.2 2003/07/03 02:24:28 miguelfreitas Exp $ * * mplayer's denoise3d * Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org> @@ -365,10 +365,10 @@ static void denoise3d_close(xine_video_port_t *port_gen, xine_stream_t *stream) #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) +static void deNoise(unsigned char *Frame, + unsigned char *FramePrev, + unsigned char *FrameDest, + unsigned char *LineAnt, int W, int H, int sStride, int pStride, int dStride, int *Horizontal, int *Vertical, int *Temporal) { diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c index 599e5e4b0..c6c7332c2 100644 --- a/src/post/planar/eq2.c +++ b/src/post/planar/eq2.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: eq2.c,v 1.1 2003/06/29 18:56:24 miguelfreitas Exp $ + * $Id: eq2.c,v 1.2 2003/07/03 02:24:28 miguelfreitas Exp $ * * mplayer's eq2 (soft video equalizer) * Software equalizer (brightness, contrast, gamma, saturation) @@ -113,8 +113,6 @@ void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src, short brvec[4]; short contvec[4]; -// printf("\nmmx: src=%p dst=%p w=%d h=%d ds=%d ss=%d\n",src,dst,w,h,dstride,sstride); - contrast = (int) (par->c * 256 * 16); brightness = ((int) (100.0 * par->b + 100.0) * 511) / 200 - 128 - contrast / 32; diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c index f293a1818..ca15f66e4 100644 --- a/src/post/planar/unsharp.c +++ b/src/post/planar/unsharp.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: unsharp.c,v 1.1 2003/06/29 18:56:24 miguelfreitas Exp $ + * $Id: unsharp.c,v 1.2 2003/07/03 02:24:28 miguelfreitas Exp $ * * mplayer's unsharp * Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com> @@ -40,7 +40,7 @@ #define MAX(a,b) (((a)>(b))?(a):(b)) #endif -//===========================================================================// +/*===========================================================================*/ #define MIN_MATRIX_SIZE 3 #define MAX_MATRIX_SIZE 63 @@ -58,7 +58,7 @@ struct vf_priv_s { }; -//===========================================================================// +/*===========================================================================*/ /* This code is based on : @@ -74,7 +74,7 @@ static void unsharp( uint8_t *dst, uint8_t *src, int dstStride, int srcStride, i uint32_t **SC = fp->SC; uint32_t SR[MAX_MATRIX_SIZE-1], Tmp1, Tmp2; - uint8_t* src2 = src; // avoid gcc warning + uint8_t* src2 = src; int32_t res; int x, y, z; @@ -203,13 +203,11 @@ static int set_parameters (xine_post_t *this_gen, void *param_gen) { memcpy( &this->params, param, sizeof(unsharp_parameters_t) ); fp = &this->priv.lumaParam; - // min/max & odd fp->msizeX = 1 | MIN( MAX( param->luma_matrix_width, MIN_MATRIX_SIZE ), MAX_MATRIX_SIZE ); fp->msizeY = 1 | MIN( MAX( param->luma_matrix_height, MIN_MATRIX_SIZE ), MAX_MATRIX_SIZE ); fp->amount = param->luma_amount; fp = &this->priv.chromaParam; - // min/max & odd fp->msizeX = 1 | MIN( MAX( param->chroma_matrix_width, MIN_MATRIX_SIZE ), MAX_MATRIX_SIZE ); fp->msizeY = 1 | MIN( MAX( param->chroma_matrix_height, MIN_MATRIX_SIZE ), MAX_MATRIX_SIZE ); fp->amount = param->chroma_amount; @@ -504,7 +502,6 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream) this->priv.width = frame->width; this->priv.height = frame->height; - // allocate buffers fp = &this->priv.lumaParam; memset( fp->SC, 0, sizeof( fp->SC ) ); stepsX = fp->msizeX/2; |