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

CVS: main/libmpcodecs vf_scale.c,1.7,1.8
by Arpi of Ize 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv5656 Modified Files: vf_scale.c Log Message: swscaler yv12 vs i420 workaround Index: vf_scale.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vf_scale.c 13 Apr 2002 19:14:31 -0000 1.7 +++ vf_scale.c 19 Apr 2002 23:29:41 -0000 1.8 @@ -93,8 +93,10 @@ if(vf->priv->ctx) freeSwsContext(vf->priv->ctx); // new swscaler: - vf->priv->ctx=getSwsContextFromCmdLine(width,height,outfmt, - vf->priv->w,vf->priv->h,best); + vf->priv->ctx=getSwsContextFromCmdLine(width,height, + (outfmt==IMGFMT_I420 || outfmt==IMGFMT_IYUV)?IMGFMT_YV12:outfmt, + vf->priv->w,vf->priv->h, + (best==IMGFMT_I420 || best==IMGFMT_IYUV)?IMGFMT_YV12:best); if(!vf->priv->ctx){ // error... printf("Couldn't init SwScaler for this setup\n");

1 0

CVS: main/libmpdemux aviprint.c,1.10,1.11
by Arpi of Ize 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv4478 Modified Files: aviprint.c Log Message: 1000l Index: aviprint.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/aviprint.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- aviprint.c 18 Apr 2002 18:01:25 -0000 1.10 +++ aviprint.c 19 Apr 2002 23:24:13 -0000 1.11 @@ -60,7 +60,7 @@ printf("Block align: %d\n",h->nBlockAlign); printf("bits/sample: %d\n",h->wBitsPerSample); printf("cbSize: %d\n",h->cbSize); - if(h->wFormatTag=0x55 && h->cbSize>=12){ + if(h->wFormatTag==0x55 && h->cbSize>=12){ MPEGLAYER3WAVEFORMAT* h2=h; printf("mp3.wID=%d\n",h2->wID); printf("mp3.fdwFlags=0x%X\n",h2->fdwFlags);

1 0

CVS: main/libmpcodecs vd.c,1.34,1.35
by Arpi of Ize 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv3944 Modified Files: vd.c Log Message: debug line Index: vd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- vd.c 13 Apr 2002 19:14:31 -0000 1.34 +++ vd.c 19 Apr 2002 23:21:44 -0000 1.35 @@ -164,6 +164,7 @@ if(j<0){ // TODO: no match - we should use conversion... if(strcmp(vf->info->name,"scale")){ + mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Couldn't find matching colorspace - retrying with -vop scale...\n"); vf=vf_open_filter(vf,"scale",NULL); goto csp_again; }

1 0

CVS: main/libvo vo_x11.c,1.92,1.93
by Arpi of Ize 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv2022 Modified Files: vo_x11.c Log Message: workaround yv12 vs. i420 'bug' of swscale Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- vo_x11.c 16 Apr 2002 17:41:29 -0000 1.92 +++ vo_x11.c 19 Apr 2002 23:13:36 -0000 1.93 @@ -250,6 +250,7 @@ title = strdup("MPlayer X11 (XImage/Shm) render"); in_format=format; + if(in_format==IMGFMT_I420 || in_format==IMGFMT_IYUV) in_format=IMGFMT_YV12; srcW= width; srcH= height;

1 0

CVS: main/etc codecs.conf,1.167,1.168
by Arpi of Ize 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv1713 Modified Files: codecs.conf Log Message: nuppelvideo is I420-only :( Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- codecs.conf 13 Apr 2002 13:44:23 -0000 1.167 +++ codecs.conf 19 Apr 2002 23:12:32 -0000 1.168 @@ -48,7 +48,7 @@ status working fourcc NUV1 driver nuv - out I420,IYUV,YV12 + out I420,IYUV videocodec mpng info "mPNG codec"

1 0

CVS: main/libmpcodecs vd_ffmpeg.c,1.15,1.16
by Arpi of Ize 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv1484 Modified Files: vd_ffmpeg.c Log Message: accept I420/IYUV in query_format Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- vd_ffmpeg.c 14 Apr 2002 01:21:13 -0000 1.15 +++ vd_ffmpeg.c 19 Apr 2002 23:11:30 -0000 1.16 @@ -57,6 +57,8 @@ switch(cmd){ case VDCTRL_QUERY_FORMAT: if( (*((int*)arg)) == IMGFMT_YV12 ) return CONTROL_TRUE; + if( (*((int*)arg)) == IMGFMT_IYUV ) return CONTROL_TRUE; + if( (*((int*)arg)) == IMGFMT_I420 ) return CONTROL_TRUE; if( (*((int*)arg)) == IMGFMT_YUY2 && ctx->yuy2_support ) return CONTROL_TRUE; return CONTROL_FALSE; }

1 0

CVS: main/libmpcodecs ve_divx4.c,1.3,1.4
by Arpi of Ize 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv19471 Modified Files: ve_divx4.c Log Message: flipped rgb fixed Index: ve_divx4.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ve_divx4.c 13 Apr 2002 19:14:31 -0000 1.3 +++ ve_divx4.c 19 Apr 2002 22:19:42 -0000 1.4 @@ -132,9 +132,10 @@ return 3; // no conversion case IMGFMT_YUY2: case IMGFMT_UYVY: + return 1; // conversion case IMGFMT_RGB24: case IMGFMT_BGR24: - return 1; // conversion + return 1 | VFCAP_FLIPPED; // conversion+flipped } return 0; }

1 0

CVS: main/libvo vo_ggi.c,1.21,1.22
by Alex Beregszaszi 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv8153 Modified Files: vo_ggi.c Log Message: minor fixes and flipping support Index: vo_ggi.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- vo_ggi.c 15 Apr 2002 18:04:18 -0000 1.21 +++ vo_ggi.c 19 Apr 2002 16:50:03 -0000 1.22 @@ -9,9 +9,14 @@ * implement direct rendering support - NEEDS TESTING * implement non-directbuffer support - NEEDS TESTING * check on many devices - * implement gamma handling + * implement gamma handling (VAA isn't obsoleted?) + + BUGS: + * fbdev & DR produces two downscaled images + * fbdev & FLIP (& DR) produces no image Thanks to Andreas Beck for his patches. + Many thanks to Atmosfear, he hacked this driver to work with Planar formats, and he fixed the RGB handling. */ @@ -35,6 +40,7 @@ #define GGI_FRAMES 4 #undef GGI_GAMMA +#undef GGI_FLIP #include "../libmpcodecs/mp_image.h" @@ -63,6 +69,7 @@ int srcheight; int srcformat; int srcdepth; + int srcbpp; /* destination */ int dstwidth; @@ -70,6 +77,8 @@ int async; int directbuffer; + + int voflags; } ggi_conf; static uint32_t draw_frame_directbuffer(uint8_t *src[]); @@ -77,7 +86,7 @@ static void flip_page_directbuffer(void); static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, - uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info) + uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info) { ggi_mode mode = { @@ -115,30 +124,13 @@ break; } -#if 1 +#if 0 printf("[ggi] mode: "); ggiPrintMode(&mode); printf("\n"); #endif ggiCheckMode(ggi_conf.vis, &mode); - - switch(format) - { - case IMGFMT_YV12: - mode.graphtype = GT_32BIT; - if (!ggiSetMode(ggi_conf.vis, &mode)) - break; - mode.graphtype = GT_24BIT; - if (!ggiSetMode(ggi_conf.vis, &mode)) - break; - mode.graphtype = GT_16BIT; - if (!ggiSetMode(ggi_conf.vis, &mode)) - break; - mode.graphtype = GT_15BIT; - if (!ggiSetMode(ggi_conf.vis, &mode)) - break; - } if (ggiSetMode(ggi_conf.vis, &mode)) { @@ -160,7 +152,7 @@ ggi_conf.gmode = mode; -#if 1 +#if 0 printf("[ggi] mode: "); ggiPrintMode(&mode); printf("\n"); @@ -178,6 +170,8 @@ ggi_conf.srcwidth = width; ggi_conf.srcheight = height; ggi_conf.srcformat = format; + + ggi_conf.voflags = flags; if (IMGFMT_IS_RGB(ggi_conf.srcformat)) { @@ -271,6 +265,8 @@ video_out_ggi.draw_osd = draw_osd_directbuffer; video_out_ggi.flip_page = flip_page_directbuffer; } + + ggi_conf.srcbpp = (ggi_conf.srcdepth+7)/8; return(0); } @@ -306,54 +302,53 @@ ggi_conf.currframe = 0; ggi_conf.frames = 1; } - + + mpi->planes[1] = mpi->planes[2] = NULL; + mpi->stride[1] = mpi->stride[2] = 0; + + mpi->stride[0] = ggi_conf.srcwidth*ggi_conf.srcbpp; mpi->planes[0] = ggi_conf.buffer[ggi_conf.currframe]->write; - mpi->stride[0] = ggi_conf.srcwidth*((ggi_conf.srcdepth+7)/8); mpi->flags |= MP_IMGFLAG_DIRECT; +#ifdef GGI_FLIP + if (ggi_conf.voflags & VOFLAG_FLIPPING) + { + mpi->stride[0] = -mpi->stride[0]; + mpi->planes[0] -= mpi->stride[0]*(ggi_conf.srcheight-1); + } +#endif + return(VO_TRUE); } static uint32_t draw_frame_directbuffer(uint8_t *src[]) { - int x, y, size; - unsigned char *ptr, *ptr2, *spt; + unsigned char *dst_ptr; + int dst_stride, dst_bpp; ggiResourceAcquire(ggi_conf.buffer[ggi_conf.currframe]->resource, GGI_ACTYPE_WRITE); ggiSetWriteFrame(ggi_conf.vis, ggi_conf.currframe); - spt = src[0]; - ptr = ggi_conf.buffer[ggi_conf.currframe]->write; - size = ggi_conf.buffer[ggi_conf.currframe]->buffer.plb.pixelformat->size/8; + dst_ptr = ggi_conf.buffer[ggi_conf.currframe]->write; + dst_stride = ggi_conf.buffer[ggi_conf.currframe]->buffer.plb.stride; + dst_bpp = (ggi_conf.buffer[ggi_conf.currframe]->buffer.plb.pixelformat->size+7)/8; -#if 0 - for (y = 0; y < ggi_conf.srcheight; y++) +#ifdef GGI_FLIP + if (ggi_conf.voflags & VOFLAG_FLIPPING) { - ptr2 = ptr; - for (x = 0; x < ggi_conf.srcwidth; x++) - { - ptr2[0] = *spt++; - ptr2[1] = *spt++; - ptr2[2] = *spt++; - switch(ggi_conf.srcformat) - { - case IMGFMT_BGR32: - case IMGFMT_RGB32: - spt++; - break; - } - ptr2 += size; - } - ptr += ggi_conf.buffer[ggi_conf.currframe]->buffer.plb.stride; + dst_stride = -dst_stride; + dst_ptr -= dst_stride*(ggi_conf.srcheight-1); } -#else - mem2agpcpy_pic(ptr, spt, ggi_conf.srcwidth*size, ggi_conf.srcheight, - ggi_conf.buffer[ggi_conf.currframe]->buffer.plb.stride, - ggi_conf.srcwidth*ggi_conf.srcdepth/8); #endif + /* memcpy_pic(dst, src, bytes per line, height, dst_stride, src_stride) */ + + memcpy_pic(dst_ptr, src[0], ggi_conf.srcwidth*dst_bpp, ggi_conf.srcheight, + dst_stride, + ggi_conf.srcwidth*ggi_conf.srcbpp); + ggiResourceRelease(ggi_conf.buffer[ggi_conf.currframe]->resource); return(0); @@ -471,7 +466,11 @@ (IMGFMT_IS_RGB(format) && (IMGFMT_RGB_DEPTH(format) == vo_dbpp))) { if (ggi_conf.directbuffer) +#ifdef GGI_FLIP + return(3|VFCAP_OSD|VFCAP_FLIP); +#else return(3|VFCAP_OSD); +#endif else return(3); } @@ -479,7 +478,11 @@ if (IMGFMT_IS_BGR(format) || IMGFMT_IS_RGB(format)) { if (ggi_conf.directbuffer) +#ifdef GGI_FLIP + return(1|VFCAP_OSD|VFCAP_FLIP); +#else return(1|VFCAP_OSD); +#endif else return(1); } @@ -543,11 +546,9 @@ { switch(request) { -#ifdef GGI_GAMMA case VOCTRL_QUERY_VAA: query_vaa((vo_vaa_t*)data); return VO_TRUE; -#endif case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); case VOCTRL_GET_IMAGE:

1 0

CVS: main/libdha/sysdep pci_alpha.c,1.1,1.2
by Nick Kurshev 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libdha/sysdep In directory mail:/var/tmp.root/cvs-serv841/sysdep Modified Files: pci_alpha.c Log Message: sync with mplayerxp Index: pci_alpha.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/sysdep/pci_alpha.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pci_alpha.c 15 Jan 2002 08:31:53 -0000 1.1 +++ pci_alpha.c 19 Apr 2002 16:34:04 -0000 1.2 @@ -11,7 +11,7 @@ unsigned char dev, int func) { - int retval; + unsigned long retval; pciconfig_read(bus, dev<<3, PCI_ID_REG, 4, &retval); return retval; } @@ -22,7 +22,7 @@ int func, unsigned cmd) { - long retval; + unsigned long retval; pciconfig_read(bus, dev<<3, cmd, 4, &retval); return retval; }

1 0

CVS: main/libdha libdha.c,1.6,1.7 libdha.h,1.6,1.7 pci.c,1.8,1.9
by Nick Kurshev 19 Apr '02

19 Apr '02

Update of /cvsroot/mplayer/main/libdha In directory mail:/var/tmp.root/cvs-serv841 Modified Files: libdha.c libdha.h pci.c Log Message: sync with mplayerxp Index: libdha.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/libdha.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libdha.c 4 Mar 2002 19:30:02 -0000 1.6 +++ libdha.c 19 Apr 2002 16:33:54 -0000 1.7 @@ -27,6 +27,9 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> +#ifdef ARCH_ALPHA +#include <sys/io.h> +#endif #include <unistd.h> /* instead exit() use libdha_exit, and do the 'mother-application' deinit @@ -67,8 +70,12 @@ #include "kernelhelper/dhahelper.h" static int mem=-1; -void *map_phys_mem(unsigned base, unsigned size) +void *map_phys_mem(unsigned long base, unsigned long size) { +#ifdef ARCH_ALPHA +/* TODO: move it into sysdep */ + base += bus_base(); +#endif if ( (mem = open("/dev/dhahelper",O_RDWR)) < 0) { if ( (mem = open(DEV_MEM,O_RDWR)) == -1) { @@ -95,8 +102,12 @@ #else static int mem=-1; -void *map_phys_mem(unsigned base, unsigned size) +void *map_phys_mem(unsigned long base, unsigned long size) { +#ifdef ARCH_ALPHA +/* TODO: move it into sysdep */ + base += bus_base(); +#endif if ( (mem = open(DEV_MEM,O_RDWR)) == -1) { perror("libdha: open(/dev/mem) failed") ; exit(1) ; } @@ -104,7 +115,7 @@ } #endif /* CONFIG_DHAHELPER */ -void unmap_phys_mem(void *ptr, unsigned size) +void unmap_phys_mem(void *ptr, unsigned long size) { int res=munmap(ptr,size) ; if (res == -1) { perror("libdha: munmap() failed") ; exit(1) ; } Index: libdha.h =================================================================== RCS file: /cvsroot/mplayer/main/libdha/libdha.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libdha.h 2 Feb 2002 12:14:56 -0000 1.6 +++ libdha.h 19 Apr 2002 16:33:54 -0000 1.7 @@ -55,8 +55,8 @@ extern void OUTPORT32(unsigned idx,unsigned val); #define OUTPORT(idx,val) OUTPORT32(idx,val) -extern void * map_phys_mem(unsigned base, unsigned size); -extern void unmap_phys_mem(void *ptr, unsigned size); +extern void * map_phys_mem(unsigned long base, unsigned long size); +extern void unmap_phys_mem(void *ptr, unsigned long size); /* These are the region types */ #define MTRR_TYPE_UNCACHABLE 0 @@ -70,4 +70,4 @@ } #endif -#endif \ No newline at end of file +#endif Index: pci.c =================================================================== RCS file: /cvsroot/mplayer/main/libdha/pci.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- pci.c 20 Jan 2002 12:15:01 -0000 1.8 +++ pci.c 19 Apr 2002 16:33:54 -0000 1.9 @@ -736,4 +736,4 @@ int disable_app_io( void ) { return disable_os_io(); -} \ No newline at end of file +}

1 0