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

CVS: main ac3-iec958.c,1.2,1.3
by Arpi of Ize 01 Feb '02

01 Feb '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv12141 Modified Files: ac3-iec958.c Log Message: silly cleanup - maybe fixes dummy printf bug Index: ac3-iec958.c =================================================================== RCS file: /cvsroot/mplayer/main/ac3-iec958.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ac3-iec958.c 28 Dec 2001 12:03:52 -0000 1.2 +++ ac3-iec958.c 30 Jan 2002 22:02:57 -0000 1.3 @@ -85,13 +85,12 @@ int ac3_iec958_build_burst(int length, int data_type, int big_endian, unsigned char * data, unsigned char * out) { - const char sync[6] = { 0x72, 0xF8, 0x1F, 0x4E, 0x00, 0x00 }; - - memcpy(out, sync, 6); - if (length) - out[4] = data_type; /* & 0x1F; */ - else - out[4] = 0; + out[0] = 0x72; + out[1] = 0xF8; + out[2] = 0x1F; + out[3] = 0x4E; + out[4] = (length) ? data_type : 0; /* & 0x1F; */ + out[5] = 0x00; out[6] = (length << 3) & 0xFF; out[7] = (length >> 5) & 0xFF; if (big_endian)

2 1

CVS: main/postproc swscale.c,1.62,1.63
by Michael Niedermayer 01 Feb '02

01 Feb '02

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv612 Modified Files: swscale.c Log Message: -sws 2 is default now Index: swscale.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- swscale.c 30 Jan 2002 15:21:08 -0000 1.62 +++ swscale.c 30 Jan 2002 15:32:43 -0000 1.63 @@ -160,7 +160,7 @@ static int clip_yuvtab_40cf[768]; //global sws_flags from the command line -int sws_flags=0; +int sws_flags=2; //global srcFilter SwsFilter src_filter= {NULL, NULL, NULL, NULL};

6 10

CVS: main subreader.c,1.50,1.51
by Dariush Pietrzak 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv28191 Modified Files: subreader.c Log Message: detect microdvd with empty second frame. Index: subreader.c =================================================================== RCS file: /cvsroot/mplayer/main/subreader.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- subreader.c 12 Jan 2002 00:02:52 -0000 1.50 +++ subreader.c 31 Jan 2002 12:03:49 -0000 1.51 @@ -479,6 +479,8 @@ if (sscanf (line, "{%d}{%d}", &i, &i)==2) {sub_uses_time=0;return SUB_MICRODVD;} + if (sscanf (line, "{%d}{}", &i, &i)==1) + {sub_uses_time=0;return SUB_MICRODVD;} if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) {sub_uses_time=1;return SUB_SUBRIP;} if (sscanf (line, "%d:%d:%d,%d --> %d:%d:%d,%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)

1 0

CVS: main/libvo vo_x11.c,1.54,1.55
by Alex Beregszaszi 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv25882 Modified Files: vo_x11.c Log Message: removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- vo_x11.c 31 Jan 2002 09:52:45 -0000 1.54 +++ vo_x11.c 31 Jan 2002 11:56:11 -0000 1.55 @@ -431,16 +431,6 @@ static const vo_info_t* get_info( void ) { return &vo_info; } -static void Terminate_Display_Process( void ) -{ - getchar(); /* wait for enter to remove window */ - - freeMyXImage(); - - XDestroyWindow( mDisplay,mywindow ); - XCloseDisplay( mDisplay ); -} - static void Display_Image( XImage *myximage,uint8_t *ImageData ) { #ifdef DISP @@ -593,19 +583,14 @@ static void uninit(void) { + freeMyXImage(); saver_on(mDisplay); // screen saver back on -#ifdef HAVE_NEW_GUI - if ( vo_window == None ) -#endif - { - XDestroyWindow( mDisplay,mywindow ); - } #ifdef HAVE_XF86VM vo_vm_close(mDisplay); #endif -printf("vo: uninit!\n"); + vo_x11_uninit(mDisplay, mywindow); } static uint32_t preinit(const char *arg) @@ -617,3 +602,4 @@ { memset(vaa,0,sizeof(vo_vaa_t)); } +

1 0

CVS: main/libvo vosub_vidix.c,1.23,1.24
by Alex Beregszaszi 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv21349 Modified Files: vosub_vidix.c Log Message: return error if unknown depth given. more informative error messages. dont exit if draw_frame was called with Planar YUV, only warn the user Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- vosub_vidix.c 31 Jan 2002 10:23:39 -0000 1.23 +++ vosub_vidix.c 31 Jan 2002 11:50:59 -0000 1.24 @@ -86,7 +86,7 @@ printf("vosub_vidix: Couldn't get capability: %s\n",strerror(err)); return -1; } - printf("vosub_vidix: Using: %s\n",vidix_cap.name); + printf("vosub_vidix: Using: %s by %s\n",vidix_cap.name,vidix_cap.author); /* we are able to tune up this stuff depend on fourcc format */ ((vo_functions_t *)server)->draw_slice=vidix_draw_slice; ((vo_functions_t *)server)->draw_frame=vidix_draw_frame; @@ -133,20 +133,24 @@ case 16:err = ((vidix_fourcc.depth & VID_DEPTH_16BPP) != VID_DEPTH_16BPP); break; case 24:err = ((vidix_fourcc.depth & VID_DEPTH_24BPP) != VID_DEPTH_24BPP); break; case 32:err = ((vidix_fourcc.depth & VID_DEPTH_32BPP) != VID_DEPTH_32BPP); break; + default: err = 1; break; } if(err) { - printf("vosub_vidix: video server has unsupported color depth by vidix\n"); + printf("vosub_vidix: video server has unsupported color depth by vidix (%d)\n", + vidix_fourcc.depth); return -1; } if((dst_width > src_width || dst_height > src_height) && (vidix_cap.flags & FLAG_UPSCALER) != FLAG_UPSCALER) { - printf("vosub_vidix: vidix driver can't upscale image\n"); + printf("vosub_vidix: vidix driver can't upscale image (%dx%d -> %dx%d)\n", + src_width, src_height, dst_width, dst_height); return -1; } if((dst_width > src_width || dst_height > src_height) && (vidix_cap.flags & FLAG_DOWNSCALER) != FLAG_DOWNSCALER) { - printf("vosub_vidix: vidix driver can't downscale image\n"); + printf("vosub_vidix: vidix driver can't downscale image (%dx%d -> %dx%d)\n", + src_width, src_height, dst_width, dst_height); return -1; } image_width = src_width; @@ -438,9 +442,7 @@ /* Note it's very strange but sometime for YUY2 draw_frame is called */ if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV) { - printf("vosub_vidix: draw_frame for YUV420 called\nExiting...\n"); - vidix_term(); - exit( EXIT_FAILURE ); + printf("vosub_vidix: draw_frame for YUV420 called, frame cannot be written\n"); } else if(src_format == IMGFMT_RGB32 || src_format == IMGFMT_BGR32)

1 0

CVS: main/libvo vo_xvidix.c,1.15,1.16
by Alex Beregszaszi 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv21063 Modified Files: vo_xvidix.c Log Message: removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format Index: vo_xvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- vo_xvidix.c 31 Jan 2002 10:23:39 -0000 1.15 +++ vo_xvidix.c 31 Jan 2002 11:49:30 -0000 1.16 @@ -220,11 +220,12 @@ case IMGFMT_YV12: image_depth = 12; break; + case IMGFMT_UYVY: case IMGFMT_YUY2: image_depth = 16; break; default: - mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s", + mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s\n", vo_format_name(format)); return(-1); } @@ -438,30 +439,9 @@ static void uninit(void) { vidix_term(); - saver_on(mDisplay); /* screen saver back on */ -#ifdef HAVE_NEW_GUI - /* destroy window only if it's not controlled by GUI */ - if (vo_window == None) -#endif - { - if (!(WinID > 0)) /* don't destory window if -wid specified */ - { - XDestroyWindow(mDisplay, mWindow); - XCloseDisplay(mDisplay); - } - } -} - -/* i think this is obsoleted.... -- alex */ -static void Terminate_Display_Process(void) -{ - getchar(); /* wait for enter to remove window */ - vidix_term(); - XDestroyWindow(mDisplay, mWindow); - XCloseDisplay(mDisplay); - X_already_started = 0; - return; + saver_on(mDisplay); /* screen saver back on */ + vo_x11_uninit(mDisplay, mWindow); } static uint32_t preinit(const char *arg)

1 0

CVS: main/libvo vo_gl.c,1.18,1.19 vo_gl2.c,1.12,1.13
by Alex Beregszaszi 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv20349 Modified Files: vo_gl.c vo_gl2.c Log Message: removed obsoleted Terminate_Display_Process, using vo_x11_uninit Index: vo_gl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- vo_gl.c 31 Jan 2002 09:52:45 -0000 1.18 +++ vo_gl.c 31 Jan 2002 11:46:46 -0000 1.19 @@ -293,16 +293,6 @@ return &vo_info; } -static void -Terminate_Display_Process(void) -{ - getchar(); /* wait for enter to remove window */ - XDestroyWindow(mDisplay, mywindow); - XCloseDisplay(mDisplay); - X_already_started = 0; -} - - static void check_events(void) { int e=vo_x11_check_events(mDisplay); @@ -475,7 +465,8 @@ uninit(void) { saver_on(mDisplay); // screen saver back on - XDestroyWindow( mDisplay,mywindow ); + + vo_x11_uninit(mDisplay, mywindow); } static uint32_t preinit(const char *arg) Index: vo_gl2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- vo_gl2.c 31 Jan 2002 09:52:45 -0000 1.12 +++ vo_gl2.c 31 Jan 2002 11:46:46 -0000 1.13 @@ -948,15 +948,6 @@ return &vo_info; } -static void -Terminate_Display_Process(void) -{ - getchar(); /* wait for enter to remove window */ - XDestroyWindow(mDisplay, mywindow); - XCloseDisplay(mDisplay); - X_already_started = 0; -} - static int gl_handlekey(int key) { if(key=='a'||key=='A') @@ -1101,7 +1092,8 @@ uninit(void) { saver_on(mDisplay); // screen saver back on - XDestroyWindow( mDisplay,mywindow ); + + vo_x11_uninit(mDisplay, mywindow); } static uint32_t preinit(const char *arg)

1 0

CVS: main/libvo vo_fsdga.c,1.7,1.8 vo_dga.c,1.38,1.39
by Alex Beregszaszi 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv19982 Modified Files: vo_fsdga.c vo_dga.c Log Message: removed obsoleted Terminate_Display_Process Index: vo_fsdga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_fsdga.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vo_fsdga.c 31 Jan 2002 09:52:45 -0000 1.7 +++ vo_fsdga.c 31 Jan 2002 11:45:25 -0000 1.8 @@ -270,11 +270,6 @@ return 0; }; -static void Terminate_Display_Process( void ){ - - printf("vo_dga: Terminating display process\n"); -} - static const vo_info_t* get_info( void ) { return &vo_info; } @@ -295,9 +290,7 @@ static void uninit(void) { - vo_dga_is_running = 0; - printf("vo_dga: in uninit\n"); XUngrabPointer (vo_dga_dpy, CurrentTime); XUngrabKeyboard (vo_dga_dpy, CurrentTime); XF86DGADirectVideo (vo_dga_dpy, XDefaultScreen(vo_dga_dpy), 0); Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- vo_dga.c 31 Jan 2002 09:52:45 -0000 1.38 +++ vo_dga.c 31 Jan 2002 11:45:25 -0000 1.39 @@ -23,6 +23,9 @@ * - works only on x86 architectures * * $Log$ + * Revision 1.39 2002/01/31 11:45:25 alex + * removed obsoleted Terminate_Display_Process + * * Revision 1.38 2002/01/31 09:52:45 nick * new info for tuning * @@ -580,13 +583,6 @@ } return 0; }; - -//--------------------------------------------------------- - - -static void Terminate_Display_Process( void ){ - vd_printf(VD_DBG, "vo_dga: Terminating display process\n"); -} //---------------------------------------------------------

1 0

CVS: main/libvo x11_common.c,1.46,1.47
by Alex Beregszaszi 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv14404 Modified Files: x11_common.c Log Message: grr, 10l. vo_x11_uninit: close display only if window not created by GUI Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- x11_common.c 31 Jan 2002 11:15:54 -0000 1.46 +++ x11_common.c 31 Jan 2002 11:26:29 -0000 1.47 @@ -382,8 +382,6 @@ int vo_x11_uninit(Display *display, Window window) { - XUnmapWindow(display, window); - #ifdef HAVE_NEW_GUI /* destroy window only if it's not controlled by GUI */ if (vo_window == None) @@ -392,9 +390,8 @@ /* and -wid is set */ if (!(WinID > 0)) XDestroyWindow(display, window); + XCloseDisplay(display); } - - XCloseDisplay(display); return(1); }

1 0

CVS: main/libvo x11_common.c,1.45,1.46
by Alex Beregszaszi 31 Jan '02

31 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv11194 Modified Files: x11_common.c Log Message: vo_x11_uninit: dont destroy window if GUI created it Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- x11_common.c 31 Jan 2002 11:04:41 -0000 1.45 +++ x11_common.c 31 Jan 2002 11:15:54 -0000 1.46 @@ -238,17 +238,6 @@ return 1; } -int vo_x11_uninit(Display *display, Window window) -{ - XUnmapWindow(display, window); - - /* don't destroy window if -wid specified */ - if (!(WinID > 0)) - XDestroyWindow(display, window); - - XCloseDisplay(display); - return(1); -} #include "../linux/keycodes.h" #include "wskeys.h" @@ -348,7 +337,7 @@ XSetWindowAttributes attr; attr.override_redirect = True; XChangeWindowAttributes(vo_Display, w, CWOverrideRedirect, &attr); -// XMapWindow(vo_Display], w); +// XMapWindow(vo_Display, w); } if(vo_fsmode&8){ @@ -390,6 +379,24 @@ vo_dwidth=w; vo_dheight=h; } #endif + +int vo_x11_uninit(Display *display, Window window) +{ + XUnmapWindow(display, window); + +#ifdef HAVE_NEW_GUI + /* destroy window only if it's not controlled by GUI */ + if (vo_window == None) +#endif + { + /* and -wid is set */ + if (!(WinID > 0)) + XDestroyWindow(display, window); + } + + XCloseDisplay(display); + return(1); +} int vo_x11_check_events(Display *mydisplay){ int ret=0;

1 0