Mercurial > mplayer.hg

changeset 8010:329e9a5a154f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
boxblur, another useless filter
author michael
date Thu, 31 Oct 2002 23:26:11 +0000
parents 302708769c69
children d14d0530ddcd
files DOCS/tech/vop.txt libmpcodecs/Makefile libmpcodecs/vf.c libmpcodecs/vf_boxblur.c
diffstat 4 files changed, 227 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/tech/vop.txt	Thu Oct 31 23:16:27 2002 +0000
+++ b/DOCS/tech/vop.txt	Thu Oct 31 23:26:11 2002 +0000
@@ -195,3 +195,8 @@
     i interleave
     s swap fields (exchange even & odd lines)
     MPI: TEMP, accepts stride
+
+-vop boxblur=radius:power[:radius:power]
+    radius size of the filter
+    power  how often the filter should be applied
+    MPI: TEMP, accepts stride
--- a/libmpcodecs/Makefile	Thu Oct 31 23:16:27 2002 +0000
+++ b/libmpcodecs/Makefile	Thu Oct 31 23:26:11 2002 +0000
@@ -6,7 +6,7 @@
 
 AUDIO_SRCS=dec_audio.c ad.c ad_liba52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3lib.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c ad_qtaudio.c
 VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_realvid.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_xvid.c vd_libdv.c vd_lcl.c vd_mtga.c vd_lzo.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
+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
 ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.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
 
--- a/libmpcodecs/vf.c	Thu Oct 31 23:16:27 2002 +0000
+++ b/libmpcodecs/vf.c	Thu Oct 31 23:26:11 2002 +0000
@@ -48,6 +48,7 @@
 extern vf_info_t vf_info_unsharp;
 extern vf_info_t vf_info_swapuv;
 extern vf_info_t vf_info_il;
+extern vf_info_t vf_info_boxblur;
 
 char** vo_plugin_args=(char**) NULL;
 
@@ -89,6 +90,7 @@
     &vf_info_unsharp,
     &vf_info_swapuv,
     &vf_info_il,
+    &vf_info_boxblur,
     NULL
 };
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libmpcodecs/vf_boxblur.c	Thu Oct 31 23:26:11 2002 +0000
@@ -0,0 +1,219 @@
+/*
+    Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
+
+    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 <assert.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"
+
+
+//===========================================================================//
+
+typedef struct FilterParam{
+	int radius;
+	int power;
+}FilterParam;
+
+struct vf_priv_s {
+	FilterParam lumaParam;
+	FilterParam chromaParam;
+};
+
+
+/***************************************************************************/
+
+
+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);
+}
+
+static inline void blur(uint8_t *dst, uint8_t *src, int w, int radius, int dstStep, int srcStep){
+	int x;
+	const int length= radius*2 + 1;
+	const int inv= ((1<<16) + length/2)/length;
+
+	int sum= 0;
+
+	for(x=0; x<radius; x++){
+		sum+= src[x*srcStep]<<1;
+	}
+	sum+= src[radius*srcStep];
+
+	for(x=0; x<=radius; x++){
+		sum+= src[(radius+x)*srcStep] - src[(radius-x)*srcStep];
+		dst[x*dstStep]= (sum*inv + (1<<15))>>16;
+	}
+
+	for(; x<w-radius; x++){
+		sum+= src[(radius+x)*srcStep] - src[(x-radius-1)*srcStep];
+		dst[x*dstStep]= (sum*inv + (1<<15))>>16;
+	}
+
+	for(; x<w; x++){
+		sum+= src[(2*w-radius-x-1)*srcStep] - src[(x-radius-1)*srcStep];
+		dst[x*dstStep]= (sum*inv + (1<<15))>>16;
+	}
+}
+
+static inline void blur2(uint8_t *dst, uint8_t *src, int w, int radius, int power, int dstStep, int srcStep){
+	uint8_t temp[2][4096];
+	uint8_t *a= temp[0], *b=temp[1];
+	
+	if(radius){
+		blur(a, src, w, radius, 1, srcStep);
+		for(; power>2; power--){
+			uint8_t *c;
+			blur(b, a, w, radius, 1, 1);
+			c=a; a=b; b=c;
+		}
+		if(power>1)
+			blur(dst, a, w, radius, dstStep, 1);
+		else{
+			int i;
+			for(i=0; i<w; i++)
+				dst[i*dstStep]= a[i];
+		}
+	}else{
+		int i;
+		for(i=0; i<w; i++)
+			dst[i*dstStep]= src[i*srcStep];
+	}
+}
+
+static void hBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){
+	int y;
+	
+	if(radius==0 && dst==src) return;
+	
+	for(y=0; y<h; y++){
+		blur2(dst + y*dstStride, src + y*srcStride, w, radius, power, 1, 1);
+	}
+}
+
+//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;
+	
+	if(radius==0 && dst==src) return;
+
+	for(x=0; x<w; x++){
+		blur2(dst + x, src + x, h, radius, power, dstStride, srcStride);
+	}
+}
+
+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;
+
+	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);
+	
+	hBlur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, 
+		dmpi->stride[0], mpi->stride[0], vf->priv->lumaParam.radius, vf->priv->lumaParam.power);
+	hBlur(dmpi->planes[1], mpi->planes[1], cw,ch, 
+		dmpi->stride[1], mpi->stride[1], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
+	hBlur(dmpi->planes[2], mpi->planes[2], cw,ch, 
+		dmpi->stride[2], mpi->stride[2], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
+	
+	vBlur(dmpi->planes[0], dmpi->planes[0], mpi->w,mpi->h, 
+		dmpi->stride[0], dmpi->stride[0], vf->priv->lumaParam.radius, vf->priv->lumaParam.power);
+	vBlur(dmpi->planes[1], dmpi->planes[1], cw,ch, 
+		dmpi->stride[1], dmpi->stride[1], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
+	vBlur(dmpi->planes[2], dmpi->planes[2], cw,ch, 
+		dmpi->stride[2], dmpi->stride[2], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
+    
+	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;
+}
+
+static int open(vf_instance_t *vf, char* args){
+	char *pos, *max;
+	int e;
+
+	vf->config=config;
+	vf->put_image=put_image;
+//	vf->get_image=get_image;
+	vf->query_format=query_format;
+	vf->priv=malloc(sizeof(struct vf_priv_s));
+	memset(vf->priv, 0, sizeof(struct vf_priv_s));
+
+	if(args==NULL) return 0;
+	
+	e=sscanf(args, "%d:%d:%d:%d",
+		&vf->priv->lumaParam.radius,
+		&vf->priv->lumaParam.power,
+		&vf->priv->chromaParam.radius,
+		&vf->priv->chromaParam.power
+		);
+	
+	if(e==2){
+		vf->priv->chromaParam.radius= vf->priv->lumaParam.radius;
+		vf->priv->chromaParam.power = vf->priv->lumaParam.power;
+	}else if(e!=4)
+		return 0;
+
+	if(vf->priv->lumaParam.radius < 0) return 0;
+	if(vf->priv->chromaParam.radius < 0) return 0;
+		
+	return 1;
+}
+
+vf_info_t vf_info_boxblur = {
+    "box blur",
+    "boxblur",
+    "Michael Niedermayer",
+    "",
+    open
+};
+
+//===========================================================================//