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

r22379 - trunk/TOOLS/checktree.sh
by ivo 28 Feb '07

28 Feb '07

Author: ivo Date: Wed Feb 28 15:55:34 2007 New Revision: 22379 Modified: trunk/TOOLS/checktree.sh Log: do not rely on svn internals and use svn info instead Modified: trunk/TOOLS/checktree.sh ============================================================================== --- trunk/TOOLS/checktree.sh (original) +++ trunk/TOOLS/checktree.sh Wed Feb 28 15:55:34 2007 @@ -79,26 +79,11 @@ all_filenames() { | grep -v "\.\#\|\~$\|\.depend\|\/\.svn\/\|config.mak\|^\./config\.h" \ | grep -v "^\./version\.h\|\.o$\|\.a$\|configure.log\|^\./help_mp.h" else - list_svn . + svn info -R | sed -n '/Path:/bb; :a; d; b; :b; s/Path: /.\//; h; :c; n; + /Node Kind:/bd; bc; :d; /directory/ba; g; p;' fi } -list_svn() { - tmpfiles=`sed '/name/ba; /kind/ba; d; b; - :a; s/^ *....=\"$.*$\".*$/\1/;' $1/.svn/entries | \ - sed '/$/N; s/\n/ /; / dir$/d; s/ file$//;'` - tmpdirs=`sed ' /name/ba; /kind/ba; d; b; - :a; s/^ *....=\"$.*$\".*$/\1/;' $1/.svn/entries | \ - sed ' /$/N; s/\n/ /; / file$/d; /^ dir$/d; s/ dir$//;'` - - for i in $tmpfiles; do - echo $1/$i - done - for j in $tmpdirs; do - list_svn $1/$j - done -} - # ----------------------------------------------------------------------------- # Parse command line @@ -125,8 +110,8 @@ for i in "$@"; do echo printoption "color " "colored output" "$_color" printoption "head " "print heading for each test" "$_head" - printoption "svn " "use .svn/ to determine which files to check"\ - "$_svn" + printoption "svn " + "use svn info to determine which files to check" "$_svn" echo -e "\nIf no files are specified, the whole tree is traversed." echo -e "If there are, -(no)svn has no effect.\n" exit

1 0

r22378 - trunk/etc/codecs.conf
by compn 28 Feb '07

28 Feb '07

Author: compn Date: Wed Feb 28 14:37:45 2007 New Revision: 22378 Modified: trunk/etc/codecs.conf Log: add comment about voxware on windows Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Wed Feb 28 14:37:45 2007 @@ -2861,6 +2861,7 @@ audiocodec ffadcpmswf audiocodec voxware info "VoxWare" status working + comment "windows users need msms001.vwp in windows\system32 folder" format 0x75 driver dshow dll "voxmsdec.ax" ; need also msms001.vwp

1 0

r22377 - trunk/TOOLS/checktree.sh
by ivo 28 Feb '07

28 Feb '07

Author: ivo Date: Wed Feb 28 12:50:23 2007 New Revision: 22377 Modified: trunk/TOOLS/checktree.sh Log: also respond to --help, -h and -? command line options Modified: trunk/TOOLS/checktree.sh ============================================================================== --- trunk/TOOLS/checktree.sh (original) +++ trunk/TOOLS/checktree.sh Wed Feb 28 12:50:23 2007 @@ -105,7 +105,7 @@ list_svn() { for i in "$@"; do case "$i" in - -help) + -help|--help|-h|-\?) echo -e "\n$0 [options] [files]\n" echo -e "options:\n" printoption "spaces " "test for spaces in filenames" "$_spaces"

1 0

r22375 - trunk/TOOLS/checktree.sh
by ivo 28 Feb '07

28 Feb '07

Author: ivo Date: Wed Feb 28 12:46:53 2007 New Revision: 22375 Modified: trunk/TOOLS/checktree.sh Log: clarify -none command line option Modified: trunk/TOOLS/checktree.sh ============================================================================== --- trunk/TOOLS/checktree.sh (original) +++ trunk/TOOLS/checktree.sh Wed Feb 28 12:46:53 2007 @@ -118,6 +118,7 @@ for i in "$@"; do printoption "stupid " "test for stupid code" "$_stupid" echo printoption "all " "enable all tests" "no" + echo " (-noall can be specified as -none)" echo printoption "showcont " "show offending content of file(s)" \ "$_showcont"

1 0

r22374 - trunk/m_option.c
by gpoirier 28 Feb '07

28 Feb '07

Author: gpoirier Date: Wed Feb 28 10:18:42 2007 New Revision: 22374 Modified: trunk/m_option.c Log: remove C99-ism (mixed declaration and code), 10l to Uoti Urpala for breaking GCC-2.95 support yet again even though any post-2.95 GCC version print a clear warning about it Patch by Carl Eugen Hoyos % cehoyos A ag P or P at % Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c (original) +++ trunk/m_option.c Wed Feb 28 10:18:42 2007 @@ -1204,10 +1204,12 @@ static double parse_timestring(char *str static int parse_time(m_option_t* opt,char *name, char *param, void* dst, int src) { + double time; + if (param == NULL || strlen(param) == 0) return M_OPT_MISSING_PARAM; - double time = parse_timestring(param); + time = parse_timestring(param); if (time == -1e100) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: invalid time: '%s'\n", name,param);

1 0

r22373 - trunk/libmpdemux/demux_rtp.cpp
by nicodvb 27 Feb '07

27 Feb '07

Author: nicodvb Date: Tue Feb 27 23:25:00 2007 New Revision: 22373 Modified: trunk/libmpdemux/demux_rtp.cpp Log: implementation of DEMUXER_CTRL_GET_TIME_LENGTH and DEMUXER_CTRL_GET_PERCENT_POS; patch by the usual Hoyos Modified: trunk/libmpdemux/demux_rtp.cpp ============================================================================== --- trunk/libmpdemux/demux_rtp.cpp (original) +++ trunk/libmpdemux/demux_rtp.cpp Tue Feb 27 23:25:00 2007 @@ -581,6 +581,26 @@ demux_packet_t* ReadBufferQueue::getPend return dp; } +static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg) { + double endpts = ((RTPState*)demuxer->priv)->mediaSession->playEndTime(); + + switch(cmd) { + case DEMUXER_CTRL_GET_TIME_LENGTH: + if (endpts <= 0) + return DEMUXER_CTRL_DONTKNOW; + *((double *)arg) = endpts; + return DEMUXER_CTRL_OK; + + case DEMUXER_CTRL_GET_PERCENT_POS: + if (endpts <= 0) + return DEMUXER_CTRL_DONTKNOW; + *((int *)arg) = (int)(((RTPState*)demuxer->priv)->videoBufferQueue->prevPacketPTS*100/endpts); + return DEMUXER_CTRL_OK; + + default: + return DEMUXER_CTRL_NOTIMPL; + } +} demuxer_desc_t demuxer_desc_rtp = { "LIVE555 RTP demuxer", @@ -595,5 +615,5 @@ demuxer_desc_t demuxer_desc_rtp = { demux_open_rtp, demux_close_rtp, NULL, - NULL + demux_rtp_control };

1 0

r22372 - trunk/libmpdemux/demux_rtp_codec.cpp
by nicodvb 27 Feb '07

27 Feb '07

Author: nicodvb Date: Tue Feb 27 22:20:24 2007 New Revision: 22372 Modified: trunk/libmpdemux/demux_rtp_codec.cpp Log: assign missing frametime as 1.0/fps; patch by Carl Eigen Hoyos Modified: trunk/libmpdemux/demux_rtp_codec.cpp ============================================================================== --- trunk/libmpdemux/demux_rtp_codec.cpp (original) +++ trunk/libmpdemux/demux_rtp_codec.cpp Tue Feb 27 22:20:24 2007 @@ -279,6 +279,7 @@ static void needVideoFrameRate(demuxer_t int fps = (int)(subsession->videoFPS()); if (fps != 0) { sh_video->fps = fps; + sh_video->frametime = 1.0f/fps; return; }

1 0

r22371 - trunk/libmpdemux/demux_rtp.cpp
by nicodvb 27 Feb '07

27 Feb '07

Author: nicodvb Date: Tue Feb 27 22:16:54 2007 New Revision: 22371 Modified: trunk/libmpdemux/demux_rtp.cpp Log: 1000l, removed code that messed with the internals of demux_packet_t (but there's still more); patch by C.E.Hoyos fixed by me Modified: trunk/libmpdemux/demux_rtp.cpp ============================================================================== --- trunk/libmpdemux/demux_rtp.cpp (original) +++ trunk/libmpdemux/demux_rtp.cpp Tue Feb 27 22:16:54 2007 @@ -348,7 +348,6 @@ Boolean insertRTPData(demuxer_t* demuxer // Copy our data into the buffer, and save it: memmove(dp->buffer, data, dataLen); - dp->len = dataLen; dp->pts = 0; bufferQueue->savePendingBuffer(dp); return True; @@ -402,7 +401,7 @@ static void afterReading(void* clientDat if (frameSize > 0) demuxer->stream->eof = 0; demux_packet_t* dp = bufferQueue->dp; - dp->len = frameSize; + resize_demux_packet(dp, frameSize); // Set the packet's presentation time stamp, depending on whether or // not our RTP source's timestamps have been synchronized yet:

1 0

r22370 - in trunk/libmpdemux: demux_mpg.c demux_ts.c
by nicodvb 27 Feb '07

27 Feb '07

Author: nicodvb Date: Tue Feb 27 21:22:05 2007 New Revision: 22370 Modified: trunk/libmpdemux/demux_mpg.c trunk/libmpdemux/demux_ts.c Log: removed duplicated code in demux_seek(); stream_seek() already aligns to STREAM_BUFFER_SIZE boundary Modified: trunk/libmpdemux/demux_mpg.c ============================================================================== --- trunk/libmpdemux/demux_mpg.c (original) +++ trunk/libmpdemux/demux_mpg.c Tue Feb 27 21:22:05 2007 @@ -892,11 +892,6 @@ void demux_seek_mpg(demuxer_t *demuxer,f if(newpos<demuxer->movi_start) newpos=demuxer->movi_start; } -#ifdef _LARGEFILE_SOURCE - newpos&=~((long long)STREAM_BUFFER_SIZE-1); /* sector boundary */ -#else - newpos&=~(STREAM_BUFFER_SIZE-1); /* sector boundary */ -#endif stream_seek(demuxer->stream,newpos); // re-sync video: Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c (original) +++ trunk/libmpdemux/demux_ts.c Tue Feb 27 21:22:05 2007 @@ -3111,12 +3111,6 @@ static void demux_seek_ts(demuxer_t *dem if(newpos < demuxer->movi_start) newpos = demuxer->movi_start; //begininng of stream -#ifdef _LARGEFILE_SOURCE - newpos &= ~((long long) (STREAM_BUFFER_SIZE - 1)); /* sector boundary */ -#else - newpos &= ~(STREAM_BUFFER_SIZE - 1); /* sector boundary */ -#endif - stream_seek(demuxer->stream, newpos); for(i = 0; i < 8192; i++) if(priv->ts.pids[i] != NULL)

1 0

r22369 - trunk/libmpdemux/demux_mpg.c
by nicodvb 27 Feb '07

27 Feb '07

Author: nicodvb Date: Tue Feb 27 21:15:31 2007 New Revision: 22369 Modified: trunk/libmpdemux/demux_mpg.c Log: 100000l: average != semidistance, fixed seeking to the middle position; patch by Zuxy meng (zuxy.megn gmail com) Modified: trunk/libmpdemux/demux_mpg.c ============================================================================== --- trunk/libmpdemux/demux_mpg.c (original) +++ trunk/libmpdemux/demux_mpg.c Tue Feb 27 21:15:31 2007 @@ -195,7 +195,7 @@ static demuxer_t* demux_mpg_open(demuxer float first_pts = read_first_mpeg_pts_at_position(demuxer, demuxer->movi_start); if(first_pts != -1.0) { - float middle_pts = read_first_mpeg_pts_at_position(demuxer, (demuxer->movi_end - demuxer->movi_start)/2); + float middle_pts = read_first_mpeg_pts_at_position(demuxer, (demuxer->movi_end + demuxer->movi_start)/2); if(middle_pts != -1.0) { float final_pts = read_first_mpeg_pts_at_position(demuxer, demuxer->movi_end - TIMESTAMP_PROBE_LEN);

1 0