September 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main mp_msg.c,1.27,1.28 mp_msg.h,1.33,1.34
by syncmail＠mplayerhq.hu 01 Oct '05

01 Oct '05

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv32021 Modified Files: mp_msg.c mp_msg.h Log Message: mp_msg cleanup. Index: mp_msg.c =================================================================== RCS file: /cvsroot/mplayer/main/mp_msg.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- mp_msg.c 3 Sep 2005 19:27:48 -0000 1.27 +++ mp_msg.c 29 Sep 2005 05:21:12 -0000 1.28 @@ -8,14 +8,10 @@ #include "config.h" #if defined(FOR_MENCODER) || defined(CODECS2HTML) -#undef ENABLE_GUI_CODE -#elif defined(HAVE_NEW_GUI) -#define ENABLE_GUI_CODE HAVE_NEW_GUI -#else -#undef ENABLE_GUI_CODE +#undef HAVE_NEW_GUI #endif -#if ENABLE_GUI_CODE +#ifdef HAVE_NEW_GUI #include "Gui/interface.h" extern int use_gui; #endif @@ -26,8 +22,6 @@ static int mp_msg_levels[MSGT_MAX]; // verbose level of this module -#if 1 - void mp_msg_init(){ #ifdef USE_I18N #ifdef MP_DEBUG @@ -57,21 +51,20 @@ return lev <= mp_msg_levels[mod]; } -void mp_msg_c( int x, const char *format, ... ){ -#if 1 +void mp_msg(int mod, int lev, const char *format, ... ){ va_list va; char tmp[MSGSIZE_MAX]; - if((x&255)>mp_msg_levels[x>>8]) return; // do not display + if (lev > mp_msg_levels[mod]) return; // do not display va_start(va, format); vsnprintf(tmp, MSGSIZE_MAX, mp_gettext(format), va); va_end(va); tmp[MSGSIZE_MAX-2] = '\n'; tmp[MSGSIZE_MAX-1] = 0; -#if ENABLE_GUI_CODE +#ifdef HAVE_NEW_GUI if(use_gui) - guiMessageBox(x&255, tmp); + guiMessageBox(lev, tmp); #endif #ifdef MSG_USE_COLORS @@ -139,83 +132,21 @@ "NETST", "MUXER"}; - int c=v_colors[(x & 255)]; - int c2=((x>>8)+1)%15+1; + int c=v_colors[lev]; + int c2=(mod+1)%15+1; static int header=1; - FILE *stream= (x & 255) <= MSGL_WARN ? stderr : stdout; + FILE *stream= (lev) <= MSGL_WARN ? stderr : stdout; if(header){ - fprintf(stream, "\033[%d;3%dm%9s\033[0;37m: ",c2>>3,c2&7, mod_text[x>>8]); + fprintf(stream, "\033[%d;3%dm%9s\033[0;37m: ",c2>>3,c2&7, mod_text[mod]); } fprintf(stream, "\033[%d;3%dm",c>>3,c&7); header= tmp[strlen(tmp)-1] == '\n' /*||tmp[strlen(tmp)-1] == '\r'*/; } #endif - if ((x & 255) <= MSGL_WARN){ + if (lev <= MSGL_WARN){ fprintf(stderr, "%s", tmp);fflush(stderr); } else { printf("%s", tmp);fflush(stdout); } - -#else - va_list va; - if((x&255)>mp_msg_levels[x>>8]) return; // do not display - va_start(va, format); -#if ENABLE_GUI_CODE - if(use_gui){ - char tmp[16*80]; - vsnprintf( tmp,8*80,format,va ); tmp[8*80-1]=0; - switch( x&255 ) { - case MSGL_FATAL: - fprintf( stderr,"%s",tmp ); - fflush(stderr); - gtkMessageBox( GTK_MB_FATAL|GTK_MB_SIMPLE,tmp ); - break; - case MSGL_ERR: - fprintf( stderr,"%s",tmp ); - fflush(stderr); - gtkMessageBox( GTK_MB_ERROR|GTK_MB_SIMPLE,tmp ); - break; - case MSGL_WARN: - fprintf( stderr, "%s",tmp ); - fflush(stdout); - gtkMessageBox( GTK_MB_WARNING|GTK_MB_SIMPLE,tmp ); - break; - default: - fprintf(stderr, "%s",tmp ); - fflush(stdout); - } - } else -#endif - if((x&255)<=MSGL_ERR){ -// fprintf(stderr,"%%%%%% "); - vfprintf(stderr,format, va); - fflush(stderr); - } else { -// printf("%%%%%% "); - vfprintf(stderr,format, va); - fflush(stdout); - } - va_end(va); -#endif -} - -#else - -FILE *mp_msg_file[MSGT_MAX]; // print message to this file (can be stdout/err) -static FILE* mp_msg_last_file=NULL; - -// how to handle errors->stderr messages->stdout ? -void mp_msg( int x, const char *format, ... ){ - if((x&255)>mp_msg_levels[x>>8] || !mp_msg_file[x>>8]) return; // do not display - va_list va; - va_start(va, format); - vfprintf(mp_msg_file[x>>8],format, va); - if(mp_msg_last_file!=mp_msg_file[x>>8]){ - fflush(mp_msg_file[x>>8]); - mp_msg_last_file=mp_msg_file[x>>8]; - } - va_end(va); } - -#endif Index: mp_msg.h =================================================================== RCS file: /cvsroot/mplayer/main/mp_msg.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- mp_msg.h 20 Jan 2005 13:22:52 -0000 1.33 +++ mp_msg.h 29 Sep 2005 05:21:12 -0000 1.34 @@ -114,26 +114,17 @@ #endif #ifdef __GNUC__ -void mp_msg_c( int x, const char *format, ... ) __attribute__ ((format (printf, 2, 3))); -#define mp_msg(mod,lev, args... ) mp_msg_c(((mod)<<8)|(lev), ## args ) - -#ifdef MP_DEBUG -#define mp_dbg(mod,lev, args... ) mp_msg_c(((mod)<<8)|(lev), ## args ) -#else -// these messages are only usefull for developers, disable them -#define mp_dbg(mod,lev, args... ) -#endif +void mp_msg(int mod, int lev, const char *format, ... ) __attribute__ ((format (printf, 3, 4))); #else // not GNU C -void mp_msg_c( int x, const char *format, ... ); -#define mp_msg(mod,lev, ... ) mp_msg_c(((mod)<<8)|(lev), __VA_ARGS__) +void mp_msg(int mod, int lev, const char *format, ... ); +#endif #ifdef MP_DEBUG -#define mp_dbg(mod,lev, ... ) mp_msg_c(((mod)<<8)|(lev), __VA_ARGS__) +#define mp_dbg(mod,lev, ... ) mp_msg(mod, lev, __VA_ARGS__) #else // these messages are only usefull for developers, disable them #define mp_dbg(mod,lev, ... ) #endif -#endif #endif #endif

3 3

CVS: main mp_msg.h,1.34,1.35
by syncmail＠mplayerhq.hu 30 Sep '05

30 Sep '05

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv14715 Modified Files: mp_msg.h Log Message: 1000l gcc 2.95 only works with this kind of define, instead of the C99 one. Index: mp_msg.h =================================================================== RCS file: /cvsroot/mplayer/main/mp_msg.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mp_msg.h 29 Sep 2005 05:21:12 -0000 1.34 +++ mp_msg.h 30 Sep 2005 05:57:59 -0000 1.35 @@ -115,16 +115,20 @@ #ifdef __GNUC__ void mp_msg(int mod, int lev, const char *format, ... ) __attribute__ ((format (printf, 3, 4))); +# ifdef MP_DEBUG +# define mp_dbg(mod,lev, args... ) mp_msg(mod, lev, ## args ) +# else +# define mp_dbg(mod,lev, args... ) /* only usefull for developers */ +# endif #else // not GNU C void mp_msg(int mod, int lev, const char *format, ... ); +# ifdef MP_DEBUG +# define mp_dbg(mod,lev, ... ) mp_msg(mod, lev, __VA_ARGS__) +# else +# define mp_dbg(mod,lev, ... ) /* only usefull for developers */ +# endif #endif -#ifdef MP_DEBUG -#define mp_dbg(mod,lev, ... ) mp_msg(mod, lev, __VA_ARGS__) -#else -// these messages are only usefull for developers, disable them -#define mp_dbg(mod,lev, ... ) -#endif #endif #endif

2 1

switch_audio - switching audiostreams in AVIs - I changed the code - is anybody interessted?
by Jochen Leopold 30 Sep '05

30 Sep '05

hello! I just wanted to ask, if sombody wants my changes of the MPlayer code which enables audioswitches in avi files during playback. I have not much experince in changing open source code, so I don't know what I should do with my work. I would be glad about some advice from you. LAva_22_at

3 2

CVS: main cfg-mencoder.h,1.103,1.104
by syncmail＠mplayerhq.hu 28 Sep '05

28 Sep '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv26087 Modified Files: cfg-mencoder.h Log Message: A long-standing bug... -vfwopts in cfg-mencoder.h is being overridden by -vf* in cfg-common.h. The easiest fix of all, add an 'x' to the name: -xvfwopts patch by RC <rcooley -- at -- spamcop -- dot -- net> Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- cfg-mencoder.h 19 Sep 2005 19:23:38 -0000 1.103 +++ cfg-mencoder.h 28 Sep 2005 21:49:40 -0000 1.104 @@ -288,7 +288,7 @@ {"faacopts", "MPlayer was compiled without libfaac. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif #ifdef USE_WIN32DLL - {"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"xvfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif #if defined(HAVE_XVID3) || defined(HAVE_XVID4) {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},

1 0

CVS: main/libmpcodecs ae.c,1.6,1.7
by syncmail＠mplayerhq.hu 28 Sep '05

28 Sep '05

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv9879 Modified Files: ae.c Log Message: forgotten include; patch by Jan Knutar (jknutar ad nic puntum fi) Index: ae.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ae.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ae.c 7 May 2005 14:49:18 -0000 1.6 +++ ae.c 28 Sep 2005 20:15:30 -0000 1.7 @@ -11,6 +11,8 @@ #include "ae.h" #include "../config.h" +#include "ae_pcm.h" + #ifdef HAVE_TOOLAME #include "ae_toolame.h" #endif

1 0

CVS: main/libmpcodecs ve_xvid4.c,1.20,1.21
by syncmail＠mplayerhq.hu 28 Sep '05

28 Sep '05

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv31335/libmpcodecs Modified Files: ve_xvid4.c Log Message: code before decleration, gcc2.95 fix patch by Jan Knutar (jknutar SIGH nic BOOM fi) Index: ve_xvid4.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid4.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ve_xvid4.c 26 Sep 2005 10:43:34 -0000 1.20 +++ ve_xvid4.c 28 Sep 2005 17:25:21 -0000 1.21 @@ -729,17 +729,6 @@ xvid_plugin_2pass2_t *pass2 = &mod->pass2; XVIDRational ar; - //profile is unrestricted as default - profile_t *selected_profile = profileFromName("unrestricted"); - if(xvidenc_profile) - selected_profile = profileFromName(xvidenc_profile); - if(!selected_profile) - { - mp_msg(MSGT_MENCODER,MSGL_ERR, - "xvid:[ERROR] \"%s\" is an invalid profile name\n", xvidenc_profile); - return(BAD); - } - const int motion_presets[7] = { 0, @@ -752,6 +741,16 @@ XVID_ME_HALFPELREFINE8 | XVID_ME_USESQUARES16 }; + //profile is unrestricted as default + profile_t *selected_profile = profileFromName("unrestricted"); + if(xvidenc_profile) + selected_profile = profileFromName(xvidenc_profile); + if(!selected_profile) + { + mp_msg(MSGT_MENCODER,MSGL_ERR, + "xvid:[ERROR] \"%s\" is an invalid profile name\n", xvidenc_profile); + return(BAD); + } /* ------------------------------------------------------------------- * Dispatch all settings having an impact on the "create" structure

1 0

CVS: main/libmpdemux http.c,1.29,1.30
by syncmail＠mplayerhq.hu 28 Sep '05

28 Sep '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv23282 Modified Files: http.c Log Message: another url_free that shouldn't be commented out. Index: http.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/http.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- http.c 6 Sep 2005 21:00:57 -0000 1.29 +++ http.c 28 Sep 2005 15:43:24 -0000 1.30 @@ -899,7 +899,7 @@ stream->streaming_ctrl->bandwidth = network_bandwidth; url = url_new(stream->url); stream->streaming_ctrl->url = check4proxies(url); - //url_free(url); + url_free(url); mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_HTTP(2), URL: %s\n", stream->url); seekable = http_streaming_start(stream, file_format);

1 0

CVS: main/libmpdemux demux_mov.c,1.131,1.132
by syncmail＠mplayerhq.hu 28 Sep '05

28 Sep '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv6268 Modified Files: demux_mov.c Log Message: Detect eof when seeking and do _not_ restart the video. Also fixes some invalid reads. Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- demux_mov.c 27 Sep 2005 11:21:13 -0000 1.131 +++ demux_mov.c 28 Sep 2005 15:37:30 -0000 1.132 @@ -1850,6 +1850,7 @@ int x; off_t pos; + if (ds->eof) return 0; trak = stream_track(priv, ds); if (!trak) return 0; @@ -1946,6 +1947,7 @@ if(!(flags&1)) sample+=trak->chunks[trak->pos].sample; // relative trak->pos=0; while(trak->pos<trak->chunks_size && trak->chunks[trak->pos].sample<sample) ++trak->pos; + if (trak->pos == trak->chunks_size) return -1; pts=(float)(trak->chunks[trak->pos].sample*trak->duration)/(float)trak->timescale; } else { unsigned int ipts; @@ -1956,12 +1958,14 @@ for(trak->pos=0;trak->pos<trak->samples_size;++trak->pos){ if(trak->samples[trak->pos].pts>=ipts) break; // found it! } + if (trak->pos == trak->samples_size) return -1; if(trak->keyframes_size){ // find nearest keyframe int i; for(i=0;i<trak->keyframes_size;i++){ if(trak->keyframes[i]>=trak->pos) break; } + if (i == trak->keyframes_size) return -1; if(i>0 && (trak->keyframes[i]-trak->pos) > (trak->pos-trak->keyframes[i-1])) --i; trak->pos=trak->keyframes[i]; @@ -1987,7 +1991,9 @@ if (trak) { //if(flags&2) pts*=(float)trak->length/(float)trak->timescale; //if(!(flags&1)) pts+=ds->pts; - pts=ds->pts=mov_seek_track(trak,pts,flags); + ds->pts=mov_seek_track(trak,pts,flags); + if (ds->pts < 0) ds->eof = 1; + else pts = ds->pts; flags=1; // absolute seconds } @@ -1997,6 +2003,7 @@ //if(flags&2) pts*=(float)trak->length/(float)trak->timescale; //if(!(flags&1)) pts+=ds->pts; ds->pts=mov_seek_track(trak,pts,flags); + if (ds->pts < 0) ds->eof = 1; if (demuxer->video->id < 0) ((sh_audio_t*)ds->sh)->delay = ds->pts; }

1 0

CVS: main/libmpdemux demux_mpc.c,1.8,1.9
by syncmail＠mplayerhq.hu 27 Sep '05

27 Sep '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv17005 Modified Files: demux_mpc.c Log Message: Report total time Index: demux_mpc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- demux_mpc.c 6 Sep 2005 23:11:30 -0000 1.8 +++ demux_mpc.c 27 Sep 2005 19:04:10 -0000 1.9 @@ -23,6 +23,7 @@ float last_pts; uint32_t dword; int pos; + float length; } da_priv_t; extern void free_sh_audio(sh_audio_t* sh); @@ -70,6 +71,7 @@ } static demuxer_t *demux_mpc_open(demuxer_t* demuxer) { + float seconds = 0; stream_t *s = demuxer->stream; sh_audio_t* sh_audio; da_priv_t* priv = demuxer->priv; @@ -81,7 +83,6 @@ char *header = &wf[sizeof(WAVEFORMATEX)]; const int freqs[4] = {44100, 48000, 37800, 32000}; int frames; - int seconds; sh_audio->format = mmioFOURCC('M', 'P', 'C', ' '); memcpy(header, priv, HDR_SIZE); free(priv); @@ -92,8 +93,8 @@ sh_audio->wf->nSamplesPerSec = freqs[header[10] & 3]; sh_audio->wf->nBlockAlign = 32 * 36; sh_audio->wf->wBitsPerSample = 16; - seconds = 1152 * frames / sh_audio->wf->nSamplesPerSec; - if (demuxer->movi_end > demuxer->movi_start && seconds > 0) + seconds = 1152 * frames / (float)sh_audio->wf->nSamplesPerSec; + if (demuxer->movi_end > demuxer->movi_start && seconds > 1) sh_audio->wf->nAvgBytesPerSec = (demuxer->movi_end - demuxer->movi_start) / seconds; else sh_audio->wf->nAvgBytesPerSec = 32 * 1024; // dummy to make mencoder not hang @@ -104,6 +105,7 @@ priv = (da_priv_t *)malloc(sizeof(da_priv_t)); priv->last_pts = -1; + priv->length = seconds; priv->dword = 0; priv->pos = 0; stream_read(s, (void *)&priv->dword, 4); @@ -164,6 +166,17 @@ } static int demux_mpc_control(demuxer_t *demuxer,int cmd, void *arg){ + da_priv_t* priv = demuxer->priv; + switch (cmd) { + case DEMUXER_CTRL_GET_TIME_LENGTH: + if (priv->length < 1) return DEMUXER_CTRL_DONTKNOW; + *((double *)arg) = priv->length; + return DEMUXER_CTRL_OK; + case DEMUXER_CTRL_GET_PERCENT_POS: + if (priv->length < 1) return DEMUXER_CTRL_DONTKNOW; + *((int *)arg) = priv->last_pts * 100 / priv->length; + return DEMUXER_CTRL_OK; + } return DEMUXER_CTRL_NOTIMPL; }

1 0

CVS: main/libmpdemux demux_mov.c,1.130,1.131
by syncmail＠mplayerhq.hu 27 Sep '05

27 Sep '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv18266 Modified Files: demux_mov.c Log Message: Sanity-check codecdata_len, fixes crash in libfaad due to failed malloc for http://images.apple.com/movies/us/hd_gallery/gl1800/480p/the_brothers_grimm… Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- demux_mov.c 16 Sep 2005 11:05:29 -0000 1.130 +++ demux_mov.c 27 Sep 2005 11:21:13 -0000 1.131 @@ -662,6 +662,7 @@ // 32 char[4] atom type (fourc charater code -> esds) // 36 char[] atom data (len=size-8) +// TODO: fix parsing for files using version 2. trak->samplebytes=sh->samplesize=char2short(trak->stdata,18)/8; trak->nchannels=sh->channels=char2short(trak->stdata,16); /*printf("MOV: timescale: %d samplerate: %d durmap: %d (%d) -> %d (%d)\n", @@ -711,8 +712,10 @@ sh->codecdata = (unsigned char *)malloc(sh->codecdata_len); memcpy(sh->codecdata, &trak->stdata[52+char2int(trak->stdata,52)], sh->codecdata_len); } else { + if (len > 8 && len + 44 < trak->stdata_len) { sh->codecdata_len = len-8; sh->codecdata = trak->stdata+44+8; + } } } }

1 0