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

CVS: main/libmpcodecs ve_x264.c,1.33,1.34
by syncmail＠mplayerhq.hu 23 Aug '05

23 Aug '05

CVS change done by Ivan Kalvachev CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv13611 Modified Files: ve_x264.c Log Message: add (no)visualize options Index: ve_x264.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_x264.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ve_x264.c 11 Jul 2005 19:02:39 -0000 1.33 +++ ve_x264.c 19 Jul 2005 17:56:51 -0000 1.34 @@ -105,6 +105,7 @@ static int psnr = 0; static int log_level = 2; static int turbo = 0; +static int visualize = 0; m_option_t x264encopts_conf[] = { {"bitrate", &bitrate, CONF_TYPE_INT, CONF_RANGE, 0, 24000000, NULL}, @@ -167,6 +168,8 @@ {"nopsnr", &psnr, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"log", &log_level, CONF_TYPE_INT, CONF_RANGE, -1, 3, NULL}, {"turbo", &turbo, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, + {"visualize", &visualize, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"novisualize", &visualize, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -255,6 +258,7 @@ mod->param.i_level_idc = level_idc; mod->param.analyse.b_psnr = psnr; mod->param.i_log_level = log_level; + mod->param.b_visualize = visualize; mod->param.vui.i_sar_width = d_width*height; mod->param.vui.i_sar_height = d_height*width; mod->param.i_threads = threads;

5 15

CVS: main/libmpcodecs vf_denoise3d.c,1.6,1.7
by syncmail＠mplayerhq.hu 31 Jul '05

31 Jul '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv22193 Modified Files: vf_denoise3d.c Log Message: Needs the previous mpi (pmpi), so request a readable one and request the following filters not to modify it. Index: vf_denoise3d.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_denoise3d.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vf_denoise3d.c 15 Mar 2003 18:01:02 -0000 1.6 +++ vf_denoise3d.c 31 Jul 2005 20:58:52 -0000 1.7 @@ -120,7 +120,8 @@ int W = mpi->w, H = mpi->h; mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, - MP_IMGTYPE_IP, MP_IMGFLAG_ACCEPT_STRIDE, + MP_IMGTYPE_IP, MP_IMGFLAG_ACCEPT_STRIDE | + MP_IMGFLAG_PRESERVE | MP_IMGFLAG_READABLE, mpi->w,mpi->h); if(!dmpi) return 0;

1 0

CVS: main/libmpcodecs vf_boxblur.c,1.3,1.4
by syncmail＠mplayerhq.hu 31 Jul '05

31 Jul '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv16583 Modified Files: vf_boxblur.c Log Message: vBlur reads from dmpi, so request a readable one Index: vf_boxblur.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_boxblur.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vf_boxblur.c 15 Mar 2003 18:01:02 -0000 1.3 +++ vf_boxblur.c 31 Jul 2005 20:56:41 -0000 1.4 @@ -137,7 +137,7 @@ int ch= mpi->h >> mpi->chroma_y_shift; mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, - MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, + MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_READABLE, mpi->w,mpi->h); assert(mpi->flags&MP_IMGFLAG_PLANAR);

1 0

CVS: main/libmpcodecs vf_smartblur.c,1.8,1.9
by syncmail＠mplayerhq.hu 31 Jul '05

31 Jul '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv27817 Modified Files: vf_smartblur.c Log Message: when threshold != 0 the dest image must be readable Index: vf_smartblur.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_smartblur.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vf_smartblur.c 20 Jan 2005 13:22:52 -0000 1.8 +++ vf_smartblur.c 31 Jul 2005 12:13:22 -0000 1.9 @@ -187,9 +187,11 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ int cw= mpi->w >> mpi->chroma_x_shift; int ch= mpi->h >> mpi->chroma_y_shift; + FilterParam *f= &vf->priv; mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt, - MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, + MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE| + (f->threshold) ? MP_IMGFLAG_READABLE : 0, mpi->w,mpi->h); assert(mpi->flags&MP_IMGFLAG_PLANAR);

1 0

CVS: main cfg-common.h, 1.146, 1.147 mencoder.c, 1.302, 1.303 mplayer.c, 1.857, 1.858
by syncmail＠mplayerhq.hu 31 Jul '05

31 Jul '05

CVS change done by Ivan Kalvachev CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv4340 Modified Files: cfg-common.h mencoder.c mplayer.c Log Message: remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- cfg-common.h 17 Jul 2005 19:40:05 -0000 1.146 +++ cfg-common.h 31 Jul 2005 00:26:04 -0000 1.147 @@ -16,7 +16,7 @@ {"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 32, 1048576, NULL}, {"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"cache-min", &stream_cache_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL}, - {"cache-prefill", &stream_cache_prefill_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL}, + {"cache-seek-min", &stream_cache_seek_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL}, #else {"cache", "MPlayer was compiled without cache2 support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- mencoder.c 23 Jul 2005 06:51:35 -0000 1.302 +++ mencoder.c 31 Jul 2005 00:26:04 -0000 1.303 @@ -98,7 +98,7 @@ extern int cache_fill_status; float stream_cache_min_percent=20.0; -float stream_cache_prefill_percent=5.0; +float stream_cache_seek_min_percent=50.0; #else #define cache_fill_status 0 #endif Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.857 retrieving revision 1.858 diff -u -r1.857 -r1.858 --- mplayer.c 24 Jul 2005 12:56:07 -0000 1.857 +++ mplayer.c 31 Jul 2005 00:26:04 -0000 1.858 @@ -266,7 +266,7 @@ extern int cache_fill_status; float stream_cache_min_percent=20.0; -float stream_cache_prefill_percent=5.0; +float stream_cache_seek_min_percent=50.0; #else #define cache_fill_status 0 #endif @@ -1640,7 +1640,9 @@ #endif if(stream_cache_size>0){ current_module="enable_cache"; - if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024*(stream_cache_min_percent / 100.0),stream_cache_size*1024*(stream_cache_prefill_percent / 100.0))) + if(!stream_enable_cache(stream,stream_cache_size*1024, + stream_cache_size*1024*(stream_cache_min_percent / 100.0), + stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0))) if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file; }

1 0

[MPlayer-cvslog] CVS: main/libmpdemux cache2.c, 1.26, 1.27 demuxer.c, 1.194, 1.195
by syncmail＠mplayerhq.hu 31 Jul '05

31 Jul '05

CVS change done by Ivan Kalvachev CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv4340/libmpdemux Modified Files: cache2.c demuxer.c Log Message: remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill Index: cache2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- cache2.c 26 Jul 2004 22:06:30 -0000 1.26 +++ cache2.c 31 Jul 2005 00:26:07 -0000 1.27 @@ -42,7 +42,7 @@ int sector_size; // size of a single sector (2048/2324) int back_size; // we should keep back_size amount of old bytes for backward seek int fill_limit; // we should fill buffer only if space>=fill_limit - int prefill; // we should fill min prefill bytes if cache gets empty + int seek_limit; // keep filling cache if distanse is less that seek limit // filler's pointers: int eof; off_t min_filepos; // buffer contain only a part of the file, from min-max pos @@ -122,7 +122,7 @@ mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read); // streaming: drop cache contents only if seeking backward or too much fwd: if(s->stream->type!=STREAMTYPE_STREAM || - read<s->min_filepos || read>=s->max_filepos+s->buffer_size) + read<s->min_filepos || read>=s->max_filepos+s->seek_limit) { s->offset= // FIXME!? s->min_filepos=s->max_filepos=read; // drop cache content :( @@ -250,7 +250,7 @@ exit(0); } -int stream_enable_cache(stream_t *stream,int size,int min,int prefill){ +int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE; cache_vars_t* s; @@ -264,13 +264,13 @@ if(s == NULL) return 0; stream->cache_data=s; s->stream=stream; // callback - s->prefill=prefill; + s->seek_limit=seek_limit; //make sure that we won't wait from cache_fill //more data than it is alowed to fill - if (s->prefill > s->buffer_size - s->fill_limit ){ - s->prefill = s->buffer_size - s->fill_limit; + if (s->seek_limit > s->buffer_size - s->fill_limit ){ + s->seek_limit = s->buffer_size - s->fill_limit; } if (min > s->buffer_size - s->fill_limit) { min = s->buffer_size - s->fill_limit; Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- demuxer.c 10 Jul 2005 17:14:12 -0000 1.194 +++ demuxer.c 31 Jul 2005 00:26:07 -0000 1.195 @@ -1375,7 +1375,7 @@ extern int hr_mp3_seek; extern float stream_cache_min_percent; -extern float stream_cache_prefill_percent; +extern float stream_cache_seek_min_percent; demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ stream_t *as = NULL,*ss = NULL; @@ -1392,7 +1392,7 @@ } if(audio_stream_cache) { if(!stream_enable_cache(as,audio_stream_cache*1024,audio_stream_cache*1024*(stream_cache_min_percent / 100.0), - audio_stream_cache*1024*(stream_cache_prefill_percent / 100.0))) { + audio_stream_cache*1024*(stream_cache_seek_min_percent / 100.0))) { free_stream(as); mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't enable audio stream cache\n"); return NULL;

1 0

CVS: main/TOOLS/netstream netstream.c,1.8,1.9
by syncmail＠mplayerhq.hu 31 Jul '05

31 Jul '05

CVS change done by Ivan Kalvachev CVS Update of /cvsroot/mplayer/main/TOOLS/netstream In directory mail:/var2/tmp/cvs-serv4340/TOOLS/netstream Modified Files: netstream.c Log Message: remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill Index: netstream.c =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/netstream/netstream.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- netstream.c 8 May 2005 14:38:35 -0000 1.8 +++ netstream.c 31 Jul 2005 00:26:06 -0000 1.9 @@ -375,7 +375,7 @@ //---- For libmpdemux -float stream_cache_prefill_percent=5.0; +float stream_cache_seek_min_percent=50.0; float stream_cache_min_percent=20.0; #include <libmpdemux/demuxer.h>

1 0

CVS: main configure,1.1033,1.1034
by syncmail＠mplayerhq.hu 30 Jul '05

30 Jul '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv31366 Modified Files: configure Log Message: fix detection of iconv implementations which require libdl Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1033 retrieving revision 1.1034 diff -u -r1.1033 -r1.1034 --- configure 27 Jul 2005 17:32:14 -0000 1.1033 +++ configure 30 Jul 2005 01:07:27 -0000 1.1034 @@ -2270,57 +2270,6 @@ fi -echocheck "iconv" -if test "$_iconv" = auto ; then - _iconv_tmp='#include <iconv.h>' - - cat > $TMPC << EOF -#include <stdio.h> -#include <unistd.h> -$_iconv_tmp -#define INBUFSIZE 1024 -#define OUTBUFSIZE 4096 - -char inbuffer[INBUFSIZE]; -char outbuffer[OUTBUFSIZE]; - -int main(void) { - size_t numread; - iconv_t icdsc; - char *tocode="UTF-8"; - char *fromcode="cp1250"; - if ((icdsc = iconv_open (tocode, fromcode)) != (iconv_t)(-1)) { - while ((numread = read (0, inbuffer, INBUFSIZE))) { - char *iptr=inbuffer; - char *optr=outbuffer; - size_t inleft=numread; - size_t outleft=OUTBUFSIZE; - if (iconv(icdsc, (const char **)&iptr, &inleft, &optr, &outleft) - != (size_t)(-1)) { - write (1, outbuffer, OUTBUFSIZE - outleft); - } - } - if (iconv_close(icdsc) == -1) - ; - } -} -EOF - _iconv=no - if cc_check $_ld_lm ; then - _iconv=yes - elif cc_check $_ld_lm -liconv ; then - _iconv=yes - _ld_iconv='-liconv' - fi -fi -if test "$_iconv" = yes ; then - _def_iconv='#define USE_ICONV 1' -else - _def_iconv='#undef USE_ICONV' -fi -echores "$_iconv" - - echocheck "langinfo" if test "$_langinfo" = auto ; then cat > $TMPC <<EOF @@ -2848,6 +2797,60 @@ fi +echocheck "iconv" +if test "$_iconv" = auto ; then + _iconv_tmp='#include <iconv.h>' + + cat > $TMPC << EOF +#include <stdio.h> +#include <unistd.h> +$_iconv_tmp +#define INBUFSIZE 1024 +#define OUTBUFSIZE 4096 + +char inbuffer[INBUFSIZE]; +char outbuffer[OUTBUFSIZE]; + +int main(void) { + size_t numread; + iconv_t icdsc; + char *tocode="UTF-8"; + char *fromcode="cp1250"; + if ((icdsc = iconv_open (tocode, fromcode)) != (iconv_t)(-1)) { + while ((numread = read (0, inbuffer, INBUFSIZE))) { + char *iptr=inbuffer; + char *optr=outbuffer; + size_t inleft=numread; + size_t outleft=OUTBUFSIZE; + if (iconv(icdsc, (const char **)&iptr, &inleft, &optr, &outleft) + != (size_t)(-1)) { + write (1, outbuffer, OUTBUFSIZE - outleft); + } + } + if (iconv_close(icdsc) == -1) + ; + } +} +EOF + _iconv=no + if cc_check $_ld_lm ; then + _iconv=yes + elif cc_check $_ld_lm -liconv ; then + _iconv=yes + _ld_iconv='-liconv' + elif cc_check $_ld_lm -liconv $_ld_dl ; then + _iconv=yes + _ld_iconv='-liconv $_ld_dl' + fi +fi +if test "$_iconv" = yes ; then + _def_iconv='#define USE_ICONV 1' +else + _def_iconv='#undef USE_ICONV' +fi +echores "$_iconv" + + echocheck "sys/soundcard.h" cat > $TMPC << EOF #include <sys/soundcard.h>

1 0

CVS: main/libmpdemux demux_mpc.c, 1.3, 1.4 asfheader.c, 1.42, 1.43
by syncmail＠mplayerhq.hu 29 Jul '05

29 Jul '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv13765 Modified Files: demux_mpc.c asfheader.c Log Message: 10l, incorrect usage of le2me_* Index: demux_mpc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- demux_mpc.c 26 Jul 2005 00:01:43 -0000 1.3 +++ demux_mpc.c 29 Jul 2005 15:52:06 -0000 1.4 @@ -36,7 +36,7 @@ } else { stream_read(s, (void *)&priv->dword, 4); - le2me_32(priv->dword); + priv->dword = le2me_32(priv->dword); priv->pos -= 32; if (priv->pos) { out <<= priv->pos; Index: asfheader.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asfheader.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- asfheader.c 21 Jun 2005 19:56:47 -0000 1.42 +++ asfheader.c 29 Jul 2005 15:52:06 -0000 1.43 @@ -374,7 +374,7 @@ } // read length of chunk stream_read(demuxer->stream, (char *)&data_len, sizeof(data_len)); - le2me_64(data_len); + data_len = le2me_64(data_len); demuxer->movi_start = stream_tell(demuxer->stream) + 26; demuxer->movi_end = start + data_len; mp_msg(MSGT_HEADER, MSGL_V, "Found movie at 0x%X - 0x%X\n",

1 0

CVS: main/libvo vo_macosx.m,1.29,1.30
by syncmail＠mplayerhq.hu 29 Jul '05

29 Jul '05

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv29631/libvo Modified Files: vo_macosx.m Log Message: exit kiosk mode and show mouse cursor in uninit Index: vo_macosx.m =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_macosx.m,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vo_macosx.m 28 Jul 2005 22:19:34 -0000 1.29 +++ vo_macosx.m 28 Jul 2005 23:18:39 -0000 1.30 @@ -198,6 +198,9 @@ static void uninit(void) { + SetSystemUIMode( kUIModeNormal, 0); + ShowCursor(); + [autoreleasepool release]; }

1 0