October 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r32568 - trunk/libvo/vo_directx.c
by reimar 30 Oct '10

30 Oct '10

Author: reimar Date: Sat Oct 30 17:29:20 2010 New Revision: 32568 Log: Fix possible out-of-bounds access. Modified: trunk/libvo/vo_directx.c Modified: trunk/libvo/vo_directx.c ============================================================================== --- trunk/libvo/vo_directx.c Sat Oct 30 12:15:13 2010 (r32567) +++ trunk/libvo/vo_directx.c Sat Oct 30 17:29:20 2010 (r32568) @@ -229,11 +229,11 @@ static uint32_t Directx_CreateOverlay(ui HRESULT ddrval; DDSURFACEDESC2 ddsdOverlay; uint32_t i=0; - while ( i < NUM_FORMATS +1 && imgfmt != g_ddpf[i].img_format) + while ( i < NUM_FORMATS && imgfmt != g_ddpf[i].img_format) { i++; } - if (!g_lpdd || !g_lpddsPrimary) + if (!g_lpdd || !g_lpddsPrimary || i == NUM_FORMATS) return 1; //cleanup if (g_lpddsOverlay)g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay);

1 0

r32566 - in trunk: DOCS/man/en/mplayer.1 libmpcodecs/ve_xvid4.c
by cigaes 29 Oct '10

29 Oct '10

Author: cigaes Date: Fri Oct 29 15:54:42 2010 New Revision: 32566 Log: Support for -force-key-frames for ve_xvid4. Modified: trunk/libmpcodecs/ve_xvid4.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/libmpcodecs/ve_xvid4.c ============================================================================== --- trunk/libmpcodecs/ve_xvid4.c Fri Oct 29 15:53:16 2010 (r32565) +++ trunk/libmpcodecs/ve_xvid4.c Fri Oct 29 15:54:42 2010 (r32566) @@ -46,6 +46,7 @@ #include "img_format.h" #include "mp_image.h" +#include "ve.h" #include "vf.h" #include <xvid.h> @@ -536,6 +537,9 @@ put_image(struct vf_instance *vf, mp_ima if(set_frame_struct(mod, mpi) == BAD) return BAD; + mod->frame.type = is_forced_key_frame(pts) || xvidenc_motion == 0 ? + XVID_TYPE_IVOP : XVID_TYPE_AUTO; + /* ------------------------------------------------------------------- * Encode the frame * ---------------------------------------------------------------- */

1 0

r32565 - in trunk: DOCS/man/en/mplayer.1 libmpcodecs/ve_x264.c
by cigaes 29 Oct '10

29 Oct '10

Author: cigaes Date: Fri Oct 29 15:53:16 2010 New Revision: 32565 Log: Support for -force-key-frames for ve_x264. Modified: trunk/libmpcodecs/ve_x264.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/libmpcodecs/ve_x264.c ============================================================================== --- trunk/libmpcodecs/ve_x264.c Fri Oct 29 15:52:26 2010 (r32564) +++ trunk/libmpcodecs/ve_x264.c Fri Oct 29 15:53:16 2010 (r32565) @@ -45,6 +45,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" +#include "ve.h" #include "ve_x264.h" #include <x264.h> @@ -244,6 +245,8 @@ static int put_image(struct vf_instance } mod->pic.i_type = X264_TYPE_AUTO; + if (is_forced_key_frame(pts)) + mod->pic.i_type = X264_TYPE_KEYFRAME; return encode_frame(vf, &mod->pic) >= 0; }

1 0

r32564 - in trunk: DOCS/man/en/mplayer.1 libmpcodecs/ve_lavc.c
by cigaes 29 Oct '10

29 Oct '10

Author: cigaes Date: Fri Oct 29 15:52:26 2010 New Revision: 32564 Log: Support for -force-key-frames for ve_lavc. Modified: trunk/libmpcodecs/ve_lavc.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Fri Oct 29 15:50:05 2010 (r32563) +++ trunk/libmpcodecs/ve_lavc.c Fri Oct 29 15:52:26 2010 (r32564) @@ -45,6 +45,7 @@ #include "img_format.h" #include "fmt-conversion.h" #include "mp_image.h" +#include "ve.h" #include "vf.h" #include "vd_ffmpeg.h" @@ -772,6 +773,7 @@ static int put_image(struct vf_instance pic->linesize[0]=mpi->stride[0]; pic->linesize[1]=mpi->stride[1]; pic->linesize[2]=mpi->stride[2]; + pic->pict_type = is_forced_key_frame(pts) ? FF_I_TYPE : 0; if(lavc_param_interlaced_dct){ if((mpi->fields & MP_IMGFIELD_ORDERED) && (mpi->fields & MP_IMGFIELD_INTERLACED))

1 0

r32563 - in trunk: Changelog DOCS/man/en/mplayer.1 cfg-mencoder.h libmpcodecs/ve.c libmpcodecs/ve.h
by cigaes 29 Oct '10

29 Oct '10

Author: cigaes Date: Fri Oct 29 15:50:05 2010 New Revision: 32563 Log: Add the -force-key-frames option. Modified: trunk/Changelog trunk/cfg-mencoder.h trunk/libmpcodecs/ve.c trunk/libmpcodecs/ve.h Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Fri Oct 29 15:48:12 2010 (r32562) +++ trunk/Changelog Fri Oct 29 15:50:05 2010 (r32563) @@ -8,6 +8,9 @@ MPlayer (1.0) * experimental support for PGS (BluRay-compatible), DVB and XSUB subtitles. * experimental af_cmdline slave command to change e.g. audio equalizer options at runtime. + MEncoder: + * -force-key-frames option to set explicit seek points. + rc4: "Yes We Can" GUI: Changes towards removing the GUI Modified: trunk/cfg-mencoder.h ============================================================================== --- trunk/cfg-mencoder.h Fri Oct 29 15:48:12 2010 (r32562) +++ trunk/cfg-mencoder.h Fri Oct 29 15:50:05 2010 (r32563) @@ -220,6 +220,8 @@ const m_option_t mencoder_opts[]={ // info header strings {"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"force-key-frames", parse_forced_key_frames, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL}, + #ifdef CONFIG_MP3LAME {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif Modified: trunk/libmpcodecs/ve.c ============================================================================== --- trunk/libmpcodecs/ve.c Fri Oct 29 15:48:12 2010 (r32562) +++ trunk/libmpcodecs/ve.c Fri Oct 29 15:50:05 2010 (r32563) @@ -26,6 +26,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" +#include "ve.h" extern const vf_info_t ve_info_lavc; extern const vf_info_t ve_info_vfw; @@ -73,3 +74,56 @@ vf_instance_t* vf_open_encoder(vf_instan char* vf_args[] = { "_oldargs_", args, NULL }; return vf_open_plugin(encoder_list,next,name,vf_args); } + +static double *forced_key_frames_ts; +static int forced_key_frames_number; +static int forced_key_frames_idx; + +int parse_forced_key_frames(const m_option_t *opt, const char *arg) +{ + double ts; + const char *p; + int nts = 1, idx = 0, len; + + for (p = arg; *p; p++) + nts += *p == ','; + free(forced_key_frames_ts); + forced_key_frames_ts = calloc(sizeof(*forced_key_frames_ts), nts); + p = arg; + while (1) { + len = parse_timestring(p, &ts, ','); + if (!len) { + mp_msg(MSGT_CFGPARSER, MSGL_ERR, + "Option force-key-frames: invalid time: '%s'\n", p); + return M_OPT_INVALID; + } + forced_key_frames_ts[idx++] = ts; + if (!p[len]) + break; + p += len + 1; + } + forced_key_frames_number = idx; + forced_key_frames_idx = 0; + for (idx = 1; idx < forced_key_frames_number; idx++) { + if (forced_key_frames_ts[idx - 1] >= forced_key_frames_ts[idx]) { + mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option force-key-frames: " + "timestamps are not in ascending order\n"); + return M_OPT_INVALID; + } + } + return 0; +} + +int is_forced_key_frame(double pts) +{ + if (forced_key_frames_idx < forced_key_frames_number && + pts >= forced_key_frames_ts[forced_key_frames_idx]) { + forced_key_frames_idx++; + if (forced_key_frames_idx >= forced_key_frames_number) { + free(forced_key_frames_ts); + forced_key_frames_number = 0; + } + return 1; + } + return 0; +} Modified: trunk/libmpcodecs/ve.h ============================================================================== --- trunk/libmpcodecs/ve.h Fri Oct 29 15:48:12 2010 (r32562) +++ trunk/libmpcodecs/ve.h Fri Oct 29 15:50:05 2010 (r32563) @@ -31,4 +31,7 @@ extern int lavc_param_abitrate; extern int lavc_param_atag; extern int lavc_param_audio_global_header; +int parse_forced_key_frames(const m_option_t *opt, const char *arg); +int is_forced_key_frame(double pts); + #endif /* MPLAYER_VE_H */

1 0

r32561 - trunk/TOOLS/binary_codecs.sh
by siretart 28 Oct '10

28 Oct '10

Author: siretart Date: Thu Oct 28 10:12:26 2010 New Revision: 32561 Log: make indentation consistent (no content changes) Modified: trunk/TOOLS/binary_codecs.sh Modified: trunk/TOOLS/binary_codecs.sh ============================================================================== --- trunk/TOOLS/binary_codecs.sh Thu Oct 28 09:29:02 2010 (r32560) +++ trunk/TOOLS/binary_codecs.sh Thu Oct 28 10:12:26 2010 (r32561) @@ -20,117 +20,112 @@ dpkgarch=$(dpkg --print-architecture) cd $CODECDIR [ -d mplayer_binary_codecs ] || mkdir -v mplayer_binary_codecs - choosemirror () { - cd $PREFDIR + cd $PREFDIR - #if [ ! -r mirrors ] || find mirrors -mtime +20 ; then + #if [ ! -r mirrors ] || find mirrors -mtime +20 ; then echo "Downloading mirrors list" wget -nv -c -N $MYSITE/mirrors || true - #fi - if [ ! -r bestsites ] || [ mirrors -nt bestsites ] || \ - find bestsites -mtime +20 | grep -q bestsites ; then - if which netselect > /dev/null ; then - echo Choosing best mirrors using netselect - netselect -s 5 -t 5 $( cat mirrors ) | awk '{print $2}' > bestsites - elif which fping > /dev/null ; then - fping -C 1 $( sed 's#.*//##;s#/.*##' mirrors ) 2>&1 | \ - egrep -v 'bytes.*loss' | sort -n -k3 | \ - grep -v ': *-' | awk '/:/{print $1}' | head -5 | ( while read mainsite ; do - grep $mainsite $PREFDIR/mirrors ; done ) > bestsites - else - echo "(If you install 'netselect' or 'fping', it will select the best mirror for you" - echo " you may wish to stop this script and rerun after installation)" - sleep 3 + #fi + if [ ! -r bestsites ] || [ mirrors -nt bestsites ] || \ + find bestsites -mtime +20 | grep -q bestsites ; then + if which netselect > /dev/null ; then + echo Choosing best mirrors using netselect + netselect -s 5 -t 5 $( cat mirrors ) | awk '{print $2}' > bestsites + elif which fping > /dev/null ; then + fping -C 1 $( sed 's#.*//##;s#/.*##' mirrors ) 2>&1 | \ + egrep -v 'bytes.*loss' | sort -n -k3 | \ + grep -v ': *-' | awk '/:/{print $1}' | head -5 | ( while read mainsite ; do + grep $mainsite $PREFDIR/mirrors ; done ) > bestsites + else + echo "(If you install 'netselect' or 'fping', it will select the best mirror for you" + echo " you may wish to stop this script and rerun after installation)" + sleep 3 + fi fi - fi } - - INSTALL () { - filename="$3" - dir="$2" - url="$1" + filename="$3" + dir="$2" + url="$1" - cd $CODECDIR/mplayer_binary_codecs + cd $CODECDIR/mplayer_binary_codecs - if [ -r $filename ] ; then - cp $filename $filename.bak - fi + if [ -r $filename ] ; then + cp $filename $filename.bak + fi - if [ "$url" = @MAINSITE@ ] ; then - list=$PREFDIR/bestsites - test -r $list || list=$PREFDIR/mirrors - cat $list | while read mainsite ; do - echo Downloading $filename from $mainsite ... - wget -c -N $mainsite/$dir/$filename || true - if [ -r "$filename" ] ; then - UNPACK "$filename" - return 0 - fi - done - else - wget -c -N $url/$dir/$filename || true - if [ -r "$filename" ] ; then - UNPACK "$filename" - return 0 + if [ "$url" = @MAINSITE@ ] ; then + list=$PREFDIR/bestsites + test -r $list || list=$PREFDIR/mirrors + cat $list | while read mainsite ; do + echo Downloading $filename from $mainsite ... + wget -c -N $mainsite/$dir/$filename || true + if [ -r "$filename" ] ; then + UNPACK "$filename" + return 0 + fi + done + else + wget -c -N $url/$dir/$filename || true + if [ -r "$filename" ] ; then + UNPACK "$filename" + return 0 + fi fi - fi } - - UNPACK () { - filename="$1" - if [ -r $filename.bak ] && cmp $filename.bak $filename && [ -r $filename.list ] ; then - echo It appears that $filename was already succesfully installed - [ -r $filename.bak ] && rm $filename.bak - else - if grep -q " $filename$" $PREFDIR/MD5SUMS ; then - echo Checking MD5 for $filename - grep " $filename$" $PREFDIR/MD5SUMS | md5sum -c - + filename="$1" + if [ -r $filename.bak ] && cmp $filename.bak $filename && [ -r $filename.list ] ; then + echo It appears that $filename was already succesfully installed + [ -r $filename.bak ] && rm $filename.bak else - echo Warning: no MD5 for $filename were found. Hit enter to continue. - read dummy - fi - echo Installing $filename ... - if [ -r $filename.list ] ; then - tr '\n' '\000' < $filename.list | xargs -r0 rm || true - UNLINK $filename.list - rm $filename.list - fi + if grep -q " $filename$" $PREFDIR/MD5SUMS ; then + echo Checking MD5 for $filename + grep " $filename$" $PREFDIR/MD5SUMS | md5sum -c - + else + echo Warning: no MD5 for $filename were found. Hit enter to continue. + read dummy + fi + echo Installing $filename ... + if [ -r $filename.list ] ; then + tr '\n' '\000' < $filename.list | xargs -r0 rm || true + UNLINK $filename.list + rm $filename.list + fi - tarfail () { echo FAILED $filename ; rm $filename.list ; exit 1 ; } + tarfail () { echo FAILED $filename ; rm $filename.list ; exit 1 ; } - case "$filename" in - *.tar.gz) - tar xvzf $filename > $filename.list || tarfail + case "$filename" in + *.tar.gz) + tar xvzf $filename > $filename.list || tarfail #rm $filename - ;; - *.tgz) - tar xvzf $filename > $filename.list || tarfail + ;; + *.tgz) + tar xvzf $filename > $filename.list || tarfail #rm $filename - ;; - *.tar.bz2) - tar --bzip2 -xvf $filename > $filename.list || tarfail + ;; + *.tar.bz2) + tar --bzip2 -xvf $filename > $filename.list || tarfail #rm $filename - ;; - esac - [ -r $filename.bak ] && rm $filename.bak - LINK $filename.list - echo "Installed $filename Succesfully!" - fi + ;; + esac + [ -r $filename.bak ] && rm $filename.bak + LINK $filename.list + echo "Installed $filename Succesfully!" + fi } LINK () { - cd $CODECDIR/ - cat $CODECDIR/mplayer_binary_codecs/$1 | while read f ; do - ln -sbf mplayer_binary_codecs/"$f" . - done + cd $CODECDIR/ + cat $CODECDIR/mplayer_binary_codecs/$1 | while read f ; do + ln -sbf mplayer_binary_codecs/"$f" . + done } UNLINK () { @@ -139,88 +134,86 @@ UNLINK () { # cat $CODECDIR/mplayer_binary_codecs/$1 | while f do # ln -sbf mplayer_binary_codecs/"$f" # done - if which symlinks > /dev/null ; then - symlinks -d $CODECDIR - fi + if which symlinks > /dev/null ; then + symlinks -d $CODECDIR + fi } if [ `whoami` != root ]; then - echo "You must be 'root' to use this script. Login as root first!" - exit 1 + echo "You must be 'root' to use this script. Login as root first!" + exit 1 fi case "$1" in - install) + install) if test -x /bin/bzip2 || test -x /usr/bin/bzip2 ; then : ; else - echo You need to install bzip2 - exit 1 + echo You need to install bzip2 + exit 1 fi choosemirror cd $PREFDIR #if [ ! -r codecs_list ] || find codecs_list -mtime +20 ; then - echo "Getting codecs list" - wget -nv -c -N $MYSITE/codecs_list || true + echo "Getting codecs list" + wget -nv -c -N $MYSITE/codecs_list || true #fi cd $PREFDIR echo Downloading MD5 sums from main site [ -r MD5SUMS ] && mv MD5SUMS MD5SUMS.bak if wget -nv -N http://www.mplayerhq.hu/MPlayer/releases/codecs/MD5SUMS ; then - [ -r MD5SUMS.bak ] && rm MD5SUMS.bak + [ -r MD5SUMS.bak ] && rm MD5SUMS.bak else - echo "failed" - if [ -r MD5SUMS.bak ] ; then - echo "trying to use backup" - mv MD5SUMS.bak MD5SUMS - fi + echo "failed" + if [ -r MD5SUMS.bak ] ; then + echo "trying to use backup" + mv MD5SUMS.bak MD5SUMS + fi fi if grep -q "^$dpkgarch" $PREFDIR/codecs_list ; then - egrep -v "^[[:space:]]*(#|$)" $PREFDIR/codecs_list | \ - while read arch url dir file info ; do - if [ "$dpkgarch" = "$arch" ]; then - echo Downloading and installing $file $info... - INSTALL "$url" "$dir" "$file" - fi + egrep -v "^[[:space:]]*(#|$)" $PREFDIR/codecs_list | \ + while read arch url dir file info ; do + if [ "$dpkgarch" = "$arch" ]; then + echo Downloading and installing $file $info... + INSTALL "$url" "$dir" "$file" + fi done - needlibstd=no - test "$dpkgarch" = "powerpc" && needlibstd=yes - test "$dpkgarch" = "i386" && needlibstd=yes - if test "$needlibstd" = "yes" && ! test -r /usr/lib/libstdc++.so.5 ; then - echo "Warning: you need to install libstdc++ 5 libraries" - echo -n "Do it now? " - read R - case $R in - y*) apt-get install libstdc++5 ;; - *) echo "If you change your mind, use the command" - echo " apt-get install libstdc++5" ;; - esac - fi - else - echo "Sorry, no codecs for your arch '$dpkgarch'. Sorry dude :(" - exit 1 - fi - ;; - - uninstall) - cd $CODECDIR/ - rm -rf mplayer_binary_codecs - #FIXME we need a better clean system - if which symlinks > /dev/null ; then - symlinks -d . + needlibstd=no + test "$dpkgarch" = "powerpc" && needlibstd=yes + test "$dpkgarch" = "i386" && needlibstd=yes + if test "$needlibstd" = "yes" && ! test -r /usr/lib/libstdc++.so.5 ; then + echo "Warning: you need to install libstdc++ 5 libraries" + echo -n "Do it now? " + read R + case $R in + y*) apt-get install libstdc++5 ;; + *) echo "If you change your mind, use the command" + echo " apt-get install libstdc++5" ;; + esac + fi else - echo "please install the package 'symlinks' and run 'symlinks -d $CODECDIR' " + echo "Sorry, no codecs for your arch '$dpkgarch'. Sorry dude :(" + exit 1 fi - echo "Uninstalled Succesfully!" ;; - *) - echo "Usage: {install|uninstall}" - echo "This program will install binary codecs for MPlayer." - exit 1 - ;; + uninstall) + cd $CODECDIR/ + rm -rf mplayer_binary_codecs + #FIXME we need a better clean system + if which symlinks > /dev/null ; then + symlinks -d . + else + echo "please install the package 'symlinks' and run 'symlinks -d $CODECDIR' " + fi + echo "Uninstalled Succesfully!" + ;; + *) + echo "Usage: {install|uninstall}" + echo "This program will install binary codecs for MPlayer." + exit 1 + ;; esac - exit 0

1 0

[propchange]: r32532 - svn:log
by diego 28 Oct '10

28 Oct '10

Author: diego Revision: 32532 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,3 @@ -Fix Italian translation. +Fix Italian translation of MSGTR_OSDCapturingFailure. Patch by Giorgio Vazzana, mywing81 gmail

1 0

r32560 - trunk/DOCS/tech/release-howto.txt
by diego 28 Oct '10

28 Oct '10

Author: diego Date: Thu Oct 28 09:29:02 2010 New Revision: 32560 Log: Update release instructions to be more in line with current practice. Modified: trunk/DOCS/tech/release-howto.txt Modified: trunk/DOCS/tech/release-howto.txt ============================================================================== --- trunk/DOCS/tech/release-howto.txt Wed Oct 27 21:04:04 2010 (r32559) +++ trunk/DOCS/tech/release-howto.txt Thu Oct 28 09:29:02 2010 (r32560) @@ -2,15 +2,11 @@ How to make an MPlayer release ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ preparations: -- Announce release target date on dev-eng and #mplayerdev -- Ask the DOCS maintainers to commit their final changes, check if - all docs are up to date, etc. -- Verify man page, remove obsolete options, mention new ones. -- Ask translation maintainers to update their help_mp*.h file. -- Update the ChangeLog file (according to Subversion log), ask other developers - to verify their parts, etc. Ask Diego to spellcheck it. -- Consult at -dev-eng about unstable parts of the code which should be - disabled for the release. +- Announce the intent to create a release branch on mailing lists and IRC. +- Ask translators to get their languages synchronized. +- Update the Changelog. +- Identify regressions or other serious issues, fix or revert (on the branch) + as needed so the release is of good quality. - Find a codename for the release create the release tree: @@ -39,21 +35,17 @@ test it (download to your local machine, copy to FTP: cp MPlayer-0.90rc5.tar.bz2 /home/ftp/MPlayer/releases/ - cp ChangeLog-0.90rc5 and update ChangeLog symlink + cp Changelog-0.90rc5 and update Changelog symlink md5sum MPlayer-0.90rc5.tar.bz2 > MPlayer-0.90rc5.tar.bz2.md5 -move the older (pre)release(s) (except the last one before the current one) -to ../OLD_stuff/ dir - -Somehow get Diego to write a news entry for the release, and update the -source file of dload.html and commit it. Test it, it's sometimes buggy -(broken links etc). Also, update translated versions of dload.html. +Write a news entry for the release, update the links in dload.html. Test it, +sometimes links are broken. Do not forget the translations. -Send a message to mplayer-announce mailing list. +Send the release notes as a mail to the mplayer-announce mailing list. Add the new release version to bugzilla page. -Update release version in #mplayer topic +Update release version in #mplayer and #mplayerdev topics. Update project page on Freshmeat

1 0

[propchange]: r32555 - svn:log
by diego 27 Oct '10

27 Oct '10

Author: diego Revision: 32555 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Remove som irrelevant commented-out code. +Remove some irrelevant commented-out code.

1 0

r32559 - in trunk/stream: cache2.c stream.c stream.h
by reimar 27 Oct '10

27 Oct '10

Author: reimar Date: Wed Oct 27 21:04:04 2010 New Revision: 32559 Log: Add internal read and seek function to avoid a useless memcpy when using the cache. Modified: trunk/stream/cache2.c trunk/stream/stream.c trunk/stream/stream.h Modified: trunk/stream/cache2.c ============================================================================== --- trunk/stream/cache2.c Wed Oct 27 20:38:39 2010 (r32558) +++ trunk/stream/cache2.c Wed Oct 27 21:04:04 2010 (r32559) @@ -182,7 +182,7 @@ static int cache_fill(cache_vars_t *s) s->offset= // FIXME!? s->min_filepos=s->max_filepos=read; // drop cache content :( if(s->stream->eof) stream_reset(s->stream); - stream_seek(s->stream,read); + stream_seek_internal(s->stream,read); mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%"PRIX64" \n",(int64_t)stream_tell(s->stream)); } } @@ -224,7 +224,7 @@ static int cache_fill(cache_vars_t *s) s->min_filepos=read-back; // avoid seeking-back to temp area... #endif - len=stream_read(s->stream,&s->buffer[pos],space); + len = stream_read_internal(s->stream, &s->buffer[pos], space); s->eof= !len; s->max_filepos+=len; Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c Wed Oct 27 20:38:39 2010 (r32558) +++ trunk/stream/stream.c Wed Oct 27 21:04:04 2010 (r32559) @@ -280,36 +280,43 @@ void stream_capture_do(stream_t *s) } } -int stream_fill_buffer(stream_t *s){ - int len; +int stream_read_internal(stream_t *s, void *buf, int len) +{ // we will retry even if we already reached EOF previously. switch(s->type){ case STREAMTYPE_STREAM: #ifdef CONFIG_NETWORKING if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { - len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl); + len=s->streaming_ctrl->streaming_read(s->fd, buf, len, s->streaming_ctrl); } else #endif if (s->fill_buffer) - len = s->fill_buffer(s, s->buffer, STREAM_BUFFER_SIZE); + len = s->fill_buffer(s, buf, len); else - len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); + len = read(s->fd, buf, len); break; case STREAMTYPE_DS: - len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); + len = demux_read_data((demux_stream_t*)s->priv, buf, len); break; default: - len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0; + len= s->fill_buffer ? s->fill_buffer(s, buf, len) : 0; } if(len<=0){ s->eof=1; return 0; } // When reading succeeded we are obviously not at eof. // This e.g. avoids issues with eof getting stuck when lavf seeks in MPEG-TS s->eof=0; + s->pos+=len; + return len; +} + +int stream_fill_buffer(stream_t *s){ + int len = stream_read_internal(s, s->buffer, STREAM_BUFFER_SIZE); + if (len <= 0) + return 0; s->buf_pos=0; s->buf_len=len; - s->pos+=len; // printf("[%d]",len);fflush(stdout); if (s->capture_file) stream_capture_do(s); @@ -327,30 +334,8 @@ int stream_write_buffer(stream_t *s, uns return rd; } -int stream_seek_long(stream_t *s,off_t pos){ -off_t newpos=0; - -// if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ) printf("seek_long to 0x%X\n",(unsigned int)pos); - - s->buf_pos=s->buf_len=0; - - if(s->mode == STREAM_WRITE) { - if(!s->seek || !s->seek(s,pos)) - return 0; - return 1; - } - - if(s->sector_size) - newpos = (pos/s->sector_size)*s->sector_size; - else - newpos = pos&(~((off_t)STREAM_BUFFER_SIZE-1)); - -if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ){ - mp_msg(MSGT_STREAM,MSGL_DBG3, "s->pos=%"PRIX64" newpos=%"PRIX64" new_bufpos=%"PRIX64" buflen=%X \n", - (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len); -} - pos-=newpos; - +int stream_seek_internal(stream_t *s, off_t newpos) +{ if(newpos==0 || newpos!=s->pos){ switch(s->type){ case STREAMTYPE_STREAM: @@ -368,7 +353,7 @@ if(newpos==0 || newpos!=s->pos){ } if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { - if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) { + if( s->streaming_ctrl->streaming_seek( s->fd, newpos, s->streaming_ctrl )<0 ) { mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); return 1; } @@ -379,9 +364,6 @@ if(newpos==0 || newpos!=s->pos){ mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); return 1; } - while(s->pos<newpos){ - if(stream_fill_buffer(s)<=0) break; // EOF - } break; default: // This should at the beginning as soon as all streams are converted @@ -397,6 +379,41 @@ if(newpos==0 || newpos!=s->pos){ //} else { // putchar('%');fflush(stdout); } + return -1; +} + +int stream_seek_long(stream_t *s,off_t pos){ + int res; +off_t newpos=0; + +// if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ) printf("seek_long to 0x%X\n",(unsigned int)pos); + + s->buf_pos=s->buf_len=0; + + if(s->mode == STREAM_WRITE) { + if(!s->seek || !s->seek(s,pos)) + return 0; + return 1; + } + + if(s->sector_size) + newpos = (pos/s->sector_size)*s->sector_size; + else + newpos = pos&(~((off_t)STREAM_BUFFER_SIZE-1)); + +if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ){ + mp_msg(MSGT_STREAM,MSGL_DBG3, "s->pos=%"PRIX64" newpos=%"PRIX64" new_bufpos=%"PRIX64" buflen=%X \n", + (int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len); +} + pos-=newpos; + + res = stream_seek_internal(s, newpos); + if (res >= 0) + return res; + + while(s->pos<newpos){ + if(stream_fill_buffer(s)<=0) break; // EOF + } while(stream_fill_buffer(s) > 0 && pos >= 0) { if(pos<=s->buf_len){ Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Wed Oct 27 20:38:39 2010 (r32558) +++ trunk/stream/stream.h Wed Oct 27 21:04:04 2010 (r32559) @@ -335,6 +335,10 @@ void stream_set_interrupt_callback(int ( /// Call the interrupt checking callback if there is one and /// wait for time milliseconds int stream_check_interrupt(int time); +/// Internal read function bypassing the stream buffer +int stream_read_internal(stream_t *s, void *buf, int len); +/// Internal seek function bypassing the stream buffer +int stream_seek_internal(stream_t *s, off_t newpos); extern int bluray_angle; extern int bluray_chapter;

3 2