June 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r18820 - trunk/cpudetect.c
by gpoirier 25 Jun '06

25 Jun '06

Author: gpoirier Date: Sun Jun 25 19:37:58 2006 New Revision: 18820 Modified: trunk/cpudetect.c Log: Typo: use ptmpstr instead of tmpstr to strip leading spaces + add comment Patch by Zuxy Meng ##zuxy P meng AH gmail P com## --Cette ligne, et les suivantes ci-dessous, seront ignorées-- M cpudetect.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c (original) +++ trunk/cpudetect.c Sun Jun 25 19:37:58 2006 @@ -147,9 +147,9 @@ if(cl_size) caps->cl_size = cl_size; ptmpstr=tmpstr=GetCpuFriendlyName(regs, regs2); - while(*ptmpstr == ' ') + while(*ptmpstr == ' ') // strip leading spaces ptmpstr++; - mp_msg(MSGT_CPUDETECT,MSGL_INFO,"CPU: %s ",tmpstr); + mp_msg(MSGT_CPUDETECT,MSGL_INFO,"CPU: %s ", ptmpstr); free(tmpstr); mp_msg(MSGT_CPUDETECT,MSGL_INFO,"(Family: %d, Model: %d, Stepping: %d)\n", caps->cpuType, caps->cpuModel, caps->cpuStepping);

1 0

r18819 - trunk/libvo/mga_common.c
by attila 25 Jun '06

25 Jun '06

Author: attila Date: Sun Jun 25 18:18:50 2006 New Revision: 18819 Modified: trunk/libvo/mga_common.c Log: 10l fix 1023 <-> 1024 typo Modified: trunk/libvo/mga_common.c ============================================================================== --- trunk/libvo/mga_common.c (original) +++ trunk/libvo/mga_common.c Sun Jun 25 18:18:50 2006 @@ -371,7 +371,7 @@ return (-1); } - if(width>1023 || height >1024) + if(width>1023 || height >1023) { mp_msg(MSGT_VO,MSGL_ERR, MGSTR_LIBVO_MGA_ResolutionTooHigh); return (-1);

1 0

r18815 - in trunk: help/help_mp-en.h libvo/mga_common.c
by attila 25 Jun '06

25 Jun '06

Author: attila Date: Sun Jun 25 17:50:19 2006 New Revision: 18815 Modified: trunk/help/help_mp-en.h trunk/libvo/mga_common.c Log: fail with an error if the source resolution is larger than 1023x1023 when using -vo (x)mga Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h (original) +++ trunk/help/help_mp-en.h Sun Jun 25 17:50:19 2006 @@ -1579,6 +1579,7 @@ #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "Your mga_vid driver version is incompatible with this MPlayer version!\n" #define MSGTR_LIBVO_MGA_UsingBuffers "Using %d buffers.\n" #define MSGTR_LIBVO_MGA_CouldntOpen "Couldn't open: %s\n" +#define MGSTR_LIBVO_MGA_ResolutionTooHigh "Source resolution is in at least one dimension larger than 1023x1023. Please rescale in software or use -lavdopts lowres=1\n" // libvo/vesa_lvo.c Modified: trunk/libvo/mga_common.c ============================================================================== --- trunk/libvo/mga_common.c (original) +++ trunk/libvo/mga_common.c Sun Jun 25 17:50:19 2006 @@ -371,6 +371,12 @@ return (-1); } + if(width>1023 || height >1024) + { + mp_msg(MSGT_VO,MSGL_ERR, MGSTR_LIBVO_MGA_ResolutionTooHigh); + return (-1); + } + mga_vid_config.src_width = width; mga_vid_config.src_height= height; if(!mga_vid_config.dest_width)

3 2

r18818 - in trunk/help: help_mp-cs.h help_mp-de.h help_mp-en.h help_mp-es.h help_mp-hu.h help_mp-tr.h help_mp-zh_CN.h
by attila 25 Jun '06

25 Jun '06

Author: attila Date: Sun Jun 25 18:16:59 2006 New Revision: 18818 Modified: trunk/help/help_mp-en.h Changes in other areas also in this revision: Modified: trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-es.h trunk/help/help_mp-hu.h trunk/help/help_mp-tr.h trunk/help/help_mp-zh_CN.h Log: kill unused message string MSGTR_LIBVO_MGA_MgaInvalidOutputFormat Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h (original) +++ trunk/help/help_mp-en.h Sun Jun 25 18:16:59 2006 @@ -1575,7 +1575,6 @@ #define MSGTR_LIBVO_MGA_CouldNotSetLumaValuesFromTheKernelModule "[MGA] Could not set luma values from the kernel module!\n" #define MSGTR_LIBVO_MGA_ScreenWidthHeightUnknown "[MGA] Screen width/height unknown!\n" #define MSGTR_LIBVO_MGA_InvalidOutputFormat "[MGA] invalid output format %0X\n" -#define MSGTR_LIBVO_MGA_MgaInvalidOutputFormat "[MGA] Invalid output format %0X.\n" #define MSGTR_LIBVO_MGA_IncompatibleDriverVersion "[MGA] Your mga_vid driver version is incompatible with this MPlayer version!\n" #define MSGTR_LIBVO_MGA_UsingBuffers "[MGA] Using %d buffers.\n" #define MSGTR_LIBVO_MGA_CouldntOpen "[MGA] Couldn't open: %s\n"

1 0

r18814 - trunk/input/input.c
by reimar 25 Jun '06

25 Jun '06

Author: reimar Date: Sun Jun 25 16:03:56 2006 New Revision: 18814 Modified: trunk/input/input.c Log: Make sure mp_input_read_key_code always sleeps. Avoids 100% CPU load during cache fill. Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c (original) +++ trunk/input/input.c Sun Jun 25 16:03:56 2006 @@ -914,11 +914,14 @@ fd_set fds; struct timeval tv,*time_val; #endif - int i,n=0,max_fd = 0; + int i,n=0,max_fd = 0, did_sleep = 0; static int last_loop = 0; if(num_key_fd == 0) + { + usec_sleep(time * 1000); return MP_INPUT_NOTHING; + } #ifndef HAVE_NO_POSIX_SELECT FD_ZERO(&fds); @@ -940,9 +943,6 @@ n++; } - if(num_key_fd == 0) - return MP_INPUT_NOTHING; - #ifndef HAVE_NO_POSIX_SELECT // if we have fd's without MP_FD_NO_SELECT flag, call select(): if(n>0){ @@ -962,6 +962,7 @@ } break; } + did_sleep = 1; } #endif @@ -984,6 +985,7 @@ code = getch2(time); if(code < 0) code = MP_INPUT_NOTHING; + did_sleep = 1; } else code = ((mp_key_func_t)key_fds[i].read_func)(key_fds[i].fd); @@ -998,6 +1000,8 @@ key_fds[i].flags |= MP_FD_DEAD; } } + if (!did_sleep) + usec_sleep(time * 1000); return MP_INPUT_NOTHING; }

1 0

r18813 - trunk/libmpdemux/asfheader.c
by reimar 25 Jun '06

25 Jun '06

Author: reimar Date: Sun Jun 25 16:02:28 2006 New Revision: 18813 Modified: trunk/libmpdemux/asfheader.c Log: Forgotten free on error Modified: trunk/libmpdemux/asfheader.c ============================================================================== --- trunk/libmpdemux/asfheader.c (original) +++ trunk/libmpdemux/asfheader.c Sun Jun 25 16:02:28 2006 @@ -433,6 +433,8 @@ stream_read(demuxer->stream, guid_buffer, 16); if (memcmp(guid_buffer, asf_data_chunk_guid, 16) != 0) { mp_msg(MSGT_HEADER, MSGL_FATAL, MSGTR_MPDEMUX_ASFHDR_NoDataChunkAfterHeader); + free(streams); + streams = NULL; return 0; } // read length of chunk

1 0

r18812 - trunk/libao2/ao_jack.c
by reimar 25 Jun '06

25 Jun '06

Author: reimar Date: Sun Jun 25 11:02:47 2006 New Revision: 18812 Modified: trunk/libao2/ao_jack.c Log: respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer on underrun. Modified: trunk/libao2/ao_jack.c ============================================================================== --- trunk/libao2/ao_jack.c (original) +++ trunk/libao2/ao_jack.c Sun Jun 25 11:02:47 2006 @@ -130,10 +130,13 @@ * * Assumes the data in the buffer is of type float, the number of bytes * read is res * num_bufs * sizeof(float), where res is the return value. + * If there is not enough data in the buffer remaining parts will be filled + * with silence. */ static int read_buffer(float **bufs, int cnt, int num_bufs) { int buffered = buf_used(); int i, j; + int orig_cnt = cnt; if (cnt * sizeof(float) * num_bufs > buffered) cnt = buffered / sizeof(float) / num_bufs; for (i = 0; i < cnt; i++) { @@ -142,6 +145,9 @@ read_pos = (read_pos + sizeof(float)) % BUFFSIZE; } } + for (i = cnt; i < orig_cnt; i++) + for (j = 0; j < num_bufs; j++) + bufs[j][i] = 0; return cnt; } @@ -177,11 +183,11 @@ int i; for (i = 0; i < num_ports; i++) bufs[i] = jack_port_get_buffer(ports[i], nframes); - if (!paused && !underrun) - if (read_buffer(bufs, nframes, num_ports) < nframes) - underrun = 1; if (paused || underrun) silence(bufs, nframes, num_ports); + else + if (read_buffer(bufs, nframes, num_ports) < nframes) + underrun = 1; if (estimate) { float now = (float)GetTimer() / 1000000.0; float diff = callback_time + callback_interval - now; @@ -349,6 +355,7 @@ * \brief write data into buffer and reset underrun flag */ static int play(void *data, int len, int flags) { + if (!(flags & AOPLAY_FINAL_CHUNK)) len -= len % ao_data.outburst; underrun = 0; return write_buffer(data, len);

1 0

r18811 - trunk/libao2/ao_jack.c
by reimar 25 Jun '06

25 Jun '06

Author: reimar Date: Sun Jun 25 10:53:13 2006 New Revision: 18811 Modified: trunk/libao2/ao_jack.c Log: remove unused variable Modified: trunk/libao2/ao_jack.c ============================================================================== --- trunk/libao2/ao_jack.c (original) +++ trunk/libao2/ao_jack.c Sun Jun 25 10:53:13 2006 @@ -132,7 +132,6 @@ * read is res * num_bufs * sizeof(float), where res is the return value. */ static int read_buffer(float **bufs, int cnt, int num_bufs) { - int first_len = BUFFSIZE - read_pos; int buffered = buf_used(); int i, j; if (cnt * sizeof(float) * num_bufs > buffered)

1 0

r18744 - trunk/configure
by diego 25 Jun '06

25 Jun '06

Author: diego Date: Sat Jun 17 19:18:46 2006 New Revision: 18744 Modified: trunk/configure Log: Rename --with-libdvnav --> --with-dvdnavdir for consistency. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sat Jun 17 19:18:46 2006 @@ -2019,7 +2019,7 @@ --language=*) _language=`echo $ac_option | cut -d '=' -f 2` ;; - --with-libdvdnav=*) + --with-dvdnavdir=*) _dvdnavdir=`echo $ac_option | cut -d '=' -f 2` ;;

5 8

r18810 - trunk/DOCS/tech/mirrors/update_mplayer_rsync
by attila 24 Jun '06

24 Jun '06

Author: attila Date: Sat Jun 24 23:51:51 2006 New Revision: 18810 Modified: trunk/DOCS/tech/mirrors/update_mplayer_rsync Log: natsuki.mplayerhq.hu -> rsync.mplayerhq.hu Modified: trunk/DOCS/tech/mirrors/update_mplayer_rsync ============================================================================== --- trunk/DOCS/tech/mirrors/update_mplayer_rsync (original) +++ trunk/DOCS/tech/mirrors/update_mplayer_rsync Sat Jun 24 23:51:51 2006 @@ -22,12 +22,12 @@ cd $MIRROR_ROOT echo "************ rsyncing homepage ************" >> $TMPFILE -rsync -pxlrHtWv --delete --delete-after natsuki.mplayerhq.hu::homepage/ \ +rsync -pxlrHtWv --delete --delete-after rsync.mplayerhq.hu::homepage/ \ homepage >> $TMPFILE 2>&1 echo "************ rsyncing MPlayer ************" >> $TMPFILE rsync -pxlrHtWv --delete --delete-after --exclude '/benchmark' \ - --exclude '/old_stuff' --exclude '/tests' natsuki.mplayerhq.hu::ftp/ \ + --exclude '/old_stuff' --exclude '/tests' rsync.mplayerhq.hu::ftp/ \ MPlayer >> $TMPFILE 2>&1 x=`wc -l $TMPFILE | awk '{print $1}'`

1 0