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

CVS: main/input input.c,1.125,1.126
by syncmail＠mplayerhq.hu 24 Dec '06

24 Dec '06

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv3818/input Modified Files: input.c Log Message: libvo input cleanup: remove the dependency on libinput, remove most of the crappy mappings (like O->o or ESC->q). Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- input.c 25 Oct 2005 21:23:45 -0000 1.125 +++ input.c 2 Nov 2005 21:50:54 -0000 1.126 @@ -240,10 +240,27 @@ { JOY_BTN8, "JOY_BTN8" }, { JOY_BTN9, "JOY_BTN9" }, - { KEY_XF86_PAUSE, "XF86_PAUSE" }, - { KEY_XF86_STOP, "XF86_STOP" }, - { KEY_XF86_PREV, "XF86_PREV" }, - { KEY_XF86_NEXT, "XF86_NEXT" }, + { KEY_POWER, "POWER" }, + { KEY_MENU, "MENU" }, + { KEY_PLAY, "PLAY" }, + { KEY_PAUSE, "PAUSE" }, + { KEY_PLAYPAUSE, "PLAYPAUSE" }, + { KEY_STOP, "STOP" }, + { KEY_FORWARD, "FORWARD" }, + { KEY_REWIND, "REWIND" }, + { KEY_NEXT, "NEXT" }, + { KEY_PREV, "PREV" }, + { KEY_VOLUME_UP, "VOLUME_UP" }, + { KEY_VOLUME_DOWN, "VOLUME_DOWN" }, + { KEY_MUTE, "MUTE" }, + + // These are kept for backward compatibility + { KEY_PAUSE, "XF86_PAUSE" }, + { KEY_STOP, "XF86_STOP" }, + { KEY_PREV, "XF86_PREV" }, + { KEY_NEXT, "XF86_NEXT" }, + + { KEY_CLOSE_WIN, "CLOSE_WIN" }, { 0, NULL } }; @@ -282,9 +299,11 @@ { { '}', 0 }, "speed_mult 2.0" }, { { KEY_BACKSPACE, 0 }, "speed_set 1.0" }, { { 'q', 0 }, "quit" }, + { { 'Q', 0 }, "quit" }, #ifndef HAVE_NEW_GUI { { KEY_ESC, 0 }, "quit" }, { { 'p', 0 }, "pause" }, + { { 'P', 0 }, "pause" }, #endif { { ' ', 0 }, "pause" }, { { '.', 0 }, "frame_step" }, @@ -298,6 +317,7 @@ { { KEY_INS, 0 }, "alt_src_step 1" }, { { KEY_DEL, 0 }, "alt_src_step -1" }, { { 'o', 0 }, "osd" }, + { { 'O', 0 }, "osd" }, { { 'z', 0 }, "sub_delay -0.1" }, { { 'x', 0 }, "sub_delay +0.1" }, { { 'g', 0 }, "sub_step -1" }, @@ -307,6 +327,7 @@ { { '0', 0 }, "volume 1" }, { { '*', 0 }, "volume 1" }, { { 'm', 0 }, "mute" }, + { { 'M', 0 }, "mute" }, { { '1', 0 }, "contrast -1" }, { { '2', 0 }, "contrast 1" }, { { '3', 0 }, "brightness -1" }, @@ -358,10 +379,21 @@ { { 'w', 0 }, "panscan -0.1" }, { { 'e', 0 }, "panscan +0.1" }, - { { KEY_XF86_PAUSE, 0 }, "pause" }, - { { KEY_XF86_STOP, 0 }, "quit" }, - { { KEY_XF86_PREV, 0 }, "seek -60" }, - { { KEY_XF86_NEXT, 0 }, "seek +60" }, + { { KEY_POWER, 0 }, "quit" }, + { { KEY_MENU, 0 }, "osd" }, + { { KEY_PLAY, 0 }, "pause" }, + { { KEY_PAUSE, 0 }, "pause" }, + { { KEY_PLAYPAUSE, 0 }, "pause" }, + { { KEY_STOP, 0 }, "quit" }, + { { KEY_FORWARD, 0 }, "seek 60" }, + { { KEY_REWIND, 0 }, "seek -60" }, + { { KEY_NEXT, 0 }, "pt_step 1" }, + { { KEY_PREV, 0 }, "pt_step -1" }, + { { KEY_VOLUME_UP, 0 }, "volume 1" }, + { { KEY_VOLUME_DOWN, 0 }, "volume -1" }, + { { KEY_MUTE, 0 }, "mute" }, + + { { KEY_CLOSE_WIN, 0 }, "quit" }, { { 0 }, NULL } };

3 3

CVS: main/libao2 ao_alsa.c,1.34,1.35
by syncmail＠mplayerhq.hu 31 Mar '06

31 Mar '06

CVS change done by Clemens Ladisch CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv25731/libao2 Modified Files: ao_alsa.c Log Message: This changes the software parameters to be more compatible with the behaviour of the OSS driver. This implies that underruns are not longer reported. Index: ao_alsa.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_alsa.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ao_alsa.c 13 Feb 2006 11:38:12 -0000 1.34 +++ ao_alsa.c 13 Feb 2006 11:43:25 -0000 1.35 @@ -256,6 +256,7 @@ int block; strarg_t device; snd_pcm_uframes_t bufsize; + snd_pcm_uframes_t boundary; opt_t subopts[] = { {"block", OPT_ARG_BOOL, &block, NULL}, {"device", OPT_ARG_STR, &device, (opt_test_f)str_maxlen}, @@ -280,7 +281,6 @@ ao_data.samplerate = rate_hz; ao_data.format = format; ao_data.channels = channels; - ao_data.outburst = OUTBURST; switch (format) { @@ -594,6 +594,49 @@ mp_msg(MSGT_AO,MSGL_V,"alsa-init: got buffersize=%i\n", ao_data.buffersize); } + if ((err = snd_pcm_hw_params_get_period_size(alsa_hwparams, &chunk_size, NULL)) < 0) { + mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to get period size: %s\n", snd_strerror(err)); + } else { + mp_msg(MSGT_AO,MSGL_V,"alsa-init: got period size %li\n", chunk_size); + } + ao_data.outburst = chunk_size * bytes_per_sample; + + /* setting software parameters */ + if ((err = snd_pcm_sw_params_current(alsa_handler, alsa_swparams)) < 0) { + mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to get sw-parameters: %s\n", + snd_strerror(err)); + return 0; + } + if ((err = snd_pcm_sw_params_get_boundary(alsa_swparams, &boundary)) < 0) { + mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to get boundary: %s\n", + snd_strerror(err)); + return 0; + } + /* start playing when one period has been written */ + if ((err = snd_pcm_sw_params_set_start_threshold(alsa_handler, alsa_swparams, chunk_size)) < 0) { + mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set start threshold: %s\n", + snd_strerror(err)); + return 0; + } + /* disable underrun reporting */ + if ((err = snd_pcm_sw_params_set_stop_threshold(alsa_handler, alsa_swparams, boundary)) < 0) { + mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set stop threshold: %s\n", + snd_strerror(err)); + return 0; + } + /* play silence when there is an underrun */ + if ((err = snd_pcm_sw_params_set_silence_size(alsa_handler, alsa_swparams, boundary)) < 0) { + mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set silence size: %s\n", + snd_strerror(err)); + return 0; + } + if ((err = snd_pcm_sw_params(alsa_handler, alsa_swparams)) < 0) { + mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: unable to set sw-parameters: %s\n", + snd_strerror(err)); + return 0; + } + /* end setting sw-params */ + mp_msg(MSGT_AO,MSGL_INFO,"alsa: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n", ao_data.samplerate, ao_data.channels, bytes_per_sample, ao_data.buffersize, snd_pcm_format_description(alsa_format)); @@ -687,49 +730,6 @@ return; } -#ifndef timersub -#define timersub(a, b, result) \ -do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ -} while (0) -#endif - -/* I/O error handler */ -static int xrun(u_char *str_mode) -{ - int err; - snd_pcm_status_t *status; - - snd_pcm_status_alloca(&status); - - if ((err = snd_pcm_status(alsa_handler, status))<0) { - mp_msg(MSGT_AO,MSGL_ERR,"status error: %s", snd_strerror(err)); - return(0); - } - - if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) { - struct timeval now, diff, tstamp; - gettimeofday(&now, 0); - snd_pcm_status_get_trigger_tstamp(status, &tstamp); - timersub(&now, &tstamp, &diff); - mp_msg(MSGT_AO,MSGL_INFO,"alsa-%s: xrun of at least %.3f msecs. resetting stream\n", - str_mode, - diff.tv_sec * 1000 + diff.tv_usec / 1000.0); - } - - if ((err = snd_pcm_prepare(alsa_handler))<0) { - mp_msg(MSGT_AO,MSGL_ERR,"xrun: prepare error: %s", snd_strerror(err)); - return(0); - } - - return(1); /* ok, data should be accepted again */ -} - /* plays 'len' bytes of 'data' returns: number of bytes played @@ -756,13 +756,7 @@ res = snd_pcm_writei(alsa_handler, (void *)output_samples, num_frames); - if (res == -EPIPE) { /* underrun */ - if (xrun("play") <= 0) { - mp_msg(MSGT_AO,MSGL_ERR,"alsa-play: xrun reset error"); - return(0); - } - } - else if (res == -ESTRPIPE) { /* suspend */ + if (res == -ESTRPIPE) { /* suspend */ mp_msg(MSGT_AO,MSGL_INFO,"alsa-play: pcm in suspend mode. trying to resume\n"); while ((res = snd_pcm_resume(alsa_handler)) == -EAGAIN) sleep(1);

6 10

CVS: main/libmpdemux demuxer.h,1.88,1.89
by syncmail＠mplayerhq.hu 10 Mar '06

10 Mar '06

CVS change done by Jindrich Makovicka CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv18119 Modified Files: demuxer.h Log Message: forgotten cast (blows on gcc4) Index: demuxer.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- demuxer.h 12 Feb 2006 09:28:09 -0000 1.88 +++ demuxer.h 12 Feb 2006 10:51:04 -0000 1.89 @@ -190,7 +190,7 @@ dp->flags=0; dp->refcount=1; dp->master=NULL; - if (len > 0 && (dp->buffer = malloc(len + 8))) + if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8))) memset(dp->buffer + len, 0, 8); else dp->len = 0;

4 4

CVS: main cpudetect.c,1.43,1.44
by syncmail＠mplayerhq.hu 08 Mar '06

08 Mar '06

CVS change done by Ivan Kalvachev CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv20348 Modified Files: cpudetect.c Log Message: Revert and Restore cpu speed detection originally writen by atmos (with few modifications). Now when we have MPLAYER_VERBOSE envermoment variable it is possible to disable it without compleatly removing detection from the source. Index: cpudetect.c =================================================================== RCS file: /cvsroot/mplayer/main/cpudetect.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- cpudetect.c 9 Feb 2006 14:07:51 -0000 1.43 +++ cpudetect.c 9 Feb 2006 15:11:14 -0000 1.44 @@ -13,6 +13,7 @@ #include <stdio.h> #include <string.h> +#include "osdep/timer.h" #if defined (__NetBSD__) || defined(__OpenBSD__) #include <sys/param.h> @@ -211,6 +212,27 @@ #endif } +static inline unsigned long long int rdtsc( void ) +{ + unsigned long long int retval; + __asm __volatile ("rdtsc":"=A"(retval)::"memory"); + return retval; +} + +/* Returns CPU clock in khz */ +static unsigned int GetCpuSpeed(void) +{ + unsigned long long int tscstart, tscstop; + unsigned int start, stop; + + tscstart = rdtsc(); + start = GetTimer(); + usec_sleep(50000); + stop = GetTimer(); + tscstop = rdtsc(); + + return((tscstop-tscstart)/((stop-start)/1000.0)); +} #define CPUID_EXTFAMILY ((regs2[0] >> 20)&0xFF) /* 27..20 */ #define CPUID_EXTMODEL ((regs2[0] >> 16)&0x0F) /* 19..16 */ @@ -221,7 +243,7 @@ char *GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]){ #include "cputable.h" /* get cpuname and cpuvendors */ - char vendor[17]; + char vendor[17], cpuspeed[16]; char *retname; int i; @@ -232,10 +254,24 @@ sprintf(vendor,"%.4s%.4s%.4s",(char*)(regs+1),(char*)(regs+3),(char*)(regs+2)); + /* Measure CPU speed */ + if (verbose >=0 && gCpuCaps.hasTSC && (i = GetCpuSpeed()) > 0) { + if (i < 1000000) { + i += 50; /* for rounding */ + snprintf(cpuspeed,15, " %d.%d MHz", i/1000, (i/100)%10); + } else { + //i += 500; /* for rounding */ + snprintf(cpuspeed,15, " %d MHz", i/1000); + } + cpuspeed[15]='\0'; + } else { /* No TSC Support */ + cpuspeed[0]='\0'; + } + for(i=0; i<MAX_VENDORS; i++){ if(!strcmp(cpuvendors[i].string,vendor)){ if(cpuname[i][CPUID_FAMILY][CPUID_MODEL]){ - snprintf(retname,255,"%s %s",cpuvendors[i].name,cpuname[i][CPUID_FAMILY][CPUID_MODEL]); + snprintf(retname,255,"%s %s%s",cpuvendors[i].name,cpuname[i][CPUID_FAMILY][CPUID_MODEL],cpuspeed); } else { snprintf(retname,255,"unknown %s %d. Generation CPU",cpuvendors[i].name,CPUID_FAMILY); mp_msg(MSGT_CPUDETECT,MSGL_WARN,"unknown %s CPU:\n",cpuvendors[i].name);

7 11

CVS: main/postproc rgb2rgb.c,1.66,1.67
by syncmail＠mplayerhq.hu 08 Mar '06

08 Mar '06

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/postproc In directory mail:/var2/tmp/cvs-serv11411/postproc Modified Files: rgb2rgb.c Log Message: cosmetics: indentation fixes Index: rgb2rgb.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/rgb2rgb.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- rgb2rgb.c 11 Feb 2006 13:35:46 -0000 1.66 +++ rgb2rgb.c 11 Feb 2006 13:42:54 -0000 1.67 @@ -334,15 +334,15 @@ for(i=0; i<num_pixels; i++) { #ifdef WORDS_BIGENDIAN - dst[3]= palette[ src[i]*4+2 ]; - dst[2]= palette[ src[i]*4+1 ]; - dst[1]= palette[ src[i]*4+0 ]; + dst[3]= palette[ src[i]*4+2 ]; + dst[2]= palette[ src[i]*4+1 ]; + dst[1]= palette[ src[i]*4+0 ]; #else //FIXME slow? - dst[0]= palette[ src[i]*4+2 ]; - dst[1]= palette[ src[i]*4+1 ]; - dst[2]= palette[ src[i]*4+0 ]; -// dst[3]= 0; /* do we need this cleansing? */ + dst[0]= palette[ src[i]*4+2 ]; + dst[1]= palette[ src[i]*4+1 ]; + dst[2]= palette[ src[i]*4+0 ]; + //dst[3]= 0; /* do we need this cleansing? */ #endif dst+= 4; } @@ -354,15 +354,15 @@ for(i=0; i<num_pixels; i++) { #ifdef WORDS_BIGENDIAN - dst[3]= palette[ src[i]*4+0 ]; - dst[2]= palette[ src[i]*4+1 ]; - dst[1]= palette[ src[i]*4+2 ]; + dst[3]= palette[ src[i]*4+0 ]; + dst[2]= palette[ src[i]*4+1 ]; + dst[1]= palette[ src[i]*4+2 ]; #else - //FIXME slow? - dst[0]= palette[ src[i]*4+0 ]; - dst[1]= palette[ src[i]*4+1 ]; - dst[2]= palette[ src[i]*4+2 ]; -// dst[3]= 0; /* do we need this cleansing? */ + //FIXME slow? + dst[0]= palette[ src[i]*4+0 ]; + dst[1]= palette[ src[i]*4+1 ]; + dst[2]= palette[ src[i]*4+2 ]; + //dst[3]= 0; /* do we need this cleansing? */ #endif dst+= 4; @@ -447,14 +447,14 @@ for(i=0; i<num_pixels; i++) { #ifdef WORDS_BIGENDIAN - /* RGB32 (= A,B,G,R) -> BGR24 (= B,G,R) */ - dst[3*i + 0] = src[4*i + 1]; - dst[3*i + 1] = src[4*i + 2]; - dst[3*i + 2] = src[4*i + 3]; + /* RGB32 (= A,B,G,R) -> BGR24 (= B,G,R) */ + dst[3*i + 0] = src[4*i + 1]; + dst[3*i + 1] = src[4*i + 2]; + dst[3*i + 2] = src[4*i + 3]; #else - dst[3*i + 0] = src[4*i + 2]; - dst[3*i + 1] = src[4*i + 1]; - dst[3*i + 2] = src[4*i + 0]; + dst[3*i + 0] = src[4*i + 2]; + dst[3*i + 1] = src[4*i + 1]; + dst[3*i + 2] = src[4*i + 0]; #endif } } @@ -465,16 +465,16 @@ for(i=0; 3*i<src_size; i++) { #ifdef WORDS_BIGENDIAN - /* RGB24 (= R,G,B) -> BGR32 (= A,R,G,B) */ - dst[4*i + 0] = 0; - dst[4*i + 1] = src[3*i + 0]; - dst[4*i + 2] = src[3*i + 1]; - dst[4*i + 3] = src[3*i + 2]; + /* RGB24 (= R,G,B) -> BGR32 (= A,R,G,B) */ + dst[4*i + 0] = 0; + dst[4*i + 1] = src[3*i + 0]; + dst[4*i + 2] = src[3*i + 1]; + dst[4*i + 3] = src[3*i + 2]; #else - dst[4*i + 0] = src[3*i + 2]; - dst[4*i + 1] = src[3*i + 1]; - dst[4*i + 2] = src[3*i + 0]; - dst[4*i + 3] = 0; + dst[4*i + 0] = src[3*i + 2]; + dst[4*i + 1] = src[3*i + 1]; + dst[4*i + 2] = src[3*i + 0]; + dst[4*i + 3] = 0; #endif } } @@ -490,15 +490,15 @@ register uint16_t bgr; bgr = *s++; #ifdef WORDS_BIGENDIAN - *d++ = 0; - *d++ = (bgr&0x1F)<<3; - *d++ = (bgr&0x7E0)>>3; - *d++ = (bgr&0xF800)>>8; + *d++ = 0; + *d++ = (bgr&0x1F)<<3; + *d++ = (bgr&0x7E0)>>3; + *d++ = (bgr&0xF800)>>8; #else - *d++ = (bgr&0xF800)>>8; - *d++ = (bgr&0x7E0)>>3; - *d++ = (bgr&0x1F)<<3; - *d++ = 0; + *d++ = (bgr&0xF800)>>8; + *d++ = (bgr&0x7E0)>>3; + *d++ = (bgr&0x1F)<<3; + *d++ = 0; #endif } } @@ -564,15 +564,15 @@ register uint16_t bgr; bgr = *s++; #ifdef WORDS_BIGENDIAN - *d++ = 0; - *d++ = (bgr&0x1F)<<3; - *d++ = (bgr&0x3E0)>>2; - *d++ = (bgr&0x7C00)>>7; + *d++ = 0; + *d++ = (bgr&0x1F)<<3; + *d++ = (bgr&0x3E0)>>2; + *d++ = (bgr&0x7C00)>>7; #else - *d++ = (bgr&0x7C00)>>7; - *d++ = (bgr&0x3E0)>>2; - *d++ = (bgr&0x1F)<<3; - *d++ = 0; + *d++ = (bgr&0x7C00)>>7; + *d++ = (bgr&0x3E0)>>2; + *d++ = (bgr&0x1F)<<3; + *d++ = 0; #endif } }

3 2

CVS: main/DOCS/tech colorspaces.txt,1.14,1.15
by syncmail＠mplayerhq.hu 01 Mar '06

01 Mar '06

CVS change done by Alan Curry CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv4788/DOCS/tech Modified Files: colorspaces.txt Log Message: Add a practical description of endian-independent RGB/BGR coding Index: colorspaces.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/colorspaces.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- colorspaces.txt 31 Mar 2005 22:45:03 -0000 1.14 +++ colorspaces.txt 24 Feb 2006 22:18:45 -0000 1.15 @@ -135,3 +135,24 @@ Depending upon the CPU being little- or big-endian, different 'in memory' and 'in register' formats will be equal (LE -> BGRA == BGR32 / BE -> ARGB == BGR32) + +Practical coding guide: + +The 4, 8, 15, and 16 bit formats are defined so that the portable way to +access them is to load the pixel into an integer and use bitmasks. + +The 24 bit formats are defined so that the portable way to access them is +to address the 3 components as separate bytes, as in ((uint8_t *)pixel)[0], +((uint8_t *)pixel)[1], ((uint8_t *)pixel)[2]. + +When a 32-bit format is identified by the four characters A, R, G, and B in +some order, the portable way to access it is by addressing the 4 components +as separate bytes. + +When a 32-bit format is identified by the 3 characters R, G, and B in some +order followed by the number 32, the portable way to access it is to load +the pixel into an integer and use bitmasks. + +When the above portable access methods are not used, you will need to write +2 versions of your code, and use #ifdef WORDS_BIGENDIAN to choose the correct +one.

3 5

CVS: main cpudetect.c,1.43,1.44
by syncmail＠mplayerhq.hu 01 Mar '06

01 Mar '06

CVS change done by Alan Curry CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv6545 Modified Files: cpudetect.c Log Message: add Amiga-style AltiVec detection, patch from andrea at amigasoft dot net Index: cpudetect.c =================================================================== RCS file: /cvsroot/mplayer/main/cpudetect.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- cpudetect.c 9 Feb 2006 14:07:51 -0000 1.43 +++ cpudetect.c 28 Feb 2006 23:24:38 -0000 1.44 @@ -33,6 +33,10 @@ #include <windows.h> #endif +#ifdef __AMIGAOS4__ +#include <proto/exec.h> +#endif + //#define X86_FXSR_MAGIC /* Thanks to the FreeBSD project for some of this cpuid code, and * help understanding how to use it. Thanks to the Mesa @@ -468,6 +472,7 @@ #ifdef SYS_DARWIN #include <sys/sysctl.h> #else +#ifndef __AMIGAOS4__ #include <signal.h> #include <setjmp.h> @@ -484,6 +489,7 @@ canjump = 0; siglongjmp (jmpbuf, 1); } +#endif //__AMIGAOS4__ #endif void GetCpuCaps( CpuCaps *caps) @@ -517,6 +523,13 @@ caps->hasAltiVec = 1; } #else /* SYS_DARWIN */ +#ifdef __AMIGAOS4__ + ULONG result = 0; + + GetCPUInfoTags(GCIT_VectorUnit, &result, TAG_DONE); + if (result == VECTORTYPE_ALTIVEC) + caps->hasAltiVec = 1; +#else /* no Darwin, do it the brute-force way */ /* this is borrowed from the libmpeg2 library */ { @@ -535,6 +548,7 @@ caps->hasAltiVec = 1; } } +#endif //__AMIGAOS4__ #endif /* SYS_DARWIN */ mp_msg(MSGT_CPUDETECT,MSGL_INFO,"AltiVec %sfound\n", (caps->hasAltiVec ? "" : "not ")); #endif /* HAVE_ALTIVEC */

1 0

CVS: main common.mak,1.1,1.2
by syncmail＠mplayerhq.hu 28 Feb '06

28 Feb '06

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv19030 Modified Files: common.mak Log Message: update config.mak to match ffmpeg's version (fix alpha compilation) Index: common.mak =================================================================== RCS file: /cvsroot/mplayer/main/common.mak,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- common.mak 14 Feb 2006 21:42:49 -0000 1.1 +++ common.mak 27 Feb 2006 22:44:22 -0000 1.2 @@ -19,7 +19,7 @@ CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc endif -SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) +SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS) SHARED_OBJS := $(OBJS) $(SHARED_OBJS) @@ -71,6 +71,7 @@ install-libs: $(INSTLIBTARGETS) install-lib-shared: $(SLIBNAME) + install -d "$(libdir)" ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else @@ -83,9 +84,12 @@ endif install-lib-static: $(LIB) + install -d "$(libdir)" install -m 644 $(LIB) "$(libdir)" install-headers: + install -d "$(incdir)" + install -d "$(libdir)/pkgconfig" install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"

1 0

CVS: main/libmpdemux demux_mpg.c,1.72,1.73
by syncmail＠mplayerhq.hu 27 Feb '06

27 Feb '06

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv14089 Modified Files: demux_mpg.c Log Message: try to get duration from the stream layer, if an implementation of STREAM_CTRL_GET_TIME_LENGTH is available Index: demux_mpg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- demux_mpg.c 17 Feb 2006 01:57:40 -0000 1.72 +++ demux_mpg.c 27 Feb 2006 21:13:17 -0000 1.73 @@ -787,9 +787,17 @@ demux_stream_t *d_video=demuxer->video; sh_video_t *sh_video=d_video->sh; mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv; + int msec = 0; switch(cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: + msec = stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg); + if(msec != STREAM_UNSUPORTED) { + msec = *((unsigned int*)arg); + *((double *)arg)=(double)msec/1000.0f; + mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, stream len: %d (%.3lf)\r\n", msec, *((double*)arg)); + return DEMUXER_CTRL_GUESS; + } if (mpg_d && mpg_d->has_valid_timestamps) { *((double *)arg)=(double)mpg_d->final_pts; return DEMUXER_CTRL_GUESS;

1 0

CVS: main/libmpdemux stream_dvd.c,1.10,1.11
by syncmail＠mplayerhq.hu 27 Feb '06

27 Feb '06

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv6092 Modified Files: stream_dvd.c Log Message: implement STREAM_CTRL_GET_TIME_LENGTH to return the duration of the dvd currently playing Index: stream_dvd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream_dvd.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- stream_dvd.c 27 Jan 2006 03:07:13 -0000 1.10 +++ stream_dvd.c 27 Feb 2006 21:11:28 -0000 1.11 @@ -432,6 +432,63 @@ return msec; } +static int mp_get_titleset_length(ifo_handle_t *vts_file, tt_srpt_t *tt_srpt, int vts_no, int title_no) +{ + int vts_ttn; ///< title number within video title set + int pgc_no; ///< program chain number + int msec; ///< time length in milliseconds + + if(!vts_file || !tt_srpt) + return 0; + + if(vts_file->vtsi_mat && vts_file->vts_pgcit) + { + if(tt_srpt->title[title_no].title_set_nr == vts_no) + { + vts_ttn = tt_srpt->title[title_no].vts_ttn - 1; + pgc_no = vts_file->vts_ptt_srpt->title[vts_ttn].ptt[0].pgcn - 1; + msec = dvdtimetomsec(&vts_file->vts_pgcit->pgci_srp[pgc_no].pgc->playback_time); + } + } + return msec; +} + + +static int mp_describe_titleset(dvd_reader_t *dvd, tt_srpt_t *tt_srpt, int vts_no) +{ + ifo_handle_t *vts_file; + int title_no, msec=0; + + vts_file = ifoOpen(dvd, vts_no); + if(!vts_file) + return 0; + + if(!vts_file->vtsi_mat || !vts_file->vts_pgcit) + return 0; + + for(title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++) + { + msec = mp_get_titleset_length(vts_file, tt_srpt, vts_no, title_no); + mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title_no + 1, msec / 1000, msec % 1000); + } + ifoClose(vts_file); +} + +static int control(stream_t *stream,int cmd,void* arg) +{ + switch(cmd) + { + case STREAM_CTRL_GET_TIME_LENGTH: + { + dvd_priv_t *d = stream->priv; + *((unsigned int *)arg) = mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title, d->cur_title-1); + return 1; + } + } + return STREAM_UNSUPORTED; +} + + static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { struct stream_priv_s* p = (struct stream_priv_s*)opts; char *filename; @@ -513,9 +570,6 @@ unsigned char discid [16]; ///< disk ID, a 128 bit MD5 sum int vts_no; ///< video title set number int title_no; ///< title number - int vts_ttn; ///< title number within video title set - int pgc_no; ///< program chain number - int msec; ///< time length in milliseconds mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLES=%d\n", tt_srpt->nr_of_srpts); for (title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++) { @@ -523,22 +577,7 @@ mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLE_%d_ANGLES=%d\n", title_no + 1, tt_srpt->title[title_no].nr_of_angles); } for (vts_no = 1; vts_no <= vmg_file->vts_atrt->nr_of_vtss; vts_no++) - { - vts_file = ifoOpen(dvd, vts_no); - if (vts_file) - { - if (vts_file->vtsi_mat && vts_file->vts_pgcit) - for (title_no = 0; title_no < tt_srpt->nr_of_srpts; title_no++) - if (tt_srpt->title[title_no].title_set_nr == vts_no) - { - vts_ttn = tt_srpt->title[title_no].vts_ttn - 1; - pgc_no = vts_file->vts_ptt_srpt->title[vts_ttn].ptt[0].pgcn - 1; - msec = dvdtimetomsec(&vts_file->vts_pgcit->pgci_srp[pgc_no].pgc->playback_time); - mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DVD_TITLE_%d_LENGTH=%d.%03d\n", title_no + 1, msec / 1000, msec % 1000); - } - ifoClose(vts_file); - } - } + mp_describe_titleset(dvd, tt_srpt, vts_no); if (DVDDiscID(dvd, discid) >= 0) { int i; @@ -628,6 +667,7 @@ d->vmg_file=vmg_file; d->tt_srpt=tt_srpt; d->vts_file=vts_file; + d->cur_title = dvd_title+1; /** * Check number of audio channels and types @@ -780,6 +820,7 @@ stream->flags = STREAM_READ | STREAM_SEEK; stream->fill_buffer = fill_buffer; stream->seek = seek; + stream->control = control; stream->close = stream_dvd_close; stream->start_pos = (off_t)d->cur_pack*2048; stream->end_pos = (off_t)(d->cur_pgc->cell_playback[d->last_cell-1].last_sector)*2048;

1 0