May 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libvo x11_common.h,1.5,1.6 x11_common.c,1.19,1.20 vo_x11.c,1.20,1.21 vo_xmga.c,1.20,1.21 vo_xv.c,1.20,1.21
by Gabor Lenart 31 May '01

31 May '01

Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv9561/main/libvo Modified Files: x11_common.h x11_common.c vo_x11.c vo_xmga.c vo_xv.c Log Message: Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED. Index: x11_common.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** x11_common.h 2001/05/08 12:17:03 1.5 --- x11_common.h 2001/05/31 22:32:58 1.6 *************** *** 8,11 **** --- 8,17 ---- extern int vo_dheight; + extern char *mDisplayName; + extern Display *mDisplay; + extern Window *mRootWin; + extern int mScreen; + extern int mLocalDisplay; + int vo_init( void ); int vo_hidecursor ( Display* , Window ); Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** x11_common.c 2001/05/09 20:15:37 1.19 --- x11_common.c 2001/05/31 22:32:58 1.20 *************** *** 23,27 **** --- 23,33 ---- static int timeout_save=0; + char* mDisplayName=NULL; + Display* mDisplay; + Window mRootWin; + int mScreen; + int mLocalDisplay; + void vo_hidecursor ( Display *disp , Window win ) { *************** *** 43,61 **** { int CompletionType = -1; ! int mScreen; int bpp; ! char * DisplayName = ":0.0"; ! Display * mDisplay; XImage * mXImage; ! Window mRootWin; static XWindowAttributes attribs; if(vo_depthonscreen) return 1; // already called ! if ( getenv( "DISPLAY" ) ) DisplayName=getenv( "DISPLAY" ); ! mDisplay=XOpenDisplay( DisplayName ); if ( !mDisplay ) { ! printf( "vo: couldn't open the X11 display!\n" ); return 0; } --- 49,70 ---- { int CompletionType = -1; ! // int mScreen; int bpp; ! // char * DisplayName = ":0.0"; ! // Display * mDisplay; XImage * mXImage; ! // Window mRootWin; static XWindowAttributes attribs; if(vo_depthonscreen) return 1; // already called + + if (!mDisplayName) + if (!(mDisplayName=getenv("DISPLAY"))) + mDisplayName=strdup(":0.0"); ! mDisplay=XOpenDisplay(mDisplayName); if ( !mDisplay ) { ! printf( "vo: couldn't open the X11 display (%s)!\n",mDisplayName ); return 0; } *************** *** 73,78 **** XDestroyImage( mXImage ); if((vo_depthonscreen+7)/8 != (bpp+7)/8) vo_depthonscreen=bpp; // by A'rpi ! XCloseDisplay( mDisplay ); ! printf("X11 running at %dx%d depth: %d\n",vo_screenwidth,vo_screenheight,vo_depthonscreen); return 1; } --- 82,89 ---- XDestroyImage( mXImage ); if((vo_depthonscreen+7)/8 != (bpp+7)/8) vo_depthonscreen=bpp; // by A'rpi ! // XCloseDisplay( mDisplay ); ! #warning Better local display detection method is needed. ! if (*mDisplayName==':') mLocalDisplay=1; else mLocalDisplay=0; ! printf("X11 running at %dx%d depth: %d (\"%s\" => %s display)\n",vo_screenwidth,vo_screenheight,vo_depthonscreen,mDisplayName,mLocalDisplay?"local":"remote"); return 1; } Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** vo_x11.c 2001/05/24 20:48:45 1.20 --- vo_x11.c 2001/05/31 22:32:58 1.21 *************** *** 62,66 **** /* X11 related variables */ ! static Display *mDisplay; static Window mywindow; static GC mygc; --- 62,66 ---- /* X11 related variables */ ! //static Display *mDisplay; static Window mywindow; static GC mygc; *************** *** 121,125 **** unsigned int fg,bg; char *hello=( title == NULL ) ? "X11 render" : title; ! char *name=":0.0"; XSizeHints hint; XVisualInfo vinfo; --- 121,125 ---- unsigned int fg,bg; char *hello=( title == NULL ) ? "X11 render" : title; ! // char *name=":0.0"; XSizeHints hint; XVisualInfo vinfo; *************** *** 137,151 **** if( !vo_init() ) return 0; // Can't open X11 - if( getenv( "DISPLAY" ) ) name=getenv( "DISPLAY" ); - - mDisplay=XOpenDisplay( name ); - - if ( mDisplay == NULL ) - { - printf( "Can not open display\n" ); - return -1; - } - screen=DefaultScreen( mDisplay ); - hint.x=0; hint.y=0; --- 137,140 ---- *************** *** 173,177 **** if (have_vm) { if (vidmodes==NULL) ! XF86VidModeGetAllModeLines(mDisplay,screen,&modecount,&vidmodes); j=0; modeline_width=vidmodes[0]->hdisplay; --- 162,166 ---- if (have_vm) { if (vidmodes==NULL) ! XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); j=0; modeline_width=vidmodes[0]->hdisplay; *************** *** 192,201 **** printf("XF86VM: Selected video mode %dx%d for image size %dx%d.\n",modeline_width, modeline_height, image_width, image_height); ! XF86VidModeLockModeSwitch(mDisplay,screen,0); ! XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[j]); ! XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[j]); X=(vo_screenwidth-modeline_width)/2; Y=(vo_screenheight-modeline_height)/2; ! XF86VidModeSetViewPort(mDisplay,screen,X,Y); } } --- 181,190 ---- printf("XF86VM: Selected video mode %dx%d for image size %dx%d.\n",modeline_width, modeline_height, image_width, image_height); ! XF86VidModeLockModeSwitch(mDisplay,mScreen,0); ! XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); ! XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); X=(vo_screenwidth-modeline_width)/2; Y=(vo_screenheight-modeline_height)/2; ! XF86VidModeSetViewPort(mDisplay,mScreen,X,Y); } } *************** *** 212,217 **** hint.flags=PPosition | PSize; ! bg=WhitePixel( mDisplay,screen ); ! fg=BlackPixel( mDisplay,screen ); XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs ); --- 201,206 ---- hint.flags=PPosition | PSize; ! bg=WhitePixel( mDisplay,mScreen ); ! fg=BlackPixel( mDisplay,mScreen ); XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs ); *************** *** 219,225 **** if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24; ! XMatchVisualInfo( mDisplay,screen,depth,TrueColor,&vinfo ); ! theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,screen ), vinfo.visual,AllocNone ); --- 208,214 ---- if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24; ! XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo ); ! theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ), vinfo.visual,AllocNone ); *************** *** 229,233 **** xswamask=CWBackPixel | CWBorderPixel |CWColormap; ! mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,screen ), hint.x,hint.y, hint.width,hint.height, --- 218,222 ---- xswamask=CWBackPixel | CWBorderPixel |CWColormap; ! mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), hint.x,hint.y, hint.width,hint.height, *************** *** 249,253 **** #ifdef SH_MEM ! if ( XShmQueryExtension( mDisplay ) ) Shmem_Flag=1; else { --- 238,242 ---- #ifdef SH_MEM ! if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1; else { Index: vo_xmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** vo_xmga.c 2001/05/20 21:49:45 1.20 --- vo_xmga.c 2001/05/31 22:32:58 1.21 *************** *** 63,67 **** }; ! static Display * mDisplay; static Window mWindow; static GC mGC; --- 63,67 ---- }; ! //static Display * mDisplay; static Window mWindow; static GC mGC; *************** *** 226,240 **** if ( X_already_started ) return -1; ! vo_init(); ! ! if ( getenv( "DISPLAY" ) ) name=getenv( "DISPLAY" ); ! mDisplay=XOpenDisplay(name); ! if ( mDisplay == NULL ) ! { ! printf( "Can not open X11 display\n" ); ! return -1; ! } ! ! mScreen=DefaultScreen( mDisplay ); mvWidth=width; mvHeight=height; --- 226,230 ---- if ( X_already_started ) return -1; ! if (!vo_init()) return -1; mvWidth=width; mvHeight=height; Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** vo_xv.c 2001/05/20 21:48:50 1.20 --- vo_xv.c 2001/05/31 22:32:58 1.21 *************** *** 49,53 **** /* X11 related variables */ ! static Display *mydisplay; static Window mywindow; static GC mygc; --- 49,53 ---- /* X11 related variables */ ! //static Display *mydisplay; static Window mywindow; static GC mygc; *************** *** 96,102 **** static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { ! int screen; char *hello = (title == NULL) ? "Xv render" : title; ! char *name = ":0.0"; XSizeHints hint; XVisualInfo vinfo; --- 96,102 ---- static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { ! // int screen; char *hello = (title == NULL) ? "Xv render" : title; ! // char *name = ":0.0"; XSizeHints hint; XVisualInfo vinfo; *************** *** 113,129 **** mFullscreen=flags&1; dwidth=d_width; dheight=d_height; - if(getenv("DISPLAY")) name = getenv("DISPLAY"); - - mydisplay = XOpenDisplay(name); - - if (mydisplay == NULL) - { - printf("Can't open display\n"); - return -1; - } - - screen = DefaultScreen(mydisplay); - #ifdef HAVE_GUI if ( vo_window == None ) --- 113,119 ---- mFullscreen=flags&1; dwidth=d_width; dheight=d_height; + + if (!vo_init()) return -1; #ifdef HAVE_GUI if ( vo_window == None ) *************** *** 140,147 **** } hint.flags = PPosition | PSize; ! XGetWindowAttributes(mydisplay, DefaultRootWindow(mydisplay), &attribs); depth=attribs.depth; if (depth != 15 && depth != 16 && depth != 24 && depth != 32) depth = 24; ! XMatchVisualInfo(mydisplay, screen, depth, TrueColor, &vinfo); xswa.background_pixel = 0; --- 130,137 ---- } hint.flags = PPosition | PSize; ! XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); depth=attribs.depth; if (depth != 15 && depth != 16 && depth != 24 && depth != 32) depth = 24; ! XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); xswa.background_pixel = 0; *************** *** 149,163 **** xswamask = CWBackPixel | CWBorderPixel; ! mywindow = XCreateWindow(mydisplay, RootWindow(mydisplay,screen), hint.x, hint.y, hint.width, hint.height, 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); ! vo_hidecursor(mydisplay,mywindow); ! XSelectInput(mydisplay, mywindow, StructureNotifyMask | KeyPressMask ); ! XSetStandardProperties(mydisplay, mywindow, hello, hello, None, NULL, 0, &hint); ! if ( mFullscreen ) vo_x11_decoration( mydisplay,mywindow,0 ); ! XMapWindow(mydisplay, mywindow); ! XFlush(mydisplay); ! XSync(mydisplay, False); #ifdef HAVE_GUI } --- 139,153 ---- xswamask = CWBackPixel | CWBorderPixel; ! mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), hint.x, hint.y, hint.width, hint.height, 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); ! vo_hidecursor(mDisplay,mywindow); ! XSelectInput(mDisplay, mywindow, StructureNotifyMask | KeyPressMask ); ! XSetStandardProperties(mDisplay, mywindow, hello, hello, None, NULL, 0, &hint); ! if ( mFullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); ! XMapWindow(mDisplay, mywindow); ! XFlush(mDisplay); ! XSync(mDisplay, False); #ifdef HAVE_GUI } *************** *** 168,173 **** if ( vo_screenwidth != d_width ) { ! XMoveWindow( mydisplay,mywindow,( vo_screenwidth - d_width ) / 2,( vo_screenheight - d_height ) / 2 ); ! XResizeWindow( mydisplay,mywindow,d_width,d_height ); } else mFullscreen=1; --- 158,163 ---- if ( vo_screenwidth != d_width ) { ! XMoveWindow( mDisplay,mywindow,( vo_screenwidth - d_width ) / 2,( vo_screenheight - d_height ) / 2 ); ! XResizeWindow( mDisplay,mywindow,d_width,d_height ); } else mFullscreen=1; *************** *** 175,185 **** #endif ! mygc = XCreateGC(mydisplay, mywindow, 0L, &xgcv); xv_port = 0; ! if (Success == XvQueryExtension(mydisplay,&ver,&rel,&req,&ev,&err)) { /* check for Xvideo support */ ! if (Success != XvQueryAdaptors(mydisplay,DefaultRootWindow(mydisplay), &adaptors,&ai)) { printf("Xv: XvQueryAdaptors failed"); --- 165,175 ---- #endif ! mygc = XCreateGC(mDisplay, mywindow, 0L, &xgcv); xv_port = 0; ! if (Success == XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)) { /* check for Xvideo support */ ! if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)) { printf("Xv: XvQueryAdaptors failed"); *************** *** 194,198 **** if (xv_port != 0) { ! fo = XvListImageFormats(mydisplay, xv_port, (int*)&formats); xv_format=0; for(i = 0; i < formats; i++) --- 184,188 ---- if (xv_port != 0) { ! fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); xv_format=0; for(i = 0; i < formats; i++) *************** *** 217,223 **** current_buf=0; ! XGetGeometry( mydisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); drwX=0; drwY=0; ! XTranslateCoordinates( mydisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); --- 207,213 ---- current_buf=0; ! XGetGeometry( mDisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); drwX=0; drwY=0; ! XTranslateCoordinates( mDisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); *************** *** 233,237 **** } ! saver_off(mydisplay); // turning off screen saver return 0; } --- 223,227 ---- } ! saver_off(mDisplay); // turning off screen saver return 0; } *************** *** 252,256 **** * mit-shm this will bomb... */ ! xvimage[foo] = XvShmCreateImage(mydisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); --- 242,246 ---- * mit-shm this will bomb... */ ! xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); *************** *** 259,264 **** xvimage[foo]->data = Shminfo[foo].shmaddr; ! XShmAttach(mydisplay, &Shminfo[foo]); ! XSync(mydisplay, False); shmctl(Shminfo[foo].shmid, IPC_RMID, 0); memset(xvimage[foo]->data,128,xvimage[foo]->data_size); --- 249,254 ---- xvimage[foo]->data = Shminfo[foo].shmaddr; ! XShmAttach(mDisplay, &Shminfo[foo]); ! XSync(mDisplay, False); shmctl(Shminfo[foo].shmid, IPC_RMID, 0); memset(xvimage[foo]->data,128,xvimage[foo]->data_size); *************** *** 268,277 **** static void check_events(void) { ! int e=vo_x11_check_events(mydisplay); if(e&VO_EVENT_RESIZE) { ! XGetGeometry( mydisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); drwX=0; drwY=0; ! XTranslateCoordinates( mydisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); --- 258,267 ---- static void check_events(void) { ! int e=vo_x11_check_events(mDisplay); if(e&VO_EVENT_RESIZE) { ! XGetGeometry( mDisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); drwX=0; drwY=0; ! XTranslateCoordinates( mDisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); *************** *** 328,336 **** vo_draw_text(image_width,image_height,draw_alpha); check_events(); ! XvShmPutImage(mydisplay, xv_port, mywindow, mygc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), False); ! XFlush(mydisplay); current_buf=(current_buf+1)%NUM_BUFFERS; return; --- 318,326 ---- vo_draw_text(image_width,image_height,draw_alpha); check_events(); ! XvShmPutImage(mDisplay, xv_port, mywindow, mygc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), False); ! XFlush(mDisplay); current_buf=(current_buf+1)%NUM_BUFFERS; return; *************** *** 437,441 **** static void uninit(void) { ! saver_on(mydisplay); // screen saver back on } --- 427,431 ---- static void uninit(void) { ! saver_on(mDisplay); // screen saver back on } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS AUTHORS,1.38,1.39
by Gabor Lenart 31 May '01

31 May '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv9561/main/DOCS Modified Files: AUTHORS Log Message: Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED. Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/AUTHORS,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** AUTHORS 2001/05/30 05:56:05 1.38 --- AUTHORS 2001/05/31 22:32:58 1.39 *************** *** 33,36 **** --- 33,37 ---- - prelimenary DVD support - another GUI code (is that so..?) + - various X11 cleanups and fixes Gábor Bérczi (Gabucino): <gabucino(a)k2.jozsef.kando.hu> _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main cfg-mplayer.h,1.48,1.49
by Gabor Lenart 31 May '01

31 May '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv9561/main Modified Files: cfg-mplayer.h Log Message: Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED. Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -r1.48 -r1.49 *** cfg-mplayer.h 2001/05/14 09:37:44 1.48 --- cfg-mplayer.h 2001/05/31 22:32:58 1.49 *************** *** 27,30 **** --- 27,34 ---- extern int sub_unicode; + #ifdef HAVE_X11 + extern char *mDisplayName; + #endif + struct config conf[]={ /* name, pointer, type, flags, min, max */ *************** *** 35,38 **** --- 39,45 ---- {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0}, {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0}, + #ifdef HAVE_X11 + {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0}, + #endif {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1}, {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 }, _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libac3 Makefile,1.6,1.7
by Nick Kurshev 31 May '01

31 May '01

Update of /cvsroot/mplayer/main/libac3 In directory usw-pr-cvs1:/tmp/cvs-serv14477/main/libac3 Modified Files: Makefile Log Message: Fix -Ox comments Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libac3/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Makefile 2001/05/31 17:58:56 1.6 --- Makefile 2001/05/31 18:13:05 1.7 *************** *** 7,12 **** OBJS = bit_allocate.o bitstream.o coeff.o crc.o debug.o decode.o dither.o exponent.o imdct.o parse.o rematrix.o sanity_check.o srfft.o stats.o $(OPTIONAL_OBJS) # OBJS = $(SRCS:.c=.o) ! #WARNING: Please don't remove -O2 key. It should overwrite any other ! # keys. I know this is an inconvenience, but I'll fix it later! CFLAGS = $(OPTFLAGS) -O2 -I. -I.. -DHAVE_CONFIG_H --- 7,12 ---- OBJS = bit_allocate.o bitstream.o coeff.o crc.o debug.o decode.o dither.o exponent.o imdct.o parse.o rematrix.o sanity_check.o srfft.o stats.o $(OPTIONAL_OBJS) # OBJS = $(SRCS:.c=.o) ! #WARNING: Please don't remove this -O2 key. It should overwrite any other ! # -Ox keys. I know this is an inconvenience, but I'll fix it later! CFLAGS = $(OPTFLAGS) -O2 -I. -I.. -DHAVE_CONFIG_H _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main subreader.c,1.15,1.16 subreader.h,1.6,1.7
by Megyer Laszlo 31 May '01

31 May '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv13410 Modified Files: subreader.c subreader.h Log Message: Added support for .ssa subtitles Index: subreader.c =================================================================== RCS file: /cvsroot/mplayer/main/subreader.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** subreader.c 2001/05/31 02:07:34 1.15 --- subreader.c 2001/05/31 18:08:23 1.16 *************** *** 22,29 **** int sub_format=-1; // 0 for microdvd // 1 for SubRip ! // 2 for the third format (what's this?) // 3 for SAMI (smi) // 4 for vplayer format // 5 for RT format int eol(char p) { --- 22,30 ---- int sub_format=-1; // 0 for microdvd // 1 for SubRip ! // 2 for SubViewer // 3 for SAMI (smi) // 4 for vplayer format // 5 for RT format + // 6 for ssa (Sub Station Alpha) int eol(char p) { *************** *** 296,300 **** --- 297,321 ---- } + subtitle *sub_read_line_ssa(FILE *fd,subtitle *current) { + int hour1, min1, sec1, hunsec1, + hour2, min2, sec2, hunsec2, nothing; + + char line[1000], + line2[1000]; + do { + if (!fgets (line, 1000, fd)) return NULL; + } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d," + "*Default,%d,%d,%d,%d,,%[^\n\r]", &nothing, &hour1, &min1, + &sec1, &hunsec1, + &hour2, &min2, &sec2, &hunsec2, &nothing, + &nothing, &nothing, &nothing, line2) < 14); + current->lines=1; + current->start = 360000*hour1 + 6000*min1 + 100*sec1 + hunsec1; + current->end = 360000*hour2 + 6000*min2 + 100*sec2 + hunsec2; + current->text[0]=(char *) malloc(strlen(line2)+1); + strcpy(current->text[0],line2); + return current; + } int sub_autodetect (FILE *fd) { *************** *** 321,327 **** // too weak test for RT // Please someone who knows the format of RT... FIX IT!!! ! // It may conflict with other sub formats in the future if ( *line == '<' ) {sub_uses_time=1;return 5;} } --- 342,353 ---- // too weak test for RT // Please someone who knows the format of RT... FIX IT!!! ! // It may conflict with other sub formats in the future (actually it doesn't) if ( *line == '<' ) {sub_uses_time=1;return 5;} + + // I have only seen only 1 piece of .ssa file. + // It may be not correct (tell me if it's not) + if (!memcmp(line, "Dialogue: Marked", 16)) + {sub_uses_time=1; return 6;} } *************** *** 334,338 **** int n_max; subtitle *first; ! subtitle * (*func[6])(FILE *fd,subtitle *dest)= { sub_read_line_microdvd, --- 360,364 ---- int n_max; subtitle *first; ! subtitle * (*func[7])(FILE *fd,subtitle *dest)= { sub_read_line_microdvd, *************** *** 341,345 **** sub_read_line_sami, sub_read_line_vplayer, ! sub_read_line_rt }; --- 367,372 ---- sub_read_line_sami, sub_read_line_vplayer, ! sub_read_line_rt, ! sub_read_line_ssa }; Index: subreader.h =================================================================== RCS file: /cvsroot/mplayer/main/subreader.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** subreader.h 2001/05/27 20:59:58 1.6 --- subreader.h 2001/05/31 18:08:24 1.7 *************** *** 11,15 **** // 3 for SAMI (smi) // 4 for vplayer format ! #define SUB_MAX_TEXT 5 --- 11,15 ---- // 3 for SAMI (smi) // 4 for vplayer format ! // other stuff in subreader.c #define SUB_MAX_TEXT 5 _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libac3/mmx imdct_3dnow.c,1.4,1.5 srfft_3dnow.c,1.8,1.9 srfftp_3dnow.h,1.3,1.4
by Nick Kurshev 31 May '01

31 May '01

Update of /cvsroot/mplayer/main/libac3/mmx In directory usw-pr-cvs1:/tmp/cvs-serv11371/main/libac3/mmx Modified Files: imdct_3dnow.c srfft_3dnow.c srfftp_3dnow.h Log Message: libac3 now is full 3dnow! optimized Index: imdct_3dnow.c =================================================================== RCS file: /cvsroot/mplayer/main/libac3/mmx/imdct_3dnow.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** imdct_3dnow.c 2001/05/27 01:53:17 1.4 --- imdct_3dnow.c 2001/05/31 17:58:56 1.5 *************** *** 80,86 **** } - __asm__ __volatile__ ("femms":::"memory"); fft_128p (&buf[0]); - __asm__ __volatile__ ("femms":::"memory"); // Post IFFT complex multiply plus IFFT complex conjugate --- 80,84 ---- *************** *** 227,231 **** --- 225,231 ---- } + __asm__ __volatile__ ("femms":::"memory"); fft_128p(&buf[0]); + __asm__ __volatile__ ("femms":::"memory"); /* Post IFFT complex multiply plus IFFT complex conjugate*/ *************** *** 309,314 **** --- 309,316 ---- } + __asm__ __volatile__ ("femms":::"memory"); fft_64p(&buf1[0]); fft_64p(&buf2[0]); + __asm__ __volatile__ ("femms":::"memory"); #ifdef DEBUG *************** *** 404,409 **** --- 406,413 ---- + __asm__ __volatile__ ("femms":::"memory"); fft_64p(&buf1[0]); fft_64p(&buf2[0]); + __asm__ __volatile__ ("femms":::"memory"); #ifdef DEBUG Index: srfft_3dnow.c =================================================================== RCS file: /cvsroot/mplayer/main/libac3/mmx/srfft_3dnow.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** srfft_3dnow.c 2001/05/27 16:54:02 1.8 --- srfft_3dnow.c 2001/05/31 17:58:56 1.9 *************** *** 37,41 **** /* x[k] = sum_{i=0..3} x[i] * w^{i*k}, w=e^{-2*pi/4} */ - __asm__ __volatile__("femms":::"memory"); __asm__ __volatile__ ( "movl $1, %%eax\n\t" --- 37,40 ---- *************** *** 90,95 **** :"0"(x) :"memory"); - - __asm__ __volatile__("femms":::"memory"); } #if 0 --- 89,92 ---- *************** *** 318,322 **** :"m"(wT1), "m"(wB2), "m"(wB1), "0"(x), "m"(HSQRT2_3DNOW) :"memory"); - __asm__ __volatile__("femms":::"memory"); } #if 0 --- 315,318 ---- *************** *** 445,449 **** --- 441,447 ---- register complex_t *x2k, *x3k, *x4k, *wB; register float a_r, a_i, a1_r, a1_i, u_r, u_i, v_r, v_i; + complex_t a, a1, u, v; + TRANS_FILL_MM6_MM7_3DNOW(); x2k = x + 2 * k; x3k = x2k + 2 * k; *************** *** 452,461 **** TRANSZERO_3DNOW(x[0],x2k[0],x3k[0],x4k[0]); ! TRANS(x[1],x2k[1],x3k[1],x4k[1],wTB[1],wB[1],d[1],d_3[1]); --k; for(;;) { ! TRANS(x[2],x2k[2],x3k[2],x4k[2],wTB[2],wB[2],d[2],d_3[2]); ! TRANS(x[3],x2k[3],x3k[3],x4k[3],wTB[3],wB[3],d[3],d_3[3]); if (!--k) break; x += 2; --- 450,459 ---- TRANSZERO_3DNOW(x[0],x2k[0],x3k[0],x4k[0]); ! TRANS_3DNOW(x[1],x2k[1],x3k[1],x4k[1],wTB[1],wB[1],d[1],d_3[1]); --k; for(;;) { ! TRANS_3DNOW(x[2],x2k[2],x3k[2],x4k[2],wTB[2],wB[2],d[2],d_3[2]); ! TRANS_3DNOW(x[3],x2k[3],x3k[3],x4k[3],wTB[3],wB[3],d[3],d_3[3]); if (!--k) break; x += 2; *************** *** 473,484 **** void fft_asmb16(complex_t *x, complex_t *wTB) { ! register float a_r, a_i, a1_r, a1_i, u_r, u_i, v_r, v_i; int k = 2; /* transform x[0], x[8], x[4], x[12] */ TRANSZERO_3DNOW(x[0],x[4],x[8],x[12]); /* transform x[1], x[9], x[5], x[13] */ ! TRANS(x[1],x[5],x[9],x[13],wTB[1],wTB[5],delta16[1],delta16_3[1]); /* transform x[2], x[10], x[6], x[14] */ --- 471,483 ---- void fft_asmb16(complex_t *x, complex_t *wTB) { ! complex_t a, a1, u, v; int k = 2; + TRANS_FILL_MM6_MM7_3DNOW(); /* transform x[0], x[8], x[4], x[12] */ TRANSZERO_3DNOW(x[0],x[4],x[8],x[12]); /* transform x[1], x[9], x[5], x[13] */ ! TRANS_3DNOW(x[1],x[5],x[9],x[13],wTB[1],wTB[5],delta16[1],delta16_3[1]); /* transform x[2], x[10], x[6], x[14] */ *************** *** 486,490 **** /* transform x[3], x[11], x[7], x[15] */ ! TRANS(x[3],x[7],x[11],x[15],wTB[3],wTB[7],delta16[3],delta16_3[3]); } --- 485,489 ---- /* transform x[3], x[11], x[7], x[15] */ ! TRANS_3DNOW(x[3],x[7],x[11],x[15],wTB[3],wTB[7],delta16[3],delta16_3[3]); } Index: srfftp_3dnow.h =================================================================== RCS file: /cvsroot/mplayer/main/libac3/mmx/srfftp_3dnow.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** srfftp_3dnow.h 2001/05/27 14:13:05 1.3 --- srfftp_3dnow.h 2001/05/31 17:58:56 1.4 *************** *** 69,77 **** "punpckldq "##mm_hlp","##mm_base"\n\t" #endif #define TRANSZERO_3DNOW(A0,A4,A8,A12) \ { \ - __asm__ __volatile__("femms":::"memory");\ - TRANS_FILL_MM6_MM7_3DNOW()\ __asm__ __volatile__(\ "movq %4, %%mm0\n\t" /* mm0 = wTB[0]*/\ --- 69,84 ---- "punpckldq "##mm_hlp","##mm_base"\n\t" #endif + #ifdef HAVE_3DNOWEX + #define PFNACC_MM(mm_base,mm_hlp) "pfnacc "##mm_base","##mm_base"\n\t" + #else + #define PFNACC_MM(mm_base,mm_hlp)\ + "movq "##mm_base","##mm_hlp"\n\t"\ + "psrlq $32,"##mm_hlp"\n\t"\ + "punpckldq "##mm_hlp","##mm_hlp"\n\t"\ + "pfsub "##mm_hlp","##mm_base"\n\t" + #endif #define TRANSZERO_3DNOW(A0,A4,A8,A12) \ { \ __asm__ __volatile__(\ "movq %4, %%mm0\n\t" /* mm0 = wTB[0]*/\ *************** *** 99,109 **** :"m"(wTB[0]), "m"(wTB[k*2]), "0"(A0), "2"(A4)\ :"memory");\ - __asm__ __volatile__("femms":::"memory");\ } #define TRANSHALF_16_3DNOW(A2,A6,A10,A14)\ {\ - __asm__ __volatile__("femms":::"memory");\ - TRANS_FILL_MM6_MM7_3DNOW()\ __asm__ __volatile__(\ "movq %4, %%mm0\n\t"/*u.re = wTB[2].im + wTB[2].re;*/\ --- 106,113 ---- *************** *** 143,147 **** :"m"(wTB[2]), "m"(wTB[6]), "0"(A2), "2"(A6), "m"(HSQRT2_3DNOW)\ :"memory");\ ! __asm__ __volatile__("femms":::"memory");\ } --- 147,200 ---- :"m"(wTB[2]), "m"(wTB[6]), "0"(A2), "2"(A6), "m"(HSQRT2_3DNOW)\ :"memory");\ ! } ! ! #define TRANS_3DNOW(A1,A5,A9,A13,WT,WB,D,D3)\ ! { \ ! __asm__ __volatile__(\ ! "movq %1, %%mm4\n\t"\ ! "movq %%mm4, %%mm5\n\t"\ ! "punpckldq %%mm4, %%mm4\n\t"/*mm4 = D.re | D.re */\ ! "punpckhdq %%mm5, %%mm5\n\t"/*mm5 = D.im | D.im */\ ! "movq %0, %%mm0\n\t"\ ! "pfmul %%mm0, %%mm4\n\t"/* mm4 =u.re | u.im */\ ! "pfmul %%mm0, %%mm5\n\t"/* mm5 = a.re | a.im */\ ! PSWAP_MM("%%mm5","%%mm3")\ ! "pfmul %%mm7, %%mm5\n\t"\ ! "pfadd %%mm5, %%mm4\n\t"/* mm4 = u*/\ ! "movq %3, %%mm1\n\t"\ ! "movq %2, %%mm0\n\t"\ ! PSWAP_MM("%%mm1","%%mm3")\ ! "movq %%mm0, %%mm2\n\t"\ ! "pfmul %%mm1, %%mm0\n\t"/* mm0 = a*/\ ! "pfmul %3, %%mm2\n\t"/* mm2 = v*/\ ! PFNACC_MM("%%mm2","%%mm3")\ ! "pfacc %%mm0, %%mm0\n\t"\ ! "punpckldq %%mm0,%%mm2\n\t"/*mm2 = v.re | a.re*/\ ! "movq %%mm2, %%mm3\n\t"\ ! "pfmul %%mm7, %%mm3\n\t"\ ! "movq %%mm4, %%mm5\n\t"\ ! "pfmul %%mm6, %%mm5\n\t"\ ! "pfadd %%mm3, %%mm5\n\t"\ ! PSWAP_MM("%%mm5","%%mm3")/* mm5 = v*/\ ! "pfadd %%mm2, %%mm4\n\t"\ ! :\ ! :"m"(WT), "m"(D), "m"(WB), "m"(D3)\ ! :"memory");\ ! __asm__ __volatile__(\ ! "movq %4, %%mm0\n\t"/* a1 = A1*/\ ! "movq %%mm0, %%mm1\n\t"\ ! "pfadd %%mm4, %%mm0\n\t"/*A1 = a1 + u*/\ ! "pfsub %%mm4, %%mm1\n\t"/*A9 = a1 - u*/\ ! "movq %%mm0, %0\n\t"\ ! "movq %%mm1, %1\n\t"\ ! "movq %5, %%mm2\n\t"/* a1 = A5*/\ ! "movq %%mm2, %%mm3\n\t"\ ! "pfsub %%mm5, %%mm2\n\t"/*A5 = a1 - v*/\ ! "pfadd %%mm5, %%mm3\n\t"/*A9 = a1 + v*/\ ! "movq %%mm2, %2\n\t"\ ! "movq %%mm3, %3"\ ! :"=m"(A1), "=m"(A9), "=m"(A5), "=m"(A13)\ ! :"0"(A1), "2"(A5), "m"(u), "m"(v)\ ! :"memory");\ } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libac3 Makefile,1.5,1.6 imdct.c,1.2,1.3 srfftp.h,1.1.1.1,1.2
by Nick Kurshev 31 May '01

31 May '01

Update of /cvsroot/mplayer/main/libac3 In directory usw-pr-cvs1:/tmp/cvs-serv11371/main/libac3 Modified Files: Makefile imdct.c srfftp.h Log Message: libac3 now is full 3dnow! optimized Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libac3/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile 2001/05/24 21:09:13 1.5 --- Makefile 2001/05/31 17:58:56 1.6 *************** *** 7,11 **** OBJS = bit_allocate.o bitstream.o coeff.o crc.o debug.o decode.o dither.o exponent.o imdct.o parse.o rematrix.o sanity_check.o srfft.o stats.o $(OPTIONAL_OBJS) # OBJS = $(SRCS:.c=.o) ! CFLAGS = $(OPTFLAGS) -I. -I.. -DHAVE_CONFIG_H .SUFFIXES: .c .o --- 7,13 ---- OBJS = bit_allocate.o bitstream.o coeff.o crc.o debug.o decode.o dither.o exponent.o imdct.o parse.o rematrix.o sanity_check.o srfft.o stats.o $(OPTIONAL_OBJS) # OBJS = $(SRCS:.c=.o) ! #WARNING: Please don't remove -O2 key. It should overwrite any other ! # keys. I know this is an inconvenience, but I'll fix it later! ! CFLAGS = $(OPTFLAGS) -O2 -I. -I.. -DHAVE_CONFIG_H .SUFFIXES: .c .o Index: imdct.c =================================================================== RCS file: /cvsroot/mplayer/main/libac3/imdct.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** imdct.c 2001/05/23 08:20:16 1.2 --- imdct.c 2001/05/31 17:58:56 1.3 *************** *** 53,65 **** static float xcos1[128] __attribute__((aligned(16))); static float xsin1[128] __attribute__((aligned(16))); ! static float xcos2[64]; ! static float xsin2[64]; /* Delay buffer for time domain interleaving */ ! static float delay[6][256]; ! static float delay1[6][256]; /* Windowing function for Modified DCT - Thank you acroread */ ! static float window[] = { 0.00014, 0.00024, 0.00037, 0.00051, 0.00067, 0.00086, 0.00107, 0.00130, 0.00157, 0.00187, 0.00220, 0.00256, 0.00297, 0.00341, 0.00390, 0.00443, --- 53,65 ---- static float xcos1[128] __attribute__((aligned(16))); static float xsin1[128] __attribute__((aligned(16))); ! static float xcos2[64] __attribute__((aligned(16))); ! static float xsin2[64] __attribute__((aligned(16))); /* Delay buffer for time domain interleaving */ ! static float delay[6][256] __attribute__((aligned(16))); ! static float delay1[6][256] __attribute__((aligned(16))); /* Windowing function for Modified DCT - Thank you acroread */ ! static float window[] __attribute__((aligned(16))) = { 0.00014, 0.00024, 0.00037, 0.00051, 0.00067, 0.00086, 0.00107, 0.00130, 0.00157, 0.00187, 0.00220, 0.00256, 0.00297, 0.00341, 0.00390, 0.00443, *************** *** 96,100 **** }; ! static const int pm128[128] = { 0, 16, 32, 48, 64, 80, 96, 112, 8, 40, 72, 104, 24, 56, 88, 120, --- 96,100 ---- }; ! static const int pm128[128] __attribute__((aligned(16))) = { 0, 16, 32, 48, 64, 80, 96, 112, 8, 40, 72, 104, 24, 56, 88, 120, *************** *** 108,112 **** }; ! static const int pm64[64] = { 0, 8, 16, 24, 32, 40, 48, 56, --- 108,112 ---- }; ! static const int pm64[64] __attribute__((aligned(16))) = { 0, 8, 16, 24, 32, 40, 48, 56, Index: srfftp.h =================================================================== RCS file: /cvsroot/mplayer/main/libac3/srfftp.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** srfftp.h 2001/02/24 20:29:42 1.1.1.1 --- srfftp.h 2001/05/31 17:58:56 1.2 *************** *** 33,37 **** #define SRFFTP_H__ ! static complex_t delta16[4] = { {1.00000000000000, 0.00000000000000}, {0.92387953251129, -0.38268343236509}, --- 33,37 ---- #define SRFFTP_H__ ! static complex_t delta16[4] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.92387953251129, -0.38268343236509}, *************** *** 39,43 **** {0.38268343236509, -0.92387953251129}}; ! static complex_t delta16_3[4] = { {1.00000000000000, 0.00000000000000}, {0.38268343236509, -0.92387953251129}, --- 39,43 ---- {0.38268343236509, -0.92387953251129}}; ! static complex_t delta16_3[4] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.38268343236509, -0.92387953251129}, *************** *** 45,49 **** {-0.92387953251129, 0.38268343236509}}; ! static complex_t delta32[8] = { {1.00000000000000, 0.00000000000000}, {0.98078528040323, -0.19509032201613}, --- 45,49 ---- {-0.92387953251129, 0.38268343236509}}; ! static complex_t delta32[8] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.98078528040323, -0.19509032201613}, *************** *** 55,59 **** {0.19509032201613, -0.98078528040323}}; ! static complex_t delta32_3[8] = { {1.00000000000000, 0.00000000000000}, {0.83146961230255, -0.55557023301960}, --- 55,59 ---- {0.19509032201613, -0.98078528040323}}; ! static complex_t delta32_3[8] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.83146961230255, -0.55557023301960}, *************** *** 65,69 **** {-0.55557023301960, 0.83146961230255}}; ! static complex_t delta64[16] = { {1.00000000000000, 0.00000000000000}, {0.99518472667220, -0.09801714032956}, --- 65,69 ---- {-0.55557023301960, 0.83146961230255}}; ! static complex_t delta64[16] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.99518472667220, -0.09801714032956}, *************** *** 83,87 **** {0.09801714032956, -0.99518472667220}}; ! static complex_t delta64_3[16] = { {1.00000000000000, 0.00000000000000}, {0.95694033573221, -0.29028467725446}, --- 83,87 ---- {0.09801714032956, -0.99518472667220}}; ! static complex_t delta64_3[16] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.95694033573221, -0.29028467725446}, *************** *** 101,105 **** {-0.29028467725446, 0.95694033573221}}; ! static complex_t delta128[32] = { {1.00000000000000, 0.00000000000000}, {0.99879545620517, -0.04906767432742}, --- 101,105 ---- {-0.29028467725446, 0.95694033573221}}; ! static complex_t delta128[32] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.99879545620517, -0.04906767432742}, *************** *** 135,139 **** {0.04906767432742, -0.99879545620517}}; ! static complex_t delta128_3[32] = { {1.00000000000000, 0.00000000000000}, {0.98917650996478, -0.14673047445536}, --- 135,139 ---- {0.04906767432742, -0.99879545620517}}; ! static complex_t delta128_3[32] __attribute__((aligned(16))) = { {1.00000000000000, 0.00000000000000}, {0.98917650996478, -0.14673047445536}, _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main mplayer.c,1.129,1.130
by GEREOFFY 31 May '01

31 May '01

Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv25258 Modified Files: mplayer.c Log Message: Extended message for misisng codecs Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -r1.129 -r1.130 *** mplayer.c 2001/05/29 17:16:15 1.129 --- mplayer.c 2001/05/31 16:35:36 1.130 *************** *** 1088,1091 **** --- 1088,1093 ---- if(!sh_audio->codec){ printf("Can't find codec for audio format 0x%X !\n",sh_audio->format); + printf("*** Try to upgrade %s from DOCS/codecs.conf\n",get_path("codecs.conf")); + printf("*** If it's still not OK, then read DOCS/CODECS!\n"); has_audio=0; break; *************** *** 1118,1121 **** --- 1120,1125 ---- if(!sh_video->codec){ printf("Can't find codec for video format 0x%X !\n",sh_video->format); + printf("*** Try to upgrade %s from DOCS/codecs.conf\n",get_path("codecs.conf")); + printf("*** If it's still not OK, then read DOCS/CODECS!\n"); #ifdef HAVE_GUI if ( !nogui ) _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS CODECS,1.24,1.25
by GEREOFFY 31 May '01

31 May '01

Update of /cvsroot/mplayer/main/DOCS In directory usw-pr-cvs1:/tmp/cvs-serv24969 Modified Files: CODECS Log Message: added one line of text <- gabucino-style comment :) Index: CODECS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/CODECS,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** CODECS 2001/05/09 23:41:01 1.24 --- CODECS 2001/05/31 16:34:42 1.25 *************** *** 5,8 **** --- 5,9 ---- See http://mplayer.sourceforge.net/DOCS/codecs.html + If your codecs isn't listed there then help us adding support for it: Extracting codecs from Win32 _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/TOOLS cache.c,NONE,1.1
by GEREOFFY 31 May '01

31 May '01

Update of /cvsroot/mplayer/main/TOOLS In directory usw-pr-cvs1:/tmp/cvs-serv26166 Added Files: cache.c Log Message: cache prg for slow stdin playback --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> #include <unistd.h> #include <sys/stat.h> #include <fcntl.h> //int open(const char *pathname, int flags); #define BUFFSIZE (4*65536) #define NUM_BUFS (16) unsigned char *buffer[NUM_BUFS]; unsigned int buf_read=0; unsigned int buf_write=0; unsigned int buf_read_pos=0; unsigned int buf_write_pos=0; int full_buffers=0; int main(int argc,char* argv[]){ fd_set rfds; fd_set wfds; struct timeval tv; int retval; int i; // int empty=1; int can_read=1; int eof=0; int in_fd=0; // stdin if(argc>1) in_fd=open(argv[1],O_RDONLY|O_NDELAY); for(i=0;i<NUM_BUFS;i++) buffer[i]=malloc(BUFFSIZE); while(1){ /* Watch stdin (fd 0) to see when it has input. */ FD_ZERO(&rfds); if(can_read){ FD_SET(in_fd, &rfds);} FD_ZERO(&wfds); FD_SET(1, &wfds); /* Wait up to five seconds. */ tv.tv_sec = 1; tv.tv_usec = 0; retval = select((in_fd<1?1:in_fd)+1, &rfds, &wfds, NULL, &tv); /* Don't rely on the value of tv now! */ if (retval){ if(FD_ISSET(in_fd, &rfds) || !full_buffers){ fprintf(stderr,"\n%d r",full_buffers);fflush(stderr); if(full_buffers==NUM_BUFS){ // buffer is full! can_read=0; fprintf(stderr,"\n%d full!\n",full_buffers);fflush(stderr); } else { // we can read input. int len=BUFFSIZE-buf_read_pos; fprintf(stderr,"R");fflush(stderr); len=read(in_fd,buffer[buf_read]+buf_read_pos,len); fprintf(stderr,"(%d)\n",len);fflush(stderr); if(len>0){ buf_read_pos+=len; if(buf_read_pos>=BUFFSIZE){ // block is full, find next! buf_read=(buf_read+1)%NUM_BUFS; ++full_buffers; buf_read_pos=0; fprintf(stderr,"+");fflush(stderr); } } else { eof=1; } } } if(FD_ISSET(1, &wfds)){ fprintf(stderr,"\n%d w",full_buffers);fflush(stderr); if(full_buffers==0){ if(eof){ // flush buffer! int pos=0; int len; fprintf(stderr,"\nf");fflush(stderr); while((len=buf_read_pos-pos)>0){ len=write(1,buffer[buf_write]+pos,len); fprintf(stderr,"(%d)",len);fflush(stderr); if(len<=0) break; pos+=len; } exit(1); } fprintf(stderr," empty");fflush(stderr); //empty=1; // we must fill buffers! } else { // yeah, we can read from the buffer! int len=BUFFSIZE-buf_write_pos; fprintf(stderr,"W");fflush(stderr); len=write(1,buffer[buf_write]+buf_write_pos,len); fprintf(stderr,"(%d)",len);fflush(stderr); if(len>0){ buf_write_pos+=len; if(buf_write_pos>=BUFFSIZE){ // block is empty, find next! buf_write=(buf_write+1)%NUM_BUFS; --full_buffers; buf_write_pos=0; fprintf(stderr,"-");fflush(stderr); can_read=1; } } } } } else { fprintf(stderr,".");fflush(stderr); } } return 0; } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0