December 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/DOCS/tech libavc-options.txt,1.25,1.26
by Michael Niedermayer CVS 18 Dec '02

18 Dec '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv32645/DOCS/tech Modified Files: libavc-options.txt Log Message: mb qp limits Index: libavc-options.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/libavc-options.txt,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libavc-options.txt 14 Nov 2002 19:33:19 -0000 1.25 +++ libavc-options.txt 18 Dec 2002 10:50:56 -0000 1.26 @@ -29,6 +29,12 @@ 31 default 10-31 should be a sane range +mbqmin 1-31 (minimum macroblock quantizer) for pass1/2 + 2 default + +mbqmax 1-31 (maximum macroblock quantizer) for pass1/2 + 31 default + vqdiff 1-31 (maximum quantizer difference between I or P frames) for pass1/2 3 default @@ -265,7 +271,7 @@ 0 left prediction 1 plane/gradient prediction 2 median prediction - + lavdopts: (decoder options) ---------------------------

1 0

CVS: main/libmpcodecs ve_xvid.c,1.10,1.11 vd_xvid.c,1.6,1.7
by R�mi Guyomarch CVS 18 Dec '02

18 Dec '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv8623/libmpcodecs Modified Files: ve_xvid.c vd_xvid.c Log Message: Use the XVID_API_UNSTABLE macro instead of a home-made one. Print a big warning if compiled for the unstable XViD tree. Index: ve_xvid.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_xvid.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ve_xvid.c 15 Dec 2002 18:35:11 -0000 1.10 +++ ve_xvid.c 18 Dec 2002 08:10:24 -0000 1.11 @@ -22,16 +22,28 @@ #include <xvid.h> #include "xvid_vbr.h" -#ifndef PMV_EARLYSTOP16 - #define XVID_DEV -#endif - #include "cfgparser.h" + +#ifdef XVID_API_UNSTABLE +#warning ******************************************************************* +#warning ** ** +#warning ** Y O U '' R E U S I N G U N S T A B L E S O F T W A R E ** +#warning ** ** +#warning ** Streams produced by this version aren''nt probably compatible ** +#warning ** with anything else, even the xvid decoder itself. There are ** +#warning ** bugs, this code could crash, could blow up your PC or the ** +#warning ** whole building ! ** +#warning ** If you want stable code and compatible streams, use stable ** +#warning ** XViD releases (currently 0.9.x). ** +#warning ** ** +#warning ******************************************************************* +#endif + /**********************************************************************/ /* motion estimation quality presets */ static int const motion_presets[7] = { -#ifdef XVID_DEV +#ifdef XVID_API_UNSTABLE 0, PMV_QUICKSTOP16, 0, @@ -75,7 +87,7 @@ static int xvidenc_debug = 0; static int xvidenc_hintedme = 0; static char* xvidenc_hintfile = "xvid_hint_me.dat"; -#ifdef XVID_DEV +#ifdef XVID_API_UNSTABLE static int xvidenc_qpel = 0; static int xvidenc_max_bframes = 0; static int xvidenc_bquant_ratio = 125; @@ -107,7 +119,7 @@ { "debug", &xvidenc_debug, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "hintedme", &xvidenc_hintedme, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "hintfile", &xvidenc_hintfile, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#ifdef XVID_DEV +#ifdef XVID_API_UNSTABLE { "qpel", &xvidenc_qpel, CONF_TYPE_FLAG, 0, 0, 1, NULL}, { "max_bframes", &xvidenc_max_bframes, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, { "bquant_ratio", &xvidenc_bquant_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL}, @@ -158,6 +170,24 @@ return -1; } +#ifdef XVID_API_UNSTABLE + mp_msg (MSGT_MENCODER, MSGL_WARN, + "\n" + "*******************************************************************\n" + "** **\n" + "** Y O U ' R E U S I N G U N S T A B L E S O F T W A R E **\n" + "** **\n" + "** Streams produced by this version aren'nt probably compatible **\n" + "** with anything else, even the xvid decoder itself. There are **\n" + "** bugs, this code could crash, could blow up your PC or the **\n" + "** whole building ! **\n" + "** If you want stable code and compatible streams, use stable **\n" + "** XViD releases (currently 0.9.x). **\n" + "** **\n" + "*******************************************************************\n" + "\n"); +#endif + // initialize XViD core parameters // =============================== memset(&enc_param, 0, sizeof(enc_param)); @@ -171,7 +201,7 @@ enc_param.rc_bitrate = xvidenc_bitrate * 1000; else enc_param.rc_bitrate = -1; -#ifdef XVID_DEV +#ifdef XVID_API_UNSTABLE if (xvidenc_max_bframes >= 1 && xvidenc_pass >= 1) { mp_msg(MSGT_MENCODER,MSGL_WARN, "xvid: cannot use bframes with 2-pass, disabling bframes\n"); xvidenc_max_bframes = 0; @@ -211,7 +241,7 @@ fp->enc_frame.general |= XVID_INTER4V; if (xvidenc_lumi_mask) fp->enc_frame.general |= XVID_LUMIMASKING; -#ifdef XVID_DEV +#ifdef XVID_API_UNSTABLE if (xvidenc_qpel) { fp->enc_frame.general |= XVID_QUARTERPEL; fp->enc_frame.motion |= PMV_QUARTERPELREFINE16 | PMV_QUARTERPELREFINE8; @@ -354,7 +384,7 @@ fp->enc_frame.image = mpi->planes[0]; // get quantizers & I/P decision from the VBR engine -#ifdef XVID_DEV +#ifdef XVID_API_UNSTABLE if (xvidenc_max_bframes >= 1) { if (!xvidenc_fixed_quant) { // hack, the internal VBR engine isn't fixed-quant aware Index: vd_xvid.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_xvid.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- vd_xvid.c 15 Dec 2002 18:35:11 -0000 1.6 +++ vd_xvid.c 18 Dec 2002 08:10:24 -0000 1.7 @@ -12,8 +12,18 @@ #include <divx4.h> #include <xvid.h> -#ifndef PMV_EARLYSTOP16 - #define XVID_DEV + +#ifdef XVID_API_UNSTABLE +#warning ******************************************************************* +#warning ** ** +#warning ** Y O U '' R E U S I N G U N S T A B L E S O F T W A R E ** +#warning ** ** +#warning ** There are bugs, this code could crash, could blow up your PC ** +#warning ** or the whole building and do many other nasty things ! ** +#warning ** ** +#warning ** If you want stable code use stable XViD releases (0.9.x). ** +#warning ** ** +#warning ******************************************************************* #endif static vd_info_t info = @@ -54,6 +64,22 @@ priv_t* p; int cs; +#ifdef XVID_API_UNSTABLE + mp_msg (MSGT_DECVIDEO, MSGL_WARN, + "\n" + "*******************************************************************\n" + "** **\n" + "** Y O U ' R E U S I N G U N S T A B L E S O F T W A R E **\n" + "** **\n" + "** There are bugs, this code could crash, could blow up your PC **\n" + "** or the whole building and do many other nasty things ! **\n" + "** **\n" + "** If you want stable code use stable XViD releases (0.9.x). **\n" + "** **\n" + "*******************************************************************\n" + "\n"); +#endif + memset(&ini,0,sizeof(XVID_INIT_PARAM)); memset(&dec_p,0,sizeof(XVID_DEC_PARAM)); @@ -169,7 +195,7 @@ dec.bitstream = data; dec.length = len; -#ifdef XVID_DEV +#ifdef XVID_API_UNSTABLE dec.general |= XVID_DEC_LOWDELAY; dec.general |= XVID_DEC_DEBLOCKY; dec.general |= XVID_DEC_DEBLOCKUV;

1 0

CVS: main configure,1.621,1.622
by J�rgen Keil CVS 17 Dec '02

17 Dec '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv19634 Modified Files: configure Log Message: Re-write the soundcard.h test, so that it does not use a "!" operator. This part of configure was failing on solaris, with an error message: Checking for soundcard.h ... ./configure: !: not found no Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.621 retrieving revision 1.622 diff -u -r1.621 -r1.622 --- configure 6 Dec 2002 23:54:02 -0000 1.621 +++ configure 17 Dec 2002 10:38:48 -0000 1.622 @@ -1930,12 +1930,13 @@ EOF _soundcard=no cc_check && _soundcard=yes -if ! linux && test "$_ossaudio" = no ; then - # we don't want touse soundcard.h on non-linux if no OSS support enabled! +if linux || test "$_ossaudio" != no ; then + # use soundcard.h on linux, or when OSS support is enabled + echores "$_soundcard" +else + # we don't want to use soundcard.h on non-linux if no OSS support enabled! echores "$_soundcard, but ignored!" _soundcard=no -else - echores "$_soundcard" fi if test "$_soundcard" = yes ; then _def_soundcard='#define HAVE_SOUNDCARD_H 1'

1 0

CVS: main/DOCS mplayer.1,1.281,1.282
by Atmosfear 17 Dec '02

17 Dec '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv5866/DOCS Modified Files: mplayer.1 Log Message: small typo fix Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.281 retrieving revision 1.282 diff -u -r1.281 -r1.282 --- mplayer.1 16 Dec 2002 19:43:07 -0000 1.281 +++ mplayer.1 17 Dec 2002 00:04:11 -0000 1.282 @@ -2539,8 +2539,8 @@ .IPs me_quality=<0\-6> specify the motion detection quality (default=4) .IPs 4mv -use 4 motion vectors per macro-block, might gives better compression at the cost -of a slower encoding (default=off) +use 4 motion vectors per macro-block, might give better compression at the cost +of slower encoding (default=off) .IPs rc_reaction_delay_factor=<value> specify how fast the rate control reacts, lower values are faster .IPs rc_averaging_period=<value>

3 2

CVS: main/libmpdemux tv.c,1.42,1.43
by Jindrich Makovicka CVS 16 Dec '02

16 Dec '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv16911 Modified Files: tv.c Log Message: 1000L for messing up cvs Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- tv.c 16 Dec 2002 23:27:39 -0000 1.42 +++ tv.c 16 Dec 2002 23:38:56 -0000 1.43 @@ -159,6 +159,14 @@ tvh->norm = TV_NORM_NTSC; else if (!strcasecmp(tv_param_norm, "secam")) tvh->norm = TV_NORM_SECAM; + else if (!strcasecmp(tv_param_norm, "palnc")) + tvh->norm = TV_NORM_PALNC; + else if (!strcasecmp(tv_param_norm, "palm")) + tvh->norm = TV_NORM_PALM; + else if (!strcasecmp(tv_param_norm, "paln")) + tvh->norm = TV_NORM_PALN; + else if (!strcasecmp(tv_param_norm, "ntscjp")) + tvh->norm = TV_NORM_NTSCJP; else { mp_msg(MSGT_TV, MSGL_V, "Bogus norm parameter, setting PAL.\n"); tvh->norm = TV_NORM_PAL;

1 0

CVS: main/libmpdemux tv.c,1.41,1.42
by Jindrich Makovicka CVS 16 Dec '02

16 Dec '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv10997 Modified Files: tv.c Log Message: handle bogus norm parameter; check for errors when setting norm Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- tv.c 16 Dec 2002 17:05:49 -0000 1.41 +++ tv.c 16 Dec 2002 23:27:39 -0000 1.42 @@ -159,21 +159,16 @@ tvh->norm = TV_NORM_NTSC; else if (!strcasecmp(tv_param_norm, "secam")) tvh->norm = TV_NORM_SECAM; - else if (!strcasecmp(tv_param_norm, "palnc")) - tvh->norm = TV_NORM_PALNC; - else if (!strcasecmp(tv_param_norm, "palm")) - tvh->norm = TV_NORM_PALM; - else if (!strcasecmp(tv_param_norm, "paln")) - tvh->norm = TV_NORM_PALN; - else if (!strcasecmp(tv_param_norm, "ntscjp")) - tvh->norm = TV_NORM_NTSCJP; else { mp_msg(MSGT_TV, MSGL_V, "Bogus norm parameter, setting PAL.\n"); tvh->norm = TV_NORM_PAL; } mp_msg(MSGT_TV, MSGL_V, "Selected norm: %s\n", tv_param_norm); - funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm); + if (funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { + mp_msg(MSGT_TV, MSGL_ERR, "Error: cannot set norm!\n"); + return 0; + } /* limits on w&h are norm-dependent -- JM */ /* set width */

1 0

CVS: main/libmpdemux tvi_v4l.c,1.45,1.46
by Jindrich Makovicka CVS 16 Dec '02

16 Dec '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv9117 Modified Files: tvi_v4l.c Log Message: don't give up when set_tuner fails; more zero div sanity checks Index: tvi_v4l.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- tvi_v4l.c 16 Dec 2002 17:05:49 -0000 1.45 +++ tvi_v4l.c 16 Dec 2002 23:24:02 -0000 1.46 @@ -988,6 +988,8 @@ } if (priv->channels[priv->act_channel].flags & VIDEO_VC_TUNER) { + int prev_mode; + control(priv, TVI_CONTROL_TUN_GET_TUNER, 0); if (((req_mode == TV_NORM_PAL || req_mode == TV_NORM_PALNC @@ -1001,6 +1003,8 @@ return(TVI_CONTROL_FALSE); } + prev_mode = priv->tuner.mode; + switch(req_mode) { case TV_NORM_PAL: case TV_NORM_PALNC: @@ -1018,7 +1022,8 @@ } if (control(priv, TVI_CONTROL_TUN_SET_TUNER, &priv->tuner) != TVI_CONTROL_TRUE) { - return(TVI_CONTROL_FALSE); + // norm setting failed, but maybe it's only because it's fixed + if (priv->tuner.mode != prev_mode) return(TVI_CONTROL_FALSE); // no it really failed } } @@ -1282,11 +1287,14 @@ interval = (double)framecount/priv->fps; } - if (!priv->immediate_mode && ( - (interval - prev_interval < (long long)0.85e6/priv->fps) - || (interval - prev_interval > (long long)1.15e6/priv->fps) ) ) { - mp_msg(MSGT_TV, MSGL_V, "\nvideo capture thread: frame delta ~ %.1lf fps\n", - (double)1e6/(interval - prev_interval)); + if (!priv->immediate_mode) { + if (interval - prev_interval == 0) { + mp_msg(MSGT_TV, MSGL_V, "\nvideo capture thread: frame delta = 0\n"); + } else if ((interval - prev_interval < (long long)0.85e6/priv->fps) + || (interval - prev_interval > (long long)1.15e6/priv->fps) ) { + mp_msg(MSGT_TV, MSGL_V, "\nvideo capture thread: frame delta ~ %.1lf fps\n", + (double)1e6/(interval - prev_interval)); + } } // interpolate the skew in time @@ -1304,7 +1312,8 @@ } mp_msg(MSGT_TV, MSGL_DBG3, "\nfps = %lf, interval = %lf, a_skew = %f, corr_skew = %f\n", - (double)1e6/(interval - prev_interval), (double)1e-6*interval, (double)1e-6*xskew, (double)1e-6*skew); + (interval != prev_interval) ? (double)1e6/(interval - prev_interval) : -1, + (double)1e-6*interval, (double)1e-6*xskew, (double)1e-6*skew); mp_msg(MSGT_TV, MSGL_DBG3, "vcnt = %d, acnt = %d\n", priv->video_cnt, priv->audio_cnt); prev_skew = skew;

1 0

CVS: main/Gui interface.c,1.64,1.65
by Zoltan Ponekker 16 Dec '02

16 Dec '02

Update of /cvsroot/mplayer/main/Gui In directory mail:/var/tmp.root/cvs-serv23745/Gui Modified Files: interface.c Log Message: - fix (?) "mixer bug" - fix audio_id/video_id changing - fix some other bug Index: interface.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/interface.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- interface.c 11 Dec 2002 01:21:08 -0000 1.64 +++ interface.c 16 Dec 2002 22:24:56 -0000 1.65 @@ -691,7 +691,7 @@ gset( &ao_plugin_cfg.plugin_list,"extrastereo" ); ao_plugin_cfg.pl_extrastereo_mul=gtkAOExtraStereoMul; } - mixer_device=gtkAOOSSMixer; + mixer_device=gstrdup( gtkAOOSSMixer ); if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) && gtkAOOSSDevice ) { char * tmp = calloc( 1,strlen( gtkAOOSSDevice ) + 7 ); @@ -713,13 +713,11 @@ // --- misc if ( gtkCacheOn ) stream_cache_size=gtkCacheSize; - else stream_cache_size=-1; - if ( gtkAutoSyncOn ) autosync=gtkAutoSync; - else autosync=0; - if ( guiIntfStruct.AudioFile ) audio_stream=guiIntfStruct.AudioFile; - else if ( guiIntfStruct.FilenameChanged ) audio_stream=NULL; + if ( guiIntfStruct.AudioFile ) audio_stream=gstrdup( guiIntfStruct.AudioFile ); + else if ( guiIntfStruct.FilenameChanged ) gfree( (void**)&audio_stream ); + //audio_stream=NULL; guiIntfStruct.DiskChanged=0; guiIntfStruct.FilenameChanged=0;

1 0

CVS: main/Gui/mplayer/gtk opts.c,1.37,1.38
by Zoltan Ponekker 16 Dec '02

16 Dec '02

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk In directory mail:/var/tmp.root/cvs-serv23745/Gui/mplayer/gtk Modified Files: opts.c Log Message: - fix (?) "mixer bug" - fix audio_id/video_id changing - fix some other bug Index: opts.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- opts.c 28 Nov 2002 23:17:12 -0000 1.37 +++ opts.c 16 Dec 2002 22:25:17 -0000 1.38 @@ -175,6 +175,7 @@ int i = 0; char * tmp[3]; tmp[2]=""; old_audio_driver=-1; + if ( CLADrivers ) gtk_clist_clear( GTK_CLIST( CLADrivers ) ); while ( audio_out_drivers[i] ) { const ao_info_t *info = audio_out_drivers[i++]->info; @@ -220,6 +221,7 @@ int i = 0, c = 0; char * tmp[3]; tmp[2]=""; old_video_driver=0; + if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) ); while ( video_out_drivers[i] ) if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) {

1 0

CVS: main/Gui/mplayer mw.c,1.98,1.99 play.c,1.79,1.80
by Zoltan Ponekker 16 Dec '02

16 Dec '02

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv23745/Gui/mplayer Modified Files: mw.c play.c Log Message: - fix (?) "mixer bug" - fix audio_id/video_id changing - fix some other bug Index: mw.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- mw.c 16 Dec 2002 20:16:29 -0000 1.98 +++ mw.c 16 Dec 2002 22:25:15 -0000 1.99 @@ -273,14 +273,12 @@ case evSetAudio: if ( !guiIntfStruct.demuxer || audio_id == iparam ) break; audio_id=iparam; - guiIntfStruct.NewPlay=1; - break; + goto play; case evSetVideo: if ( !guiIntfStruct.demuxer || video_id == iparam ) break; video_id=iparam; - guiIntfStruct.NewPlay=1; - break; + goto play; #ifdef HAVE_VCD case evSetVCDTrack: Index: play.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- play.c 11 Dec 2002 01:21:09 -0000 1.79 +++ play.c 16 Dec 2002 22:25:15 -0000 1.80 @@ -106,7 +106,7 @@ } else { - if ( guiIntfStruct.FilenameChanged ) return; + if ( guiIntfStruct.FilenameChanged || guiIntfStruct.NewPlay ) return; guiIntfStruct.TimeSec=0; guiIntfStruct.Position=0;

1 0