[Mplayer-cvslog] CVS: main cfg-common.h,1.28,1.29 cfg-mencoder.h,1.25,1.26 mplayer.c,1.385,1.386
Zoltan Ponekker
pontscho at mplayer.dev.hu
Wed Feb 6 20:22:52 CET 2002
- Previous message: [Mplayer-cvslog] CVS: main/libmpdemux Makefile,1.18,1.19 demuxer.c,1.69,1.70 demuxer.h,1.27,1.28 open.c,1.36,1.37 stream.h,1.31,1.32
- Next message: [Mplayer-cvslog] CVS: main cfg-common.h,1.28,1.29 cfg-mencoder.h,1.25,1.26 mWed Feb 6 21:35:59 2002
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv3341
Modified Files:
cfg-common.h cfg-mencoder.h mplayer.c
Log Message:
add mfi support
Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cfg-common.h 26 Jan 2002 16:32:06 -0000 1.28
+++ cfg-common.h 6 Feb 2002 19:22:44 -0000 1.29
@@ -2,90 +2,92 @@
// ------------------------- stream options --------------------
#ifdef USE_STREAM_CACHE
- {"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL},
+ {"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL},
#else
- {"cache", "MPlayer was compiled WITHOUT cache2 support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ {"cache", "MPlayer was compiled WITHOUT cache2 support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
#ifdef HAVE_VCD
- {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
- {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
+ {"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
#else
- {"vcd", "VCD support is NOT available on this system!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ {"vcd", "VCD support is NOT available on this system!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
#ifdef USE_DVDREAD
- {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"dvd", &dvd_title, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
- {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
- {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
+ {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"dvd", &dvd_title, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
+ {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
+ {"chapter", dvd_parse_chapter_range, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
#else
- {"dvd", "MPlayer was compiled WITHOUT libdvdread support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ {"dvd", "MPlayer was compiled WITHOUT libdvdread support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
#ifdef HAVE_LIBCSS
{"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"csslib", &css_so, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"csslib", &css_so, CONF_TYPE_STRING, 0, 0, 0, NULL},
#else
{"dvdauth", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
{"dvdkey", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
- {"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+ {"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
// ------------------------- demuxer options --------------------
- {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+ {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+ {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"noidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 0, NULL},
- {"idx", &index_mode, CONF_TYPE_FLAG, 0, -1, 1, NULL},
- {"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL},
-
- {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
- {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
- {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
+ {"noidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 0, NULL},
+ {"idx", &index_mode, CONF_TYPE_FLAG, 0, -1, 1, NULL},
+ {"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL},
+
+ {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
+ {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
+ {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
// ------------------------- a-v sync options --------------------
- {"frames", &play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
+ {"frames", &play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
- {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10, NULL},
- {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
- {"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL},
+ {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10, NULL},
+ {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
+ {"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL},
// ------------------------- codec/pp options --------------------
+ {"mf", mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
+
#ifdef USE_FAKE_MONO
- {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
+ {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
#endif
- {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+ {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0, NULL},
- {"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 16, NULL}, // keep ranges in sync
- {"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 14, NULL}, // with codec-cfg.c
- {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"vc", &video_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 16, NULL}, // keep ranges in sync
+ {"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 14, NULL}, // with codec-cfg.c
+ {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"vc", &video_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
+ {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
CONF_TYPE_PRINT, 0, 0, 0, NULL},
- {"pp", readPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt},
- {"npp", readNPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt},
+ {"pp", readPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt},
+ {"npp", readNPPOpt, CONF_TYPE_FUNC_PARAM, 0, 0, 0, (cfg_default_func_t)&revertPPOpt},
#ifdef HAVE_ODIVX_POSTPROCESS
{"oldpp", &use_old_pp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#else
{"oldpp", "MPlayer was compiled without opendivx library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
#endif
- {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
- {"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+ {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
+ {"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#ifdef USE_TV
- {"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+ {"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#else
- {"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+ {"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif
- {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+ {"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#else
@@ -95,19 +97,19 @@
#ifdef USE_TV
struct config tvopts_conf[]={
- {"on", &tv_param_on, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- {"driver", &tv_param_driver, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"device", &tv_param_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"freq", &tv_param_freq, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"channel", &tv_param_channel, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"chanlist", &tv_param_chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"norm", &tv_param_norm, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"width", &tv_param_width, CONF_TYPE_INT, 0, 0, 4096, NULL},
- {"height", &tv_param_height, CONF_TYPE_INT, 0, 0, 4096, NULL},
- {"input", &tv_param_input, CONF_TYPE_INT, 0, 0, 20, NULL},
- {"outfmt", &tv_param_outfmt, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"fps", &tv_param_fps, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ {"on", &tv_param_on, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"driver", &tv_param_driver, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"device", &tv_param_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"freq", &tv_param_freq, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"channel", &tv_param_channel, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"chanlist", &tv_param_chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"norm", &tv_param_norm, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"width", &tv_param_width, CONF_TYPE_INT, 0, 0, 4096, NULL},
+ {"height", &tv_param_height, CONF_TYPE_INT, 0, 0, 4096, NULL},
+ {"input", &tv_param_input, CONF_TYPE_INT, 0, 0, 20, NULL},
+ {"outfmt", &tv_param_outfmt, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"fps", &tv_param_fps, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL}
};
#endif
@@ -119,13 +121,13 @@
extern float sws_lum_sharpen;
struct config scaler_filter_conf[]={
- {"lgb", &sws_lum_gblur, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
- {"cgb", &sws_chr_gblur, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
- {"cvs", &sws_chr_vshift, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"chs", &sws_chr_hshift, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"ls", &sws_lum_sharpen, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
- {"cs", &sws_chr_sharpen, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ {"lgb", &sws_lum_gblur, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
+ {"cgb", &sws_chr_gblur, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
+ {"cvs", &sws_chr_vshift, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"chs", &sws_chr_hshift, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"ls", &sws_lum_sharpen, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
+ {"cs", &sws_chr_sharpen, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL}
};
/* VIVO demuxer options: */
@@ -140,17 +142,32 @@
extern char *dvd_device, *cdrom_device;
struct config vivoopts_conf[]={
- {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL},
- /* audio options */
- {"acodec", &vivo_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
- {"abitrate", &vivo_param_abitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"samplerate", &vivo_param_samplerate, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"bytesperblock", &vivo_param_bytesperblock, CONF_TYPE_INT, 0, 0, 0, NULL},
- /* video options */
- {"width", &vivo_param_width, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"height", &vivo_param_height, CONF_TYPE_INT, 0, 0, 0, NULL},
- {"vformat", &vivo_param_vformat, CONF_TYPE_INT, 0, 0, 0, NULL},
- {NULL, NULL, 0, 0, 0, 0, NULL}
+ {"version", &vivo_param_version, CONF_TYPE_INT, 0, 0, 0, NULL},
+ /* audio options */
+ {"acodec", &vivo_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {"abitrate", &vivo_param_abitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"samplerate", &vivo_param_samplerate, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"bytesperblock", &vivo_param_bytesperblock, CONF_TYPE_INT, 0, 0, 0, NULL},
+ /* video options */
+ {"width", &vivo_param_width, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"height", &vivo_param_height, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"vformat", &vivo_param_vformat, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL}
};
+extern int mf_support;
+extern int mf_w;
+extern int mf_h;
+extern int mf_fps;
+extern char * mf_type;
+
+struct config mfopts_conf[]={
+ {"on", &mf_support, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"fps", &mf_fps, CONF_TYPE_INT, 0, 0, 0, NULL},
+ {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL}
+};
+
#endif
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cfg-mencoder.h 31 Jan 2002 00:38:53 -0000 1.25
+++ cfg-mencoder.h 6 Feb 2002 19:22:44 -0000 1.26
@@ -110,7 +110,7 @@
// {"ovc", &out_video_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
{"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
{"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-
+
{"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL},
#ifdef HAVE_DIVX4ENCORE
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- mplayer.c 3 Feb 2002 15:16:46 -0000 1.385
+++ mplayer.c 6 Feb 2002 19:22:44 -0000 1.386
@@ -1077,12 +1077,14 @@
}
#ifdef USE_DVDREAD
+if ( dvd_title ){
current_module="spudec";
vo_spudec=spudec_new_scaled(stream->priv?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL,
sh_video->disp_w, sh_video->disp_h);
if (vo_spudec!=NULL)
inited_flags|=INITED_SPUDEC;
current_module=NULL;
+}
#endif
#ifdef USE_SUB
- Previous message: [Mplayer-cvslog] CVS: main/libmpdemux Makefile,1.18,1.19 demuxer.c,1.69,1.70 demuxer.h,1.27,1.28 open.c,1.36,1.37 stream.h,1.31,1.32
- Next message: [Mplayer-cvslog] CVS: main cfg-common.h,1.28,1.29 cfg-mencoder.h,1.25,1.26 mWed Feb 6 21:35:59 2002
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list