Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv15493 Modified Files: cfg-common.h configure mencoder.c mplayer.c Log Message: this is a combo patch that: 1) adds an experimental TS demuxer to mplayer 2) adds an input (streaming) interface from DVB cards. It compiles and runs with the following versions of the drivers: dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18) patch by Nico <nsabbi@libero.it> some cleanups, ts demuxer fixes by me Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- cfg-common.h 15 Mar 2003 18:00:28 -0000 1.85 +++ cfg-common.h 16 Mar 2003 20:13:06 -0000 1.86 @@ -64,8 +64,8 @@ {"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL}, // select audio/videosubtitle stream - {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, - {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, + {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8192, NULL}, + {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8192, NULL}, {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, { "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL }, @@ -94,6 +94,10 @@ {"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}, +#ifdef HAS_DVBIN_SUPPORT + {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, +#endif + // ------------------------- a-v sync options -------------------- @@ -164,6 +168,7 @@ {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, + {"tsfastparse", &ts_fastparse, CONF_TYPE_INT, 0, 0, 0, NULL}, #ifdef USE_LIBAVCODEC {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, @@ -243,6 +248,7 @@ extern char* audio_stream; extern char* sub_stream; extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; +extern int ts_fastparse; #include "libmpdemux/tv.h" @@ -289,6 +295,12 @@ {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif + +#ifdef HAS_DVBIN_SUPPORT +#include "libmpdemux/dvbin.h" +extern struct config dvbin_opts_conf[]; +#endif + extern int sws_chr_vshift; extern int sws_chr_hshift; Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.680 retrieving revision 1.681 diff -u -r1.680 -r1.681 --- configure 12 Mar 2003 23:57:23 -0000 1.680 +++ configure 16 Mar 2003 20:13:06 -0000 1.681 @@ -2848,6 +2848,7 @@ fi if test "$_dvb" = yes ; then _def_dvb='#define HAVE_DVB 1' + _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' _aomodules="mpegpes(dvb) $_aomodules" _vomodules="mpegpes(dvb) $_vomodules" fi @@ -2888,12 +2889,14 @@ fi if test "$_dvbhead" = yes ; then _def_dvb='#define HAVE_DVB_HEAD 1' + _def_dvb_in='#define HAS_DVBIN_SUPPORT 1' _aomodules="mpegpes(dvb) $_aomodules" _vomodules="mpegpes(dvb) $_vomodules" fi fi if test "$_dvbhead" = no && test "$_dvb" = no ; then _def_dvb='#undef HAVE_DVB' + _def_dvb_in='#undef HAS_DVBIN_SUPPORT ' _aomodules="mpegpes(file) $_aomodules" _vomodules="mpegpes(file) $_vomodules" fi @@ -5497,6 +5500,7 @@ $_def_dxr2 $_def_dxr3 $_def_dvb +$_def_dvb_in $_def_svga $_def_vesa $_def_xdpms Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- mencoder.c 15 Mar 2003 18:50:58 -0000 1.208 +++ mencoder.c 16 Mar 2003 20:13:06 -0000 1.209 @@ -422,7 +422,7 @@ } #endif - if(!filename && !vcd_track && !dvd_title && !tv_param_on){ + if(!filename && !vcd_track && !dvd_title && !tv_param_on && !dvbin_param_on){ printf(MSGTR_MissingFilename); mencoder_exit(1,NULL); } Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.685 retrieving revision 1.686 diff -u -r1.685 -r1.686 --- mplayer.c 15 Mar 2003 18:00:28 -0000 1.685 +++ mplayer.c 16 Mar 2003 20:13:06 -0000 1.686 @@ -92,6 +92,13 @@ extern int tv_param_on; #endif +#ifdef HAS_DVBIN_SUPPORT +#include "libmpdemux/dvbin.h" +extern dvb_history_t dvb_prev_next; +dvb_history_t *dvb_history; +#endif + + //**************************************************************************// // Playtree //**************************************************************************// @@ -661,6 +668,13 @@ int gui_no_filename=0; +#ifdef HAS_DVBIN_SUPPORT + dvb_prev_next.prev = dvb_prev_next.next = -1; + dvb_history = &dvb_prev_next; +#endif + + + srand((int) time(NULL)); mp_msg_init(); @@ -928,7 +942,7 @@ } #endif - if(!filename && !vcd_track && !dvd_title && !dvd_nav && !tv_param_on){ + if(!filename && !vcd_track && !dvd_title && !dvd_nav && !tv_param_on && !dvbin_param_on){ if(!use_gui){ // no file/vcd/dvd -> show HELP: mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text); @@ -2641,7 +2655,21 @@ #endif } } - } break; + } +#ifdef HAS_DVBIN_SUPPORT + if(dvbin_param_on == 1) + { + int v = cmd->args[0].v.i; + if(v > 0) + dvb_history = dvb_step_channel((dvb_priv_t*)(demuxer->stream->priv), DVB_CHANNEL_HIGHER, dvb_history); + else + dvb_history = dvb_step_channel((dvb_priv_t*)(demuxer->stream->priv), DVB_CHANNEL_LOWER, dvb_history); + uninit_player(INITED_ALL); + goto goto_next_file; + } +#endif + + break; case MP_CMD_TV_SET_CHANNEL : { if (tv_param_on == 1) { tv_set_channel((tvi_handle_t*)(demuxer->priv), cmd->args[0].v.s); @@ -3363,7 +3391,11 @@ } #endif -if(use_gui || playtree_iter != NULL){ +if(use_gui || playtree_iter != NULL +#ifdef HAS_DVBIN_SUPPORT + || dvbin_param_on +#endif + ){ eof = 0; goto play_next_file;