November 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpcodecs ad_ffmpeg.c,1.10,1.11
by Roberto Togni CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv11698 Modified Files: ad_ffmpeg.c Log Message: Fix stereo MACE files Index: ad_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ad_ffmpeg.c 4 Nov 2002 18:46:53 -0000 1.10 +++ ad_ffmpeg.c 4 Nov 2002 23:15:01 -0000 1.11 @@ -87,12 +87,12 @@ if(sh_audio->format==0x3343414D){ // MACE 3:1 sh_audio->ds->ss_div = 2*3; // 1 samples/packet - sh_audio->ds->ss_mul = 2*1; // 1 bytes/packet + sh_audio->ds->ss_mul = 2*sh_audio->wf->nChannels; // 1 byte*ch/packet } else if(sh_audio->format==0x3643414D){ // MACE 6:1 sh_audio->ds->ss_div = 2*6; // 1 samples/packet - sh_audio->ds->ss_mul = 2*1; // 1 bytes/packet + sh_audio->ds->ss_mul = 2*sh_audio->wf->nChannels; // 1 byte*ch/packet } // Decode at least 1 byte: (to get header filled)

1 0

CVS: main/postproc postprocess.c,1.73,1.74
by Michael Niedermayer CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/postproc In directory mail:/var/tmp.root/cvs-serv28071 Modified Files: postprocess.c Log Message: dont use fastmemcpy for PIC Index: postprocess.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- postprocess.c 3 Nov 2002 10:05:19 -0000 1.73 +++ postprocess.c 4 Nov 2002 22:45:34 -0000 1.74 @@ -75,7 +75,9 @@ //#undef HAVE_MMX //#undef ARCH_X86 //#define DEBUG_BRIGHTNESS +#ifndef PIC #include "../libvo/fastmemcpy.h" +#endif #include "postprocess.h" #include "postprocess_internal.h" #include "../mangle.h"

1 0

CVS: main/libmpcodecs vf_smartblur.c,NONE,1.1 vf.c,1.60,1.61 Makefile,1.75,1.76
by Michael Niedermayer CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv23433/libmpcodecs Modified Files: vf.c Makefile Added Files: vf_smartblur.c Log Message: smartblur --- NEW FILE --- /* Copyright (C) 2002 Michael Niedermayer <michaelni(a)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" #include "../postproc/swscale.h" //===========================================================================// typedef struct FilterParam{ float radius; float strength; int threshold; float quality; SwsContext *filterContext; }FilterParam; struct vf_priv_s { FilterParam luma; FilterParam chroma; }; /***************************************************************************/ //FIXME stupid code duplication static void getSubSampleFactors(int *h, int *v, int format){ switch(format){ case IMGFMT_YV12: case IMGFMT_I420: *h=1; *v=1; break; case IMGFMT_YVU9: *h=2; *v=2; break; case IMGFMT_444P: *h=0; *v=0; break; case IMGFMT_422P: *h=1; *v=0; break; case IMGFMT_411P: *h=2; *v=0; break; } } static int allocStuff(FilterParam *f, int width, int height){ SwsVector *vec; SwsFilter swsF; vec = getGaussianVec(f->radius, f->quality); scaleVec(vec, f->strength); vec->coeff[vec->length/2]+= 1.0 - f->strength; swsF.lumH= swsF.lumV= vec; swsF.chrH= swsF.chrV= NULL; f->filterContext= getSwsContext( width, height, IMGFMT_Y8, width, height, IMGFMT_Y8, 0, &swsF, NULL); freeVec(vec); return 0; } static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int sw, sh; allocStuff(&vf->priv->luma, width, height); getSubSampleFactors(&sw, &sh, outfmt); allocStuff(&vf->priv->chroma, width>>sw, height>>sh); return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } static void freeBuffers(FilterParam *f){ if(f->filterContext) freeSwsContext(f->filterContext); f->filterContext=NULL; } static void uninit(struct vf_instance_s* vf){ if(!vf->priv) return; freeBuffers(&vf->priv->luma); freeBuffers(&vf->priv->chroma); free(vf->priv); vf->priv=NULL; } static inline void blur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, FilterParam *fp){ int x, y; FilterParam f= *fp; uint8_t *srcArray[3]= {src, NULL, NULL}; uint8_t *dstArray[3]= {dst, NULL, NULL}; int srcStrideArray[3]= {srcStride, 0, 0}; int dstStrideArray[3]= {dstStride, 0, 0}; f.filterContext->swScale(f.filterContext, srcArray, srcStrideArray, 0, h, dstArray, dstStrideArray); if(f.threshold > 0){ for(y=0; y<h; y++){ for(x=0; x<w; x++){ const int orig= src[x + y*srcStride]; const int filtered= dst[x + y*dstStride]; const int diff= orig - filtered; if(diff > 0){ if(diff > 2*f.threshold){ dst[x + y*dstStride]= orig; }else if(diff > f.threshold){ dst[x + y*dstStride]= filtered + diff - f.threshold; } }else{ if(-diff > 2*f.threshold){ dst[x + y*dstStride]= orig; }else if(-diff > f.threshold){ dst[x + y*dstStride]= filtered + diff + f.threshold; } } } } }else if(f.threshold < 0){ for(y=0; y<h; y++){ for(x=0; x<w; x++){ const int orig= src[x + y*srcStride]; const int filtered= dst[x + y*dstStride]; const int diff= orig - filtered; if(diff > 0){ if(diff > -2*f.threshold){ }else if(diff > -f.threshold){ dst[x + y*dstStride]= orig - diff - f.threshold; }else dst[x + y*dstStride]= orig; }else{ if(diff < 2*f.threshold){ }else if(diff < f.threshold){ dst[x + y*dstStride]= orig - diff + f.threshold; }else dst[x + y*dstStride]= orig; } } } } } 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); blur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0], &vf->priv->luma); blur(dmpi->planes[1], mpi->planes[1], cw , ch , dmpi->stride[1], mpi->stride[1], &vf->priv->chroma); blur(dmpi->planes[2], mpi->planes[2], cw , ch , dmpi->stride[2], mpi->stride[2], &vf->priv->chroma); 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){ int e; vf->config=config; vf->put_image=put_image; // vf->get_image=get_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==NULL) return 0; e=sscanf(args, "%f:%f:%d:%f:%f:%d", &vf->priv->luma.radius, &vf->priv->luma.strength, &vf->priv->luma.threshold, &vf->priv->chroma.radius, &vf->priv->chroma.strength, &vf->priv->chroma.threshold ); vf->priv->luma.quality = vf->priv->chroma.quality= 3.0; if(e==3){ vf->priv->chroma.radius= vf->priv->luma.radius; vf->priv->chroma.strength= vf->priv->luma.strength; vf->priv->chroma.threshold = vf->priv->luma.threshold; }else if(e!=6) return 0; return 1; } vf_info_t vf_info_smartblur = { "smart blur", "smartblur", "Michael Niedermayer", "", open }; //===========================================================================// Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- vf.c 4 Nov 2002 16:41:59 -0000 1.60 +++ vf.c 4 Nov 2002 20:39:27 -0000 1.61 @@ -50,6 +50,7 @@ extern vf_info_t vf_info_il; extern vf_info_t vf_info_boxblur; extern vf_info_t vf_info_sab; +extern vf_info_t vf_info_smartblur; char** vo_plugin_args=(char**) NULL; @@ -93,6 +94,7 @@ &vf_info_il, &vf_info_boxblur, &vf_info_sab, + &vf_info_smartblur, NULL }; Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- Makefile 4 Nov 2002 16:41:59 -0000 1.75 +++ Makefile 4 Nov 2002 20:39:27 -0000 1.76 @@ -14,7 +14,7 @@ VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.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 +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 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

1 0

CVS: main/DOCS/tech vop.txt,1.23,1.24
by Michael Niedermayer CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv23433/DOCS/tech Modified Files: vop.txt Log Message: smartblur Index: vop.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/vop.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- vop.txt 4 Nov 2002 16:42:17 -0000 1.23 +++ vop.txt 4 Nov 2002 20:39:26 -0000 1.24 @@ -204,3 +204,8 @@ radius blur filter strength (~0.1-4.0) (slower if larger) prefilter prefilter strength (~0.1-2.0) colorDiff how different the pixels are allowed to be to be considered (~0.1-100.0) + +-vop smartblur=radius:stregth:threshold[:radius:stregth:threshold] + radius blur filter strength (~0.1-5.0) (slower if larger) + strength (0.0-1.0) -> blur, (-1.0-0.0) -> sharpen + threshold 0 -> filter all, (0-30) -> filter flat areas, (-30-0) -> filter edges

1 0

CVS: main/libmpdemux demux_mov.c,1.80,1.81
by Alex Beregszaszi 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv20605 Modified Files: demux_mov.c Log Message: workaround for ms11 ima4 Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- demux_mov.c 2 Nov 2002 22:39:02 -0000 1.80 +++ demux_mov.c 4 Nov 2002 20:36:51 -0000 1.81 @@ -873,6 +873,9 @@ sh->wf->nBlockAlign=char2int(trak->stdata,36); } else { sh->wf->nAvgBytesPerSec=sh->wf->nChannels*sh->wf->wBitsPerSample*sh->wf->nSamplesPerSec/8; + // workaround for ms11 ima4 + if (sh->format == 0x1100736d && trak->stdata_len >= 36) + sh->wf->nBlockAlign=char2int(trak->stdata,36); } // Selection: if(demuxer->audio->id==-1 || demuxer->audio->id==priv->track_db){

1 0

CVS: main/etc codecs.conf,1.243,1.244
by Alex Beregszaszi 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv19180 Modified Files: codecs.conf Log Message: ms\x00\x02, ms\x00\0x11 and sowt support Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- codecs.conf 4 Nov 2002 00:23:41 -0000 1.243 +++ codecs.conf 4 Nov 2002 20:33:42 -0000 1.244 @@ -1209,12 +1209,14 @@ status working format 0x11 format 0x34616d69 ; "ima4" (MOV files) + format 0x1100736d ; "ms\x00\x11" (MOV files) driver imaadpcm audiocodec msadpcm info "MS ADPCM" status working format 0x2 + format 0x0200736d ; "ms\x00\x02" (MOV files) driver msadpcm audiocodec dk4adpcm @@ -1258,6 +1260,7 @@ format 0x1 format 0x20776172 ; "raw " (MOV files) format 0x736f7774 ; "twos" (MOV files) + format 0x74776f73 ; "sowt" (MOV files) ;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3) ; format 0x6 ; format 0x7

1 0

CVS: main/libmpcodecs ad_imaadpcm.c,1.5,1.6
by Alex Beregszaszi 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv18297 Modified Files: ad_imaadpcm.c Log Message: ms\0x00\x11 support Index: ad_imaadpcm.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_imaadpcm.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ad_imaadpcm.c 30 Aug 2002 21:44:20 -0000 1.5 +++ ad_imaadpcm.c 4 Nov 2002 20:31:46 -0000 1.6 @@ -13,6 +13,7 @@ 0x61: DK4 ADPCM found in certain AVI files on Sega Saturn CD-ROMs; note that this is a 'rogue' format number in that it was never officially registered with Microsoft + 0x1100736d: IMA ADPCM coded like in MS AVI/ASF/WAV found in QT files */ #include <stdio.h> @@ -86,7 +87,8 @@ // if format is "ima4", assume the audio is coming from a QT file which // indicates constant block size, whereas an AVI/ASF/WAV file will fill // in this field with 0x11 - if ((sh_audio->format == 0x11) || (sh_audio->format == 0x61)) + if ((sh_audio->format == 0x11) || (sh_audio->format == 0x61) || + (sh_audio->format == 0x1100736d)) { sh_audio->ds->ss_div = (sh_audio->wf->nBlockAlign - (MS_IMA_ADPCM_PREAMBLE_SIZE * sh_audio->wf->nChannels)) * 2; @@ -352,7 +354,7 @@ sh_audio->ds->ss_mul) return -1; - if (sh_audio->format == 0x11) + if ((sh_audio->format == 0x11) || (sh_audio->format == 0x1100736d)) { return 2 * ms_ima_adpcm_decode_block( (unsigned short*)buf, sh_audio->a_in_buffer, sh_audio->wf->nChannels,

1 0

CVS: main/libmpcodecs ad_ffmpeg.c,1.9,1.10
by Arpi of Ize 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv32023 Modified Files: ad_ffmpeg.c Log Message: MACE fix Index: ad_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ad_ffmpeg.c 29 Oct 2002 16:40:45 -0000 1.9 +++ ad_ffmpeg.c 4 Nov 2002 18:46:53 -0000 1.10 @@ -82,6 +82,18 @@ return 0; } mp_msg(MSGT_DECAUDIO,MSGL_V,"INFO: libavcodec init OK!\n"); + +// printf("\nFOURCC: 0x%X\n",sh_audio->format); + if(sh_audio->format==0x3343414D){ + // MACE 3:1 + sh_audio->ds->ss_div = 2*3; // 1 samples/packet + sh_audio->ds->ss_mul = 2*1; // 1 bytes/packet + } else + if(sh_audio->format==0x3643414D){ + // MACE 6:1 + sh_audio->ds->ss_div = 2*6; // 1 samples/packet + sh_audio->ds->ss_mul = 2*1; // 1 bytes/packet + } // Decode at least 1 byte: (to get header filled) x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size);

1 0

CVS: main/DOCS/tech vop.txt,1.22,1.23
by Michael Niedermayer CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv811/DOCS/tech Modified Files: vop.txt Log Message: shape adaptive blur (slightly slow though) Index: vop.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/vop.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- vop.txt 3 Nov 2002 10:05:12 -0000 1.22 +++ vop.txt 4 Nov 2002 16:42:17 -0000 1.23 @@ -199,3 +199,8 @@ radius size of the filter power how often the filter should be applied MPI: TEMP, accepts stride + +-vop sab=radius:prefilter:colorDiff[:radius:prefilter:colorDiff] + radius blur filter strength (~0.1-4.0) (slower if larger) + prefilter prefilter strength (~0.1-2.0) + colorDiff how different the pixels are allowed to be to be considered (~0.1-100.0)

1 0

CVS: main/libmpcodecs vf_sab.c,NONE,1.1 vf.c,1.59,1.60 Makefile,1.74,1.75
by Michael Niedermayer CVS 04 Nov '02

04 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv811/libmpcodecs Modified Files: vf.c Makefile Added Files: vf_sab.c Log Message: shape adaptive blur (slightly slow though) --- NEW FILE --- /* Copyright (C) 2002 Michael Niedermayer <michaelni(a)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" #include "../postproc/swscale.h" //===========================================================================// typedef struct FilterParam{ float radius; float preFilterRadius; float strength; float quality; SwsContext *preFilterContext; uint8_t *preFilterBuf; int preFilterStride; int distWidth; int distStride; int *distCoeff; int colorDiffCoeff[512]; }FilterParam; struct vf_priv_s { FilterParam luma; FilterParam chroma; }; /***************************************************************************/ //FIXME stupid code duplication static void getSubSampleFactors(int *h, int *v, int format){ switch(format){ case IMGFMT_YV12: case IMGFMT_I420: *h=1; *v=1; break; case IMGFMT_YVU9: *h=2; *v=2; break; case IMGFMT_444P: *h=0; *v=0; break; case IMGFMT_422P: *h=1; *v=0; break; case IMGFMT_411P: *h=2; *v=0; break; } } static int allocStuff(FilterParam *f, int width, int height){ int stride= (width+7)&~7; SwsVector *vec; SwsFilter swsF; int i,x,y; f->preFilterBuf= (uint8_t*)memalign(8, stride*height); f->preFilterStride= stride; vec = getGaussianVec(f->preFilterRadius, f->quality); swsF.lumH= swsF.lumV= vec; swsF.chrH= swsF.chrV= NULL; f->preFilterContext= getSwsContext( width, height, IMGFMT_Y8, width, height, IMGFMT_Y8, 0, &swsF, NULL); freeVec(vec); vec = getGaussianVec(f->strength, 5.0); for(i=0; i<512; i++){ double d; int index= i-256 + vec->length/2; if(index<0 || index>=vec->length) d= 0.0; else d= vec->coeff[index]; f->colorDiffCoeff[i]= (int)(d/vec->coeff[vec->length/2]*(1<<12) + 0.5); } freeVec(vec); vec = getGaussianVec(f->radius, f->quality); f->distWidth= vec->length; f->distStride= (vec->length+7)&~7; f->distCoeff= (int32_t*)memalign(8, f->distWidth*f->distStride*sizeof(int32_t)); for(y=0; y<vec->length; y++){ for(x=0; x<vec->length; x++){ double d= vec->coeff[x] * vec->coeff[y]; f->distCoeff[x + y*f->distStride]= (int)(d*(1<<10) + 0.5); // if(y==vec->length/2) // printf("%6d ", f->distCoeff[x + y*f->distStride]); } } freeVec(vec); return 0; } static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ int sw, sh; //asm volatile("emms\n\t"); allocStuff(&vf->priv->luma, width, height); getSubSampleFactors(&sw, &sh, outfmt); allocStuff(&vf->priv->chroma, width>>sw, height>>sh); return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } static void freeBuffers(FilterParam *f){ if(f->preFilterContext) freeSwsContext(f->preFilterContext); f->preFilterContext=NULL; if(f->preFilterBuf) free(f->preFilterBuf); f->preFilterBuf=NULL; if(f->distCoeff) free(f->distCoeff); f->distCoeff=NULL; } static void uninit(struct vf_instance_s* vf){ if(!vf->priv) return; freeBuffers(&vf->priv->luma); freeBuffers(&vf->priv->chroma); free(vf->priv); vf->priv=NULL; } static inline void blur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, FilterParam *fp){ int x, y; FilterParam f= *fp; const int radius= f.distWidth/2; uint8_t *srcArray[3]= {src, NULL, NULL}; uint8_t *dstArray[3]= {f.preFilterBuf, NULL, NULL}; int srcStrideArray[3]= {srcStride, 0, 0}; int dstStrideArray[3]= {f.preFilterStride, 0, 0}; f.preFilterContext->swScale(f.preFilterContext, srcArray, srcStrideArray, 0, h, dstArray, dstStrideArray); for(y=0; y<h; y++){ for(x=0; x<w; x++){ int sum=0; int div=0; int dy; const int preVal= f.preFilterBuf[x + y*f.preFilterStride]; #if 0 const int srcVal= src[x + y*srcStride]; if((x/32)&1){ dst[x + y*dstStride]= srcVal; if(y%32==0) dst[x + y*dstStride]= 0; continue; } #endif if(x >= radius && x < w - radius){ for(dy=0; dy<radius*2+1; dy++){ int dx; int iy= y+dy - radius; if (iy<0) iy= -iy; else if(iy>=h) iy= h-iy-1; for(dx=0; dx<radius*2+1; dx++){ const int ix= x+dx - radius; int factor; factor= f.colorDiffCoeff[256+preVal - f.preFilterBuf[ix + iy*f.preFilterStride] ] *f.distCoeff[dx + dy*f.distStride]; sum+= src[ix + iy*srcStride] *factor; div+= factor; } } }else{ for(dy=0; dy<radius*2+1; dy++){ int dx; int iy= y+dy - radius; if (iy<0) iy= -iy; else if(iy>=h) iy= h-iy-1; for(dx=0; dx<radius*2+1; dx++){ int ix= x+dx - radius; int factor; if (ix<0) ix= -ix; else if(ix>=w) ix= w-ix-1; factor= f.colorDiffCoeff[256+preVal - f.preFilterBuf[ix + iy*f.preFilterStride] ] *f.distCoeff[dx + dy*f.distStride]; sum+= src[ix + iy*srcStride] *factor; div+= factor; } } } dst[x + y*dstStride]= (sum + div/2)/div; } } } 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); blur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0], &vf->priv->luma); blur(dmpi->planes[1], mpi->planes[1], cw , ch , dmpi->stride[1], mpi->stride[1], &vf->priv->chroma); blur(dmpi->planes[2], mpi->planes[2], cw , ch , dmpi->stride[2], mpi->stride[2], &vf->priv->chroma); 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){ int e; vf->config=config; vf->put_image=put_image; // vf->get_image=get_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==NULL) return 0; e=sscanf(args, "%f:%f:%f:%f:%f:%f", &vf->priv->luma.radius, &vf->priv->luma.preFilterRadius, &vf->priv->luma.strength, &vf->priv->chroma.radius, &vf->priv->chroma.preFilterRadius, &vf->priv->chroma.strength ); vf->priv->luma.quality = vf->priv->chroma.quality= 3.0; if(e==3){ vf->priv->chroma.radius= vf->priv->luma.radius; vf->priv->chroma.preFilterRadius = vf->priv->luma.preFilterRadius; vf->priv->chroma.strength= vf->priv->luma.strength; }else if(e!=6) return 0; // if(vf->priv->luma.radius < 0) return 0; // if(vf->priv->chroma.radius < 0) return 0; return 1; } vf_info_t vf_info_sab = { "shape adaptive blur", "sab", "Michael Niedermayer", "", open }; //===========================================================================// Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- vf.c 31 Oct 2002 23:26:11 -0000 1.59 +++ vf.c 4 Nov 2002 16:41:59 -0000 1.60 @@ -49,6 +49,7 @@ extern vf_info_t vf_info_swapuv; extern vf_info_t vf_info_il; extern vf_info_t vf_info_boxblur; +extern vf_info_t vf_info_sab; char** vo_plugin_args=(char**) NULL; @@ -91,6 +92,7 @@ &vf_info_swapuv, &vf_info_il, &vf_info_boxblur, + &vf_info_sab, NULL }; Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- Makefile 1 Nov 2002 16:38:50 -0000 1.74 +++ Makefile 4 Nov 2002 16:41:59 -0000 1.75 @@ -14,7 +14,7 @@ VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.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 +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 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

1 0