October 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpcodecs vf_spp.c,1.11,1.12
by Michael Niedermayer CVS 29 Oct '03

29 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv27834 Modified Files: vf_spp.c Log Message: skip filter if codec doesnt provide the QP array and user didnt force a QP (fixes diegos segfault) its quite scary how many 10l bugs the spp filter had ... Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vf_spp.c 28 Oct 2003 14:00:07 -0000 1.11 +++ vf_spp.c 28 Oct 2003 20:49:33 -0000 1.12 @@ -371,9 +371,11 @@ vf->priv->mpeg2= mpi->qscale_type; if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){ + if(mpi->qscale || vf->priv->qp){ filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1); filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0); filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0); + } } vf_clone_mpi_attributes(dmpi, mpi);

3 2

CVS: main ChangeLog,1.72,1.73
by Diego Biurrun CVS 29 Oct '03

29 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv23816 Modified Files: ChangeLog Log Message: spelling fixes, small additions, codename suggested Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- ChangeLog 22 Oct 2003 19:16:34 -0000 1.72 +++ ChangeLog 29 Oct 2003 00:31:19 -0000 1.73 @@ -1,18 +1,19 @@ mplayer (1.0) - pre3: + pre3: "FilterCounter" DOCS: * Support for building incomplete XML documentation + * Support for building all-in-one HTML docs * HTML documentation obsoleted - * English and French HTML documentation removed + * English, Polish and French HTML documentation removed * Spanish documentation translation finished Codecs and demuxers: * improved FLAC configure detection * better support for (buggy) MEncoder created streams in libmpeg2 * better AC3 detection in Matroska - * fixed compilation of matroska on mingw32/cygwin + * fixed compilation of matroska on MinGW32/Cygwin * support for (uncompressed) VobSubs inside Matroska * support for MP2 inside Matroska * MPEG-TS demuxer updates @@ -24,17 +25,18 @@ * some fixes in the delogo filter * optimized eq2 filter * weighted gamma support in the eq2 filter + * new filters: hue, spp, fil FFmpeg/libavcodec: * Lagrange multipliers instead of qscale, encoding quality much improved - * fixed an old bug fixed in MPlayer's support code - * support wider range of VOLs in h263 + * fixed an old bug in MPlayer's support code + * support wider range of VOLs in H263 * direct rendering support in MJPEG * massive MLib optimization support * more VQA files supported * Theora support * Sunplus JPEG (SP5X) support - * h263 GOB fixes + * H263 GOB fixes * massive cleanups * reduced memory footprint (!) * fixed decoding if aspect ratio changes @@ -55,7 +57,7 @@ * VIDIX colorkeying support in fbdev, svga and vesa * obsoleted option: -fb * new SiS 650/651/740/etc VIDIX driver - * safer vo_directx directrendering + * safer vo_directx direct rendering * massive nvidia_vid updates * gl2 updates * ggi now supports non-directbuffer rendering and slices @@ -70,10 +72,10 @@ Others: * sub autoloading under Windows - * Darwin xmms libs supported + * Darwin XMMS libs supported * support newer Darwin versions in Altivec detection code - * fixed aspecting and geometry - * fixed compilation when libavcodec is missing (altought it's a bad choice) + * fixed aspect and geometry + * fixed compilation when libavcodec is missing (although it's a bad idea) * support for newer Apple GCC's

1 0

CVS: main vobsub.c,1.33,1.34
by Moritz Bunkus CVS 28 Oct '03

28 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv27423 Modified Files: vobsub.c Log Message: Improved searching for VobSubs inside RAR archives even if the names do not match the movie name. Do not display VobSubs whose timecodes are < 0 which would make all VobSubs appear from the start on upon seeking. Patches by "Reder, Uwe" <Uwe.Reder(a)3SOFT.de>. Index: vobsub.c =================================================================== RCS file: /cvsroot/mplayer/main/vobsub.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- vobsub.c 21 Sep 2003 14:21:11 -0000 1.33 +++ vobsub.c 28 Oct 2003 22:36:56 -0000 1.34 @@ -88,11 +88,38 @@ p++; } rc = urarlib_get(&stream->data, &stream->size, (char*) p, rar_filename, ""); - free(rar_filename); if (!rc) { - free(stream); - return NULL; + /* There is no matching filename in the archive. However, sometimes + * the files we are looking for have been given arbitrary names in the archive. + * Let's look for a file with an exact match in the extension only. */ + int i, num_files, name_len; + ArchiveList_struct *list, *lp; + /* the cast in the next line is a hack to overcome a design flaw (IMHO) in unrarlib */ + num_files = urarlib_list (rar_filename, (ArchiveList_struct *)&list); + if (num_files > 0) { + char *demanded_ext; + demanded_ext = strrchr (p, '.'); + if (demanded_ext) { + int demanded_ext_len = strlen (demanded_ext); + for (i=0, lp=list; i<num_files; i++, lp=lp->next) { + name_len = strlen (lp->item.Name); + if (name_len >= demanded_ext_len && !strcasecmp (lp->item.Name + name_len - demanded_ext_len, demanded_ext)) { + if ((rc = urarlib_get(&stream->data, &stream->size, lp->item.Name, rar_filename, ""))) { + break; + } + } + } + } + urarlib_freelist (list); + } + if (!rc) { + free(rar_filename); + free(stream); + return NULL; + } } + + free(rar_filename); stream->pos = 0; } return stream;

1 0

CVS: main/libmpcodecs vf_spp.c,1.10,1.11
by Michael Niedermayer CVS 28 Oct '03

28 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv30837 Modified Files: vf_spp.c Log Message: autoq support all planar YUV variants (untested, probably buggy) Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vf_spp.c 28 Oct 2003 13:17:11 -0000 1.10 +++ vf_spp.c 28 Oct 2003 14:00:07 -0000 1.11 @@ -269,7 +269,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, uint8_t *qp_store, int qp_stride, int is_luma){ int x, y, i; const int count= 1<<p->log2_count; - const int stride= is_luma ? p->temp_stride : (p->temp_stride/2 + 8); + const int stride= is_luma ? p->temp_stride : ((width+16+15)&(~15)); uint64_t block_align[32]; DCTELEM *block = (DCTELEM *)block_align; DCTELEM *block2= (DCTELEM *)(block_align+16); @@ -363,18 +363,18 @@ if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt, - MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, + MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, mpi->w,mpi->h); } dmpi= vf->dmpi; vf->priv->mpeg2= mpi->qscale_type; - - filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1); - filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>1, mpi->h>>1, mpi->qscale, mpi->qstride, 0); - filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>1, mpi->h>>1, mpi->qscale, mpi->qstride, 0); - + if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){ + filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1); + filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0); + filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, mpi->qscale, mpi->qstride, 0); + } vf_clone_mpi_attributes(dmpi, mpi); #ifdef HAVE_MMX @@ -402,31 +402,59 @@ } //===========================================================================// - static int query_format(struct vf_instance_s* vf, unsigned int fmt){ - switch(fmt) - { + switch(fmt){ + case IMGFMT_YVU9: + case IMGFMT_IF09: case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: - return vf_next_query_format(vf,vf->priv->outfmt); - } - return 0; + case IMGFMT_CLPL: + case IMGFMT_Y800: + case IMGFMT_Y8: + case IMGFMT_NV12: + case IMGFMT_444P: + case IMGFMT_422P: + case IMGFMT_411P: + return vf_next_query_format(vf,fmt); + } + return 0; } static unsigned int fmt_list[]={ - IMGFMT_YV12, - IMGFMT_I420, - IMGFMT_IYUV, - 0 + IMGFMT_YVU9, + IMGFMT_IF09, + IMGFMT_YV12, + IMGFMT_I420, + IMGFMT_IYUV, + IMGFMT_CLPL, + IMGFMT_Y800, + IMGFMT_Y8, + IMGFMT_NV12, + IMGFMT_444P, + IMGFMT_422P, + IMGFMT_411P, + 0 }; +static int control(struct vf_instance_s* vf, int request, void* data){ + switch(request){ + case VFCTRL_QUERY_MAX_PP_LEVEL: + return 6; + case VFCTRL_SET_PP_LEVEL: + vf->priv->log2_count= *((unsigned int*)data); + return CONTROL_TRUE; + } + return vf_next_control(vf,request,data); +} + static int open(vf_instance_t *vf, char* args){ vf->config=config; vf->put_image=put_image; vf->get_image=get_image; vf->query_format=query_format; vf->uninit=uninit; + vf->control= control; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); @@ -441,7 +469,7 @@ } #endif - vf->priv->log2_count= 6; + vf->priv->log2_count= 3; if (args) sscanf(args, "%d:%d", &vf->priv->log2_count, &vf->priv->qp);

1 0

CVS: main/libmpcodecs vf_hue.c,1.1,1.2
by Michael Niedermayer CVS 28 Oct '03

28 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv25680 Modified Files: vf_hue.c Log Message: hue changeing of grayscale probably isnt usefull Index: vf_hue.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_hue.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vf_hue.c 23 Oct 2003 18:36:02 -0000 1.1 +++ vf_hue.c 28 Oct 2003 13:51:04 -0000 1.2 @@ -130,8 +130,6 @@ case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_CLPL: - case IMGFMT_Y800: - case IMGFMT_Y8: case IMGFMT_NV12: case IMGFMT_444P: case IMGFMT_422P:

1 0

CVS: main/libmpcodecs vf_spp.c,1.9,1.10
by Michael Niedermayer CVS 28 Oct '03

28 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv22442 Modified Files: vf_spp.c Log Message: 10l Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vf_spp.c 28 Oct 2003 12:41:19 -0000 1.9 +++ vf_spp.c 28 Oct 2003 13:17:11 -0000 1.10 @@ -197,7 +197,7 @@ } } -static void store_slice_c(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int log2_scale){ +static void store_slice_c(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale){ int y, x; #define STORE(pos) \ @@ -205,7 +205,7 @@ if(temp & 0x100) temp= ~(temp>>31);\ dst[x + y*dst_stride + pos]= temp; - for(y=0; y<8; y++){ + for(y=0; y<height; y++){ uint8_t *d= dither[y]; for(x=0; x<width; x+=8){ int temp; @@ -222,10 +222,10 @@ } #ifdef HAVE_MMX -static void store_slice_mmx(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int log2_scale){ +static void store_slice_mmx(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale){ int y; - for(y=0; y<8; y++){ + for(y=0; y<height; y++){ uint8_t *dst1= dst; int16_t *src1= src; asm volatile( @@ -262,7 +262,7 @@ } #endif -static void (*store_slice)(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int log2_scale)= store_slice_c; +static void (*store_slice)(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale)= store_slice_c; static void (*requantize)(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation)= requantize_c; @@ -312,7 +312,7 @@ } } if(y) - store_slice(dst + (y-8)*dst_stride, p->temp + 8 + y*stride, dst_stride, stride, width, 6-p->log2_count); + store_slice(dst + (y-8)*dst_stride, p->temp + 8 + y*stride, dst_stride, stride, width, XMIN(8, height+8-y), 6-p->log2_count); } #if 0 for(y=0; y<height; y++){ @@ -330,10 +330,11 @@ 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 h= (height+16+15)&(~15); vf->priv->temp_stride= (width+16+15)&(~15); - vf->priv->temp= malloc(vf->priv->temp_stride*(height+16)*sizeof(int16_t)); - vf->priv->src = malloc(vf->priv->temp_stride*(height+16)*sizeof(uint8_t)); + vf->priv->temp= malloc(vf->priv->temp_stride*h*sizeof(int16_t)); + vf->priv->src = malloc(vf->priv->temp_stride*h*sizeof(uint8_t)); return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); }

1 0

CVS: main/libmpcodecs vf_spp.c,1.8,1.9
by Michael Niedermayer CVS 28 Oct '03

28 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv14469 Modified Files: vf_spp.c Log Message: another 10l ... Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vf_spp.c 28 Oct 2003 10:45:55 -0000 1.8 +++ vf_spp.c 28 Oct 2003 12:41:19 -0000 1.9 @@ -433,10 +433,12 @@ vf->priv->avctx= avcodec_alloc_context(); dsputil_init(&vf->priv->dsp, vf->priv->avctx); +#ifdef HAVE_MMX if(gCpuCaps.hasMMX){ store_slice= store_slice_mmx; requantize= requantize_mmx; } +#endif vf->priv->log2_count= 6;

1 0

CVS: main/libmpcodecs vf_spp.c,1.7,1.8
by Michael Niedermayer CVS 28 Oct '03

28 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv17226 Modified Files: vf_spp.c Log Message: optimize Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vf_spp.c 27 Oct 2003 23:47:39 -0000 1.7 +++ vf_spp.c 28 Oct 2003 10:45:55 -0000 1.8 @@ -96,13 +96,12 @@ #define SHIFT 22 -static inline void requantize(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ +static void requantize_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ int i; - const int qmul= qp<<1; int bias= 0; //FIXME unsigned int threshold1, threshold2; - threshold1= qmul*((1<<3) - bias) - 1; + threshold1= qp*((1<<4) - bias) - 1; threshold2= (threshold1<<1); memset(dst, 0, 64*sizeof(DCTELEM)); @@ -117,6 +116,76 @@ } } +#ifdef HAVE_MMX +static void requantize_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ + int bias= 0; //FIXME + unsigned int threshold1; + + threshold1= qp*((1<<4) - bias) - 1; + + asm volatile( +#define REQUANT_CORE(dst0, dst1, dst2, dst3, src0, src1, src2, src3) \ + "movq " #src0 ", %%mm0 \n\t"\ + "movq " #src1 ", %%mm1 \n\t"\ + "movq " #src2 ", %%mm2 \n\t"\ + "movq " #src3 ", %%mm3 \n\t"\ + "psubw %%mm4, %%mm0 \n\t"\ + "psubw %%mm4, %%mm1 \n\t"\ + "psubw %%mm4, %%mm2 \n\t"\ + "psubw %%mm4, %%mm3 \n\t"\ + "paddusw %%mm5, %%mm0 \n\t"\ + "paddusw %%mm5, %%mm1 \n\t"\ + "paddusw %%mm5, %%mm2 \n\t"\ + "paddusw %%mm5, %%mm3 \n\t"\ + "paddw %%mm6, %%mm0 \n\t"\ + "paddw %%mm6, %%mm1 \n\t"\ + "paddw %%mm6, %%mm2 \n\t"\ + "paddw %%mm6, %%mm3 \n\t"\ + "psubusw %%mm6, %%mm0 \n\t"\ + "psubusw %%mm6, %%mm1 \n\t"\ + "psubusw %%mm6, %%mm2 \n\t"\ + "psubusw %%mm6, %%mm3 \n\t"\ + "psraw $3, %%mm0 \n\t"\ + "psraw $3, %%mm1 \n\t"\ + "psraw $3, %%mm2 \n\t"\ + "psraw $3, %%mm3 \n\t"\ +\ + "movq %%mm0, %%mm7 \n\t"\ + "punpcklwd %%mm2, %%mm0 \n\t" /*A*/\ + "punpckhwd %%mm2, %%mm7 \n\t" /*C*/\ + "movq %%mm1, %%mm2 \n\t"\ + "punpcklwd %%mm3, %%mm1 \n\t" /*B*/\ + "punpckhwd %%mm3, %%mm2 \n\t" /*D*/\ + "movq %%mm0, %%mm3 \n\t"\ + "punpcklwd %%mm1, %%mm0 \n\t" /*A*/\ + "punpckhwd %%mm7, %%mm3 \n\t" /*C*/\ + "punpcklwd %%mm1, %%mm7 \n\t" /*B*/\ + "punpckhwd %%mm2, %%mm1 \n\t" /*D*/\ +\ + "movq %%mm0, " #dst0 " \n\t"\ + "movq %%mm7, " #dst1 " \n\t"\ + "movq %%mm3, " #dst2 " \n\t"\ + "movq %%mm1, " #dst3 " \n\t" + + "movd %2, %%mm4 \n\t" + "movd %3, %%mm5 \n\t" + "movd %4, %%mm6 \n\t" + "packssdw %%mm4, %%mm4 \n\t" + "packssdw %%mm5, %%mm5 \n\t" + "packssdw %%mm6, %%mm6 \n\t" + "packssdw %%mm4, %%mm4 \n\t" + "packssdw %%mm5, %%mm5 \n\t" + "packssdw %%mm6, %%mm6 \n\t" + REQUANT_CORE( (%1), 8(%1), 16(%1), 24(%1), (%0), 8(%0), 64(%0), 72(%0)) + REQUANT_CORE(32(%1), 40(%1), 48(%1), 56(%1),16(%0),24(%0), 48(%0), 56(%0)) + REQUANT_CORE(64(%1), 72(%1), 80(%1), 88(%1),32(%0),40(%0), 96(%0),104(%0)) + REQUANT_CORE(96(%1),104(%1),112(%1),120(%1),80(%0),88(%0),112(%0),120(%0)) + : : "r" (src), "r" (dst), "g" (threshold1+1), "g" (threshold1+5), "g" (threshold1-4) //FIXME maybe more accurate then needed? + ); + dst[0]= (src[0] + 4)>>3; +} +#endif + static inline void add_block(int16_t *dst, int stride, DCTELEM block[64]){ int y; @@ -195,6 +264,8 @@ static void (*store_slice)(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int log2_scale)= store_slice_c; +static void (*requantize)(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation)= requantize_c; + static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, uint8_t *qp_store, int qp_stride, int is_luma){ int x, y, i; const int count= 1<<p->log2_count; @@ -202,7 +273,7 @@ uint64_t block_align[32]; DCTELEM *block = (DCTELEM *)block_align; DCTELEM *block2= (DCTELEM *)(block_align+16); - + for(y=0; y<height; y++){ int index= 8 + 8*stride + y*stride; memcpy(p->src + index, src + y*src_stride, width); @@ -364,6 +435,7 @@ dsputil_init(&vf->priv->dsp, vf->priv->avctx); if(gCpuCaps.hasMMX){ store_slice= store_slice_mmx; + requantize= requantize_mmx; } vf->priv->log2_count= 6;

1 0

CVS: main mplayer.c,1.733,1.734
by Ivan Kalvachev CVS 28 Oct '03

28 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv23363 Modified Files: mplayer.c Log Message: make 'your system is too slow' appear only once Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.733 retrieving revision 1.734 diff -u -r1.733 -r1.734 --- mplayer.c 22 Oct 2003 22:58:42 -0000 1.733 +++ mplayer.c 23 Oct 2003 22:44:25 -0000 1.734 @@ -2333,7 +2333,7 @@ static int drop_message=0; float x; AV_delay=(a_pts-delay-audio_delay)-v_pts; - if(AV_delay>0.5 && drop_frame_cnt>50+drop_message*250){ + if(AV_delay>0.5 && drop_frame_cnt>50 && drop_message==0){ ++drop_message; mp_msg(MSGT_AVSYNC,MSGL_WARN,MSGTR_SystemTooSlow); }

4 4

CVS: main/libmpcodecs vf_spp.c,1.6,1.7
by Michael Niedermayer CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv17440 Modified Files: vf_spp.c Log Message: optimizing Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vf_spp.c 27 Oct 2003 22:25:28 -0000 1.6 +++ vf_spp.c 27 Oct 2003 23:47:39 -0000 1.7 @@ -128,20 +128,85 @@ } } +static void store_slice_c(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int log2_scale){ + int y, x; + +#define STORE(pos) \ + temp= ((src[x + y*src_stride + pos]<<log2_scale) + d[pos])>>6;\ + if(temp & 0x100) temp= ~(temp>>31);\ + dst[x + y*dst_stride + pos]= temp; + + for(y=0; y<8; y++){ + uint8_t *d= dither[y]; + for(x=0; x<width; x+=8){ + int temp; + STORE(0); + STORE(1); + STORE(2); + STORE(3); + STORE(4); + STORE(5); + STORE(6); + STORE(7); + } + } +} + +#ifdef HAVE_MMX +static void store_slice_mmx(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int log2_scale){ + int y; + + for(y=0; y<8; y++){ + uint8_t *dst1= dst; + int16_t *src1= src; + asm volatile( + "movq (%3), %%mm3 \n\t" + "movq (%3), %%mm4 \n\t" + "movd %4, %%mm2 \n\t" + "pxor %%mm0, %%mm0 \n\t" + "punpcklbw %%mm0, %%mm3 \n\t" + "punpckhbw %%mm0, %%mm4 \n\t" + "psraw %%mm2, %%mm3 \n\t" + "psraw %%mm2, %%mm4 \n\t" + "movd %5, %%mm2 \n\t" + "1: \n\t" + "movq (%0), %%mm0 \n\t" + "movq 8(%0), %%mm1 \n\t" + "paddw %%mm3, %%mm0 \n\t" + "paddw %%mm4, %%mm1 \n\t" + "psraw %%mm2, %%mm0 \n\t" + "psraw %%mm2, %%mm1 \n\t" + "packuswb %%mm1, %%mm0 \n\t" + "movq %%mm0, (%1) \n\t" + "addl $16, %0 \n\t" + "addl $8, %1 \n\t" + "cmpl %2, %1 \n\t" + " jb 1b \n\t" + : "+r" (src1), "+r"(dst1) + : "r"(dst + width), "r"(dither[y]), "g"(log2_scale), "g"(6-log2_scale) + ); + src += src_stride; + dst += dst_stride; + } +// if(width != mmxw) +// store_slice_c(dst + mmxw, src + mmxw, dst_stride, src_stride, width - mmxw, log2_scale); +} +#endif + +static void (*store_slice)(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int log2_scale)= store_slice_c; + static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, uint8_t *qp_store, int qp_stride, int is_luma){ int x, y, i; const int count= 1<<p->log2_count; - const int log2_scale= 6-p->log2_count; - const int stride= p->temp_stride; //FIXME + const int stride= is_luma ? p->temp_stride : (p->temp_stride/2 + 8); uint64_t block_align[32]; DCTELEM *block = (DCTELEM *)block_align; DCTELEM *block2= (DCTELEM *)(block_align+16); - + for(y=0; y<height; y++){ - memcpy(p->src + 8 + 8*stride + y*stride, src + y*src_stride, width); - memset(p->temp + 8*stride + y*stride, 0, stride*sizeof(int16_t)); + int index= 8 + 8*stride + y*stride; + memcpy(p->src + index, src + y*src_stride, width); for(x=0; x<8; x++){ - int index= 8 + 8*stride + y*stride; p->src[index - x - 1]= p->src[index + x ]; p->src[index + width + x ]= p->src[index + width - x - 1]; } @@ -153,6 +218,7 @@ //FIXME (try edge emu) for(y=0; y<height+8; y+=8){ + memset(p->temp + (8+y)*stride, 0, 8*stride*sizeof(int16_t)); for(x=0; x<width+8; x+=8){ const int qps= 3 + is_luma; int qp; @@ -174,27 +240,8 @@ add_block(p->temp + index, stride, block2); } } - } - -#define STORE(pos) \ - temp= ((p->temp[index + pos]<<log2_scale) + d[pos])>>6;\ - if(temp & 0x100) temp= ~(temp>>31);\ - dst[x + y*dst_stride + pos]= temp; - - for(y=0; y<height; y++){ - uint8_t *d= dither[y&7]; - for(x=0; x<width; x+=8){ - const int index= 8 + 8*stride + x + y*stride; - int temp; - STORE(0); - STORE(1); - STORE(2); - STORE(3); - STORE(4); - STORE(5); - STORE(6); - STORE(7); - } + if(y) + store_slice(dst + (y-8)*dst_stride, p->temp + 8 + y*stride, dst_stride, stride, width, 6-p->log2_count); } #if 0 for(y=0; y<height; y++){ @@ -315,7 +362,10 @@ vf->priv->avctx= avcodec_alloc_context(); dsputil_init(&vf->priv->dsp, vf->priv->avctx); - + if(gCpuCaps.hasMMX){ + store_slice= store_slice_mmx; + } + vf->priv->log2_count= 6; if (args) sscanf(args, "%d:%d", &vf->priv->log2_count, &vf->priv->qp);

1 0