diff -Naur MPlayer-20030427/libmpdemux/dvbin.c MPlayer-20030427-new/libmpdemux/dvbin.c --- MPlayer-20030427/libmpdemux/dvbin.c 2003-03-16 21:13:28.000000000 +0100 +++ MPlayer-20030427-new/libmpdemux/dvbin.c 2003-04-28 00:49:22.000000000 +0200 @@ -46,17 +46,11 @@ #include #include "config.h" -// DVB includes: - #include "stream.h" #include "demuxer.h" - #include "../cfgparser.h" #include "dvbin.h" -#include "dvb_defaults.h" - -extern int video_id, audio_id, demuxer_type; #define MAX_CHANNELS 8 @@ -64,32 +58,16 @@ #define min(a, b) ((a) <= (b) ? (a) : (b)) -int dvbin_param_card, dvbin_param_freq, dvbin_param_srate, dvbin_param_diseqc = 0, - dvbin_param_tone = -1, dvbin_param_vid, dvbin_param_aid, dvbin_is_active = 0; -int dvbin_param_mod, dvbin_param_gi, dvbin_param_tm, dvbin_param_bw, dvbin_param_cr; -char *dvbin_param_pol = "", *dvbin_param_inv="INVERSION_AUTO", - *dvbin_param_type="SAT ", +int dvbin_param_card, dvbin_param_vid, dvbin_param_aid; +char *dvbin_param_type="SAT ", *dvbin_param_prog = " "; -dvb_history_t dvb_prev_next; struct config dvbin_opts_conf[] = { - {"on", &dvbin_param_on, CONF_TYPE_INT, 0, 0, 1, NULL}, + {"prog", &dvbin_param_prog, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"type", &dvbin_param_type, CONF_TYPE_STRING, 0, 0, 1, NULL}, {"card", &dvbin_param_card, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL}, - {"freq", &dvbin_param_freq, CONF_TYPE_INT, 0, 0, 1, NULL}, - {"pol", &dvbin_param_pol, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"srate", &dvbin_param_srate, CONF_TYPE_INT, 0, 0, 1, NULL}, - {"diseqc", &dvbin_param_diseqc, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL}, - {"tone", &dvbin_param_tone, CONF_TYPE_INT, 0, 0, 1, NULL}, {"vid", &dvbin_param_vid, CONF_TYPE_INT, 0, 0, 1, NULL}, {"aid", &dvbin_param_aid, CONF_TYPE_INT, 0, 0, 1, NULL}, - {"prog", &dvbin_param_prog, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"inv", &dvbin_param_inv, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"mod", &dvbin_param_mod, CONF_TYPE_INT, 0, 0, 1, NULL}, - {"gi", &dvbin_param_gi, CONF_TYPE_INT, 0, 0, 1, NULL}, - {"tm", &dvbin_param_tm, CONF_TYPE_INT, 0, 0, 1, NULL}, - {"bw", &dvbin_param_bw, CONF_TYPE_INT, 0, 0, 1, NULL}, - {"cr", &dvbin_param_cr, CONF_TYPE_INT, 0, 0, 1, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -139,7 +117,7 @@ if( fgets(line, 128, f) == NULL ) continue; if(line[0] == '#') - continue; //comment line + continue; ptr = &(list->channels[ list->NUM_CHANNELS ]); @@ -267,7 +245,6 @@ { ok = 0; tot = 0; - //int m = min((size-pos), 188); m = size - pos; d = (int) (m / 188); r = m % 188; @@ -290,36 +267,33 @@ -dvb_history_t *dvb_step_channel(dvb_priv_t *priv, int dir, dvb_history_t *h) +int dvb_step_channel(dvb_priv_t *priv, int dir) { - //int new_freq, new_srate, new_diseqc, new_tone, new_vpid, new_apid; - //char new_pol; int new_current; - dvb_channel_t *next; dvb_channels_list *list; + mp_msg(MSGT_DEMUX, MSGL_INFO, "DVB_STEP_CHANNEL dir %d\n", dir); + if(priv == NULL) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: PRIV NULL PTR, quit\n"); + mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n"); return 0; } list = priv->list; if(list == NULL) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: LIST NULL PTR, quit\n"); + mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n"); return 0; } - mp_msg(MSGT_DEMUX, MSGL_V, "DVB_STEP_CHANNEL dir %d\n", dir); - + if(dir == DVB_CHANNEL_HIGHER) { if(list->current == list->NUM_CHANNELS) return 0; - + new_current = list->current + 1; - next = &(list->channels[new_current]); } else { @@ -327,27 +301,40 @@ return 0; new_current = list->current - 1; - next = &(list->channels[new_current]); - } + dvb_set_channel(priv, new_current); + + return 1; +} + + +void *dvb_set_channel(dvb_priv_t *priv, int n) +{ + dvb_channels_list *list; + + mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL: channel %d\n", n); + list = priv->list; + if(list == NULL) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: LIST NULL PTR, quit\n"); + return 0; + } + demux_stop(priv->demux_fd[0]); demux_stop(priv->demux_fd[1]); + list->current = n; +} - h->prev = list->current; - h->next = new_current; - list->current = new_current; - return h; -} extern char *get_path(char *); dvb_channels_list *list_ptr = NULL; -int dvb_streaming_start(stream_t *stream) +int dvb_streaming_start(stream_t *stream, char *prog) { int pids[MAX_CHANNELS]; int pestypes[MAX_CHANNELS]; @@ -368,12 +355,15 @@ fe_guard_interval_t guardInterval = GUARD_INTERVAL_DEFAULT; fe_code_rate_t HP_CodeRate = HP_CODERATE_DEFAULT; - + stream->priv = (dvb_priv_t*) malloc(sizeof(dvb_priv_t)); if(stream->priv == NULL) return 0; priv = (dvb_priv_t*) stream->priv; + + dvbin_param_prog = prog; + if(!strncmp(dvbin_param_type, "CBL", 3)) strncpy(type, "CBL", 3); else if(!strncmp(dvbin_param_type, "TER", 3)) @@ -392,8 +382,8 @@ mp_msg(MSGT_DEMUX, MSGL_WARN, "EMPTY CHANNELS LIST!\n"); else { + list_ptr->current = 0; priv->list = list_ptr; - priv->list->current = 0; } } else @@ -402,50 +392,46 @@ mp_msg(MSGT_DEMUX, MSGL_WARN, "NO CHANNELS FILE FOUND!\n"); } } + else + priv->list = list_ptr; mp_msg(MSGT_DEMUX, MSGL_INFO, "code taken from dvbstream for mplayer v0.4pre1 - (C) Dave Chapman 2001\n"); mp_msg(MSGT_DEMUX, MSGL_INFO, "Released under the GPL.\n"); mp_msg(MSGT_DEMUX, MSGL_INFO, "Latest version available from http://www.linuxstb.org/\n"); - mp_msg(MSGT_DEMUX, MSGL_V, "ON: %d, CARD: %d, FREQ: %d, SRATE: %d, POL: %s, VID: %d, AID: %d\n", dvbin_param_on, - dvbin_param_card, dvbin_param_freq, dvbin_param_srate, dvbin_param_pol, dvbin_param_vid, dvbin_param_aid); + mp_msg(MSGT_DEMUX, MSGL_V, "ON: %d, PROG: %s, CARD: %d, VID: %d, AID: %d\n", dvbin_param_on, + dvbin_param_prog, dvbin_param_card, dvbin_param_vid, dvbin_param_aid); npids = 0; - - if((dvb_prev_next.next > -1) && (dvb_prev_next.prev > -1) && (list_ptr != NULL)) //We are after a channel stepping - { - list_ptr->current = dvb_prev_next.next; - channel = &(list_ptr->channels[dvb_prev_next.next]); - mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, vid=%d, aid=%d, freq=%lu, srate=%lu, pol=%c, diseqc: %d, tone: %d\n", dvb_prev_next.next, - channel->name, channel->vpid, channel->apid1, - channel->freq, channel->srate, channel->pol, channel->diseqc, channel->tone); - - - if((dvb_prev_next.prev >= 0) && (dvb_prev_next.prev < list_ptr->NUM_CHANNELS)) - { - dvb_channel_t *tmp = &(list_ptr->channels[dvb_prev_next.prev]); - old_diseqc = tmp->diseqc; - } - } - else if(list_ptr != NULL && strlen(dvbin_param_prog)) + + + if(list_ptr != NULL && strlen(dvbin_param_prog)) { i = 0; while((channel == NULL) && i < list_ptr->NUM_CHANNELS) { - if(! strcmp(list_ptr->channels[i].name, dvbin_param_prog)) + if(! strcmp(list_ptr->channels[i].name, dvbin_param_prog)) channel = &(list_ptr->channels[i]); - - i++; + i++; } if(channel != NULL) { - list_ptr->current = i-1; + list_ptr->current = i-1; mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, vid=%d, aid=%d, freq=%lu, srate=%lu, pol=%c, diseqc: %d, tone: %d\n", i-1, - channel->name, channel->vpid, channel->apid1, - channel->freq, channel->srate, channel->pol, channel->diseqc, channel->tone); + channel->name, channel->vpid, channel->apid1, + channel->freq, channel->srate, channel->pol, channel->diseqc, channel->tone); } + else + if(prog) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", prog); + return 0; + } } + else + if(! dvbin_param_on) + return 0; if(dvbin_param_vid > 0) @@ -465,166 +451,33 @@ } else if(channel != NULL) { - pids[npids] = priv->channel.vpid = channel->apid1; + pids[npids] = priv->channel.apid1 = channel->apid1; } pestypes[npids] = DMX_PES_AUDIO; npids++; - - - if(dvbin_param_freq) - freq = dvbin_param_freq * 1000UL; - else if(channel != NULL) + if(channel != NULL) + { freq = channel->freq; - - - if(dvbin_param_srate) - srate = dvbin_param_srate * 1000UL; - else if(channel != NULL) srate = channel->srate; - - if((1<= dvbin_param_diseqc) && (dvbin_param_diseqc <= 4)) - diseqc = dvbin_param_diseqc; - else - if(channel != NULL) - if(channel->diseqc != old_diseqc) - diseqc = channel->diseqc; - else - diseqc = 0; - else - diseqc = 0; - mp_msg(MSGT_DEMUX, MSGL_INFO, "DISEQC: %d\n", diseqc); - - if((dvbin_param_tone == 0) || (dvbin_param_tone == 1)) - tone = dvbin_param_tone; - else - if(channel != NULL) + diseqc = channel->diseqc; tone = channel->tone; - else - tone = -1; - - if(! strcmp(dvbin_param_pol, "V")) pol = 'V'; - else if(! strcmp(dvbin_param_pol, "H")) pol = 'H'; - else if(channel != NULL) pol = channel->pol; - else pol='V'; - pol = toupper(pol); - - - if(!strcmp(dvbin_param_inv, "INVERSION_ON")) - specInv = INVERSION_ON; - else if(!strcmp(dvbin_param_inv, "INVERSION_OFF")) - specInv = INVERSION_OFF; - else if(!strcmp(dvbin_param_inv, "INVERSION_AUTO")) - specInv = INVERSION_AUTO; - else if(channel != NULL) + pol = channel->pol; specInv = channel->inv; - else - specInv = INVERSION_AUTO; - - - if(dvbin_param_mod) - { - switch(dvbin_param_mod) - { - case 16: modulation=QAM_16; break; - case 32: modulation=QAM_32; break; - case 64: modulation=QAM_64; break; - case 128: modulation=QAM_128; break; - case 256: modulation=QAM_256; break; - default: - mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid QAM rate: %s\n", dvbin_param_mod); - modulation=CONSTELLATION_DEFAULT; - } - } - else if(channel != NULL) - modulation = channel->mod; - else - modulation=CONSTELLATION_DEFAULT; - - - if(dvbin_param_gi) - { - switch(dvbin_param_gi) - { - case 32: guardInterval=GUARD_INTERVAL_1_32; break; - case 16: guardInterval=GUARD_INTERVAL_1_16; break; - case 8: guardInterval=GUARD_INTERVAL_1_8; break; - case 4: guardInterval=GUARD_INTERVAL_1_4; break; - default: - mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid Guard Interval: %s\n", dvbin_param_gi); - guardInterval=GUARD_INTERVAL_DEFAULT; - } - } - else if(channel != NULL) - guardInterval = channel->gi; - else - guardInterval=GUARD_INTERVAL_DEFAULT; - - if(dvbin_param_tm) - { - switch(dvbin_param_tm) - { - case 8: TransmissionMode=TRANSMISSION_MODE_8K; break; - case 2: TransmissionMode=TRANSMISSION_MODE_2K; break; - default: - TransmissionMode=TRANSMISSION_MODE_DEFAULT; - mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid Transmission Mode: %s\n", dvbin_param_tm); - } + modulation = channel->mod; + guardInterval = channel->gi; + TransmissionMode = channel->trans; + bandWidth = channel->bw; + HP_CodeRate = channel->cr; } - else if(channel != NULL) - TransmissionMode = channel->trans; - else - TransmissionMode=TRANSMISSION_MODE_DEFAULT; - - - if(dvbin_param_bw) - { - switch(dvbin_param_bw) - { - case 8: bandWidth=BANDWIDTH_8_MHZ; break; - case 7: bandWidth=BANDWIDTH_7_MHZ; break; - case 6: bandWidth=BANDWIDTH_6_MHZ; break; - default: - mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid DVB-T bandwidth: %s\n", dvbin_param_bw); - bandWidth=BANDWIDTH_DEFAULT; - } - } - else if(channel != NULL) - bandWidth = channel->bw; - else - bandWidth=BANDWIDTH_DEFAULT; - - - if(dvbin_param_cr) - { - switch(dvbin_param_cr) - { - case -1: HP_CodeRate=FEC_AUTO; break; - case 12: HP_CodeRate=FEC_1_2; break; - case 23: HP_CodeRate=FEC_2_3; break; - case 34: HP_CodeRate=FEC_3_4; break; - case 56: HP_CodeRate=FEC_5_6; break; - case 78: HP_CodeRate=FEC_7_8; break; - default: - mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid Code Rate: %s\n", dvbin_param_cr); - HP_CodeRate=HP_CODERATE_DEFAULT; - } - } - else if(channel != NULL) - HP_CodeRate = channel->cr; - else - HP_CodeRate=HP_CODERATE_DEFAULT; - - card = dvbin_param_card - 1; if((card < 0) || (card > 4)) card = 0; - - dvbin_param_on = 1; - - mp_msg(MSGT_DEMUX, MSGL_V, "CARD: %d, FREQ: %d, POL: %c, SRATE: %d, DISEQC: %d, TONE: %d, VPID: %d, APID: %d\n", card, freq, pol, srate, diseqc, tone, pids[0], pids[1]); + mp_msg(MSGT_DEMUX, MSGL_V, + "CARD: %d, PROG: %s, FREQ: %d, POL: %c, SRATE: %d, DISEQC: %d, TONE: %d, VPID: %d, APID: %d\n", + card, prog, freq, pol, srate, diseqc, tone, pids[0], pids[1]); priv->channel.freq = freq; priv->channel.srate = srate; @@ -638,7 +491,7 @@ priv->channel.bw = bandWidth; priv->channel.cr = HP_CodeRate; - if(freq && pol && srate) + if(freq) if (! dvb_tune(priv, freq, pol, srate, diseqc, tone, specInv, modulation, guardInterval, TransmissionMode, bandWidth, HP_CodeRate)) return 0; @@ -668,9 +521,10 @@ stream->fd = priv->dvr_fd; - dvbin_is_active = 1; + //dvbin_is_active = 1; + dvbin_param_on = 1; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "ESCO da dvb_streaming_start(s)\n"); + mp_msg(MSGT_DEMUX, MSGL_DBG2, "EXITING dvb_streaming_start(s)\n"); return 1; } diff -Naur MPlayer-20030427/libmpdemux/dvbin.h MPlayer-20030427-new/libmpdemux/dvbin.h --- MPlayer-20030427/libmpdemux/dvbin.h 2003-03-16 23:59:16.000000000 +0100 +++ MPlayer-20030427-new/libmpdemux/dvbin.h 2003-04-27 22:05:47.000000000 +0200 @@ -2,6 +2,8 @@ #ifndef DVBIN_H #define DVBIN_H +#include "dvb_defaults.h" + #ifdef HAVE_DVB_HEAD #include #include @@ -69,32 +71,10 @@ } dvb_priv_t; -extern dvb_history_t *dvb_step_channel(dvb_priv_t*, int, dvb_history_t*); +extern int dvb_step_channel(dvb_priv_t*, int); extern dvb_channels_list *dvb_get_channels(char *, const char *); extern dvb_history_t dvb_prev_next; - - -#ifndef DVB_T_LOCATION - #ifndef UK - #warning No DVB-T country defined in dvb_defaults.h, defaulting to UK - #endif - - /* UNITED KINGDOM settings */ - #define DVB_T_LOCATION "in United Kingdom" - #define BANDWIDTH_DEFAULT BANDWIDTH_8_MHZ - #define HP_CODERATE_DEFAULT FEC_2_3 - #define CONSTELLATION_DEFAULT QAM_64 - #define TRANSMISSION_MODE_DEFAULT TRANSMISSION_MODE_2K - #define GUARD_INTERVAL_DEFAULT GUARD_INTERVAL_1_32 - #define HIERARCHY_DEFAULT HIERARCHY_NONE -#endif - -#define HIERARCHY_DEFAULT HIERARCHY_NONE -#define LP_CODERATE_DEFAULT (0) - - - #endif diff -Naur MPlayer-20030427/libmpdemux/dvb_tune.c MPlayer-20030427-new/libmpdemux/dvb_tune.c --- MPlayer-20030427/libmpdemux/dvb_tune.c 2003-03-16 21:13:28.000000000 +0100 +++ MPlayer-20030427-new/libmpdemux/dvb_tune.c 2003-04-27 23:58:54.000000000 +0200 @@ -47,7 +47,6 @@ #endif #include "dvbin.h" -#include "dvb_defaults.h" #include "../mp_msg.h" @@ -585,6 +584,7 @@ #endif +static unsigned int prev_diseqc = 0; static int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, fe_spectral_inversion_t specInv, unsigned int diseqc, fe_modulation_t modulation, fe_code_rate_t HP_CodeRate, @@ -602,6 +602,10 @@ struct secStatus sec_state; #endif + if(diseqc == prev_diseqc) + diseqc = 0; + else + prev_diseqc = diseqc; mp_msg(MSGT_DEMUX, MSGL_V, "TUNE_IT, fd_frontend %d, fd_sec %d, freq %lu, srate %lu, pol %c, tone %i, specInv, diseqc %u, fe_modulation_t modulation,fe_code_rate_t HP_CodeRate, fe_transmit_mode_t TransmissionMode,fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth\n", fd_frontend, fd_sec, freq, srate, pol, tone, diseqc); diff -Naur MPlayer-20030427/libmpdemux/open.c MPlayer-20030427-new/libmpdemux/open.c --- MPlayer-20030427/libmpdemux/open.c 2003-04-10 12:59:12.000000000 +0200 +++ MPlayer-20030427-new/libmpdemux/open.c 2003-04-28 00:37:33.000000000 +0200 @@ -122,11 +122,50 @@ int f=-1; off_t len; *file_format = DEMUXER_TYPE_UNKNOWN; -if(!filename) { + +#ifdef HAS_DVBIN_SUPPORT +if(dvbin_param_on || (filename && !strncmp("dvbin://", filename, 8))) +{ + char *name = NULL; + char *p; + + if(! dvbin_param_on) + name = filename+8; + else + { + extern dvb_channels_list *list_ptr; + dvb_channel_t *channel; + + if(list_ptr != NULL) //We are after a channel change + { + channel = &(list_ptr->channels[list_ptr->current]); + name = channel->name; + } + } + + if(name) + { + stream = new_stream(-1, STREAMTYPE_DVB); + if (!stream) + return(NULL); + if (!dvb_streaming_start(stream, name)) + return NULL; + + return stream; + } +} +#endif + +if(!filename +#ifdef HAS_DVBIN_SUPPORT +&& !dvbin_param_on +#endif +) { mp_msg(MSGT_OPEN,MSGL_ERR,"NULL filename, report this bug\n"); return NULL; } + // for opening of vcds in bincue files if(strncmp("cue://",filename,6) == 0){ int ret,ret2; @@ -453,18 +492,6 @@ } #endif -#ifdef HAS_DVBIN_SUPPORT -if(strncmp("dvbin://",filename,8) == 0) -{ - stream = new_stream(-1, STREAMTYPE_DVB); - if (!stream) - return(NULL); - if (!dvb_streaming_start(stream)) - return NULL; - - return stream; -} -#endif #ifdef STREAMING #ifdef STREAMING_LIVE_DOT_COM diff -Naur MPlayer-20030427/mplayer.c MPlayer-20030427-new/mplayer.c --- MPlayer-20030427/mplayer.c 2003-04-19 20:46:15.000000000 +0200 +++ MPlayer-20030427-new/mplayer.c 2003-04-28 00:35:12.000000000 +0200 @@ -98,8 +98,6 @@ #ifdef HAS_DVBIN_SUPPORT #include "libmpdemux/dvbin.h" -extern dvb_history_t dvb_prev_next; -dvb_history_t *dvb_history; #endif @@ -735,11 +733,6 @@ 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)); @@ -2735,15 +2728,29 @@ } } } + printf("COMMAND_STEP\n"); #ifdef HAS_DVBIN_SUPPORT if(dvbin_param_on == 1) { + play_tree_t *list = NULL, *entry = NULL; + 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); + dvb_step_channel((dvb_priv_t*)(demuxer->stream->priv), DVB_CHANNEL_HIGHER); else - dvb_history = dvb_step_channel((dvb_priv_t*)(demuxer->stream->priv), DVB_CHANNEL_LOWER, dvb_history); + dvb_step_channel((dvb_priv_t*)(demuxer->stream->priv), DVB_CHANNEL_LOWER); + + //HACK: DVBIN behaves like a playlist: next entry can be a different file, + //(diffreent resolution, bitrate, etc, so we have to open a new window. + //in addition it adds 'itself' to the playlist to handle the channel-changes. + entry = play_tree_new(); + play_tree_add_file(entry, "dvbin://"); + list = entry; + play_tree_append_entry(list,entry); + eof=playtree_add_playlist(entry); + uninit_player(INITED_ALL); + goto goto_next_file; } #endif @@ -3488,6 +3495,7 @@ break; } + #ifdef HAVE_NEW_GUI if( use_gui && !playtree_iter ) {