diff -Naur MPlayer-20030502/cfg-common.h MPlayer-20030502-new/cfg-common.h --- MPlayer-20030502/cfg-common.h 2003-04-21 19:16:49.000000000 +0200 +++ MPlayer-20030502-new/cfg-common.h 2003-05-02 22:33:11.000000000 +0200 @@ -322,7 +322,7 @@ #ifdef HAS_DVBIN_SUPPORT #include "libmpdemux/dvbin.h" -extern struct config dvbin_opts_conf[]; +extern m_config_t dvbin_opts_conf[]; #endif extern int audio_stream_cache; diff -Naur MPlayer-20030502/libmpdemux/demux_ts.c MPlayer-20030502-new/libmpdemux/demux_ts.c --- MPlayer-20030502/libmpdemux/demux_ts.c 2003-04-28 18:43:48.000000000 +0200 +++ MPlayer-20030502-new/libmpdemux/demux_ts.c 2003-05-02 22:52:57.000000000 +0200 @@ -183,7 +183,7 @@ mp_msg(MSGT_DEMUX, MSGL_V, "BUF: %02x %02x %02x %02x, PID %d, SIZE: %d \n", ptr[0], ptr[1], ptr[2], ptr[3], pid, size); - if(pid == 8191) + if((pid == 8191) || (pid < 16)) continue; cc[pid] = (ptr[3] & 0xf); @@ -598,6 +598,8 @@ mp_msg(MSGT_DEMUX, MSGL_DBG2, "new TS pid=%u\n", pid); } + if((pid < 16) || (pid == 8191)) //invalid pid + continue; cc = (packet[3] & 0xf); cc_ok = (tss->last_cc < 0) || ((((tss->last_cc + 1) & 0x0f) == cc)); if(! cc_ok) diff -Naur MPlayer-20030502/libmpdemux/dvbin.c MPlayer-20030502-new/libmpdemux/dvbin.c --- MPlayer-20030502/libmpdemux/dvbin.c 2003-03-16 21:13:28.000000000 +0100 +++ MPlayer-20030502-new/libmpdemux/dvbin.c 2003-05-02 22:59:13.000000000 +0200 @@ -23,7 +23,7 @@ */ -// Linux includes: +#include "config.h" #include #include #include @@ -31,68 +31,81 @@ #include #include #include -#include -#include +//#include #include -#include -#include -#include #include -#include -#include -#include #include #include -#include -#include "config.h" - -// DVB includes: +//#include #include "stream.h" #include "demuxer.h" - -#include "../cfgparser.h" +#include "help_mp.h" +#include "../m_option.h" +#include "../m_struct.h" #include "dvbin.h" -#include "dvb_defaults.h" - -extern int video_id, audio_id, demuxer_type; #define MAX_CHANNELS 8 +#define CHANNEL_LINE_LEN 256 +#define min(a, b) ((a) <= (b) ? (a) : (b)) -#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 ", - *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}, - {"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} +static struct stream_priv_s + { + char *prog; + int card; + char *type; + int vid, aid; + char *file; + } +stream_defaults = + { + "", 1, "SAT", 0, 0, "channels.conf" + }; + +#define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f) + +/// URL definition +static m_option_t stream_params[] = { + {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL}, + {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, + {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL}, + {"vid", ST_OFF(vid), CONF_TYPE_INT, 0, 0 ,0, NULL}, + {"aid", ST_OFF(aid), CONF_TYPE_INT, 0, 0 ,0, NULL}, + {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL}, + + {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL }, + {"filename", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} }; +static struct m_struct_st stream_opts = { + "dvbin", + sizeof(struct stream_priv_s), + &stream_defaults, + stream_params +}; + + + +int dvbin_param_on; + + +m_option_t dvbin_opts_conf[] = { + {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL}, + {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, + {"type", &stream_defaults.type, CONF_TYPE_STRING, 0, 0 ,0, NULL}, + {"vid", &stream_defaults.vid, CONF_TYPE_INT, 0, 0 ,0, NULL}, + {"aid", &stream_defaults.aid, CONF_TYPE_INT, 0, 0 ,0, NULL}, + {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL}, + + {NULL, NULL, 0, 0, 0, 0, NULL} +}; + + int card=0; @@ -105,16 +118,20 @@ fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate); extern char *frontenddev[4], *dvrdev[4], *secdev[4], *demuxdev[4]; +dvb_channels_list *list_ptr = NULL; +static char prev_tuning[CHANNEL_LINE_LEN]; + dvb_channels_list *dvb_get_channels(char *filename, const char *type) { dvb_channels_list *list; FILE *f; - uint8_t line[128]; + uint8_t line[CHANNEL_LINE_LEN]; + int fields, row_count; dvb_channel_t *ptr; char *tmp_lcr, *tmp_hier, *inv, *bw, *cr, *mod, *transm, *gi; - //const char *cbl_conf = "%a[^:]:%d:%c:%d:%a[^:]:%a[^:]:%d:%d\n"; + const char *cbl_conf = "%a[^:]:%d:%c:%d:%a[^:]:%a[^:]:%d:%d\n"; const char *sat_conf = "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d:%d\n"; const char *ter_conf = "%a[^:]:%d:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%d:%d\n"; @@ -136,10 +153,10 @@ row_count = 0; while(! feof(f) && row_count < 512) { - if( fgets(line, 128, f) == NULL ) continue; + if( fgets(line, CHANNEL_LINE_LEN, f) == NULL ) continue; if(line[0] == '#') - continue; //comment line + continue; ptr = &(list->channels[ list->NUM_CHANNELS ]); @@ -243,6 +260,7 @@ } fclose(f); + list->current = 0; return list; } @@ -256,18 +274,21 @@ -int dvb_streaming_read(int fd, char *buffer, unsigned int size, dvb_priv_t *priv) +static int dvb_streaming_read(stream_t *stream, char *buffer, int size) { struct pollfd pfds[1]; - uint32_t ok = 0, pos = 0, tot = 0, rk, d, r, m; + uint32_t ok = 0, tot = 0, rk, d, r, m; + int pos=0; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "dvb_streaming_read(%u)\n", fd); + int fd = stream->fd; + dvb_priv_t *priv = stream->priv; + + mp_msg(MSGT_DEMUX, MSGL_V, "dvb_streaming_read(%u)\n", fd); while(pos < size) { ok = 0; tot = 0; - //int m = min((size-pos), 188); m = size - pos; d = (int) (m / 188); r = m % 188; @@ -278,48 +299,145 @@ pfds[0].fd = fd; pfds[0].events = POLLIN | POLLPRI; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "DEVICE: %d, DVR: %d, PIPE: %d <-> %d\n", fd, priv->dvr_fd, priv->input, priv->output); - poll(pfds, 1, 500); if((rk = read(fd, &buffer[pos], m)) > 0) pos += rk; } + mp_msg(MSGT_DEMUX, MSGL_V, "dvb_streaming_read, return %d bytes\n", pos); return pos; } +extern int video_id, audio_id; +int dvb_set_channel(stream_t *stream, int n, int to_be_open) +{ + dvb_channels_list *list; + dvb_channel_t *channel; + char new_tuning[CHANNEL_LINE_LEN]; + int do_tuning; + dvb_priv_t *priv = (dvb_priv_t*) stream->priv; + + if(! to_be_open) //the fds are already open and we have to stop the demuxers + { + demux_stop(priv->demux_fd[0]); + demux_stop(priv->demux_fd[1]); + } + + mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: channel %d\n", n); + list = priv->list; + if(list == NULL) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: LIST NULL PTR, quit\n"); + return 0; + } + + list->current = n; + channel = &(list->channels[list->current]); + mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s\n", channel->name); + + switch(priv->tuner_type) + { + case TUNER_SAT: + sprintf(new_tuning, "%d|%09d|%09d|%d|%c", priv->card, channel->freq, channel->srate, channel->diseqc, channel->pol); + break; + + case TUNER_TER: + sprintf(new_tuning, "%d|%09d|%d|%d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv, + channel->bw, channel->cr, channel->mod, channel->trans, channel->gi); + break; + + + //case TUNER_CBL: + // sprintf(prev_tune, "%09d|%d|%d|%d|%d|%d|%d", priv->freq, channel->specInv, channel->modulation, + // channel->HP_CodeRate, channel->modulation, channel->TransmissionMode, channel->guardInterval); + // break; + + } + + + + if(strcmp(prev_tuning, new_tuning)) + { + mp_msg(MSGT_DEMUX, MSGL_INFO, "DIFFERENT TUNING THAN THE PREVIOUS: %s -> %s\n", prev_tuning, new_tuning); + strcpy(prev_tuning, new_tuning); + do_tuning = 1; + } + else + { + mp_msg(MSGT_DEMUX, MSGL_INFO, "SAME TUNING, NO TUNING\n"); + do_tuning = 0; + } + + stream->eof=1; + stream_reset(stream); + + if(do_tuning) + if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone, + channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr)) + return 0; + + if(to_be_open) //only the first time + { + if((priv->demux_fd[0] = open(demuxdev[priv->card], O_RDWR)) < 0) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DEMUX %i: ", n); + return 0; + } + + if((priv->demux_fd[1] = open(demuxdev[priv->card], O_RDWR)) < 0) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DEMUX %i: ", n); + return 0; + } + + + if((priv->dvr_fd = open(dvrdev[card], O_RDONLY| O_NONBLOCK)) < 0) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "DVR DEVICE: "); + return 0; + } + } + + + //sets demux filters and restart the stream + set_ts_filt(priv->demux_fd[0], channel->vpid, DMX_PES_VIDEO); + set_ts_filt(priv->demux_fd[1], channel->apid1, DMX_PES_AUDIO); + + video_id = channel->vpid; + audio_id = channel->apid1; + + return 1; +} -dvb_history_t *dvb_step_channel(dvb_priv_t *priv, int dir, dvb_history_t *h) +int dvb_step_channel(stream_t *stream, 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; + dvb_priv_t *priv = (dvb_priv_t*) stream->priv; + 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,358 +445,233 @@ return 0; new_current = list->current - 1; - next = &(list->channels[new_current]); - } - demux_stop(priv->demux_fd[0]); - demux_stop(priv->demux_fd[1]); - - h->prev = list->current; - h->next = new_current; - - list->current = new_current; - - return h; + + return dvb_set_channel(stream, new_current, 0); } -extern char *get_path(char *); -dvb_channels_list *list_ptr = NULL; -int dvb_streaming_start(stream_t *stream) -{ - int pids[MAX_CHANNELS]; - int pestypes[MAX_CHANNELS]; - int npids, i; - char *filename, type[80]; - unsigned long freq = 0; - char pol = 0; - unsigned long srate = 0; - int diseqc = 0, old_diseqc = 0; - int tone = -1; - dvb_priv_t *priv; - dvb_channel_t *channel = NULL; - fe_spectral_inversion_t specInv = INVERSION_AUTO; - fe_modulation_t modulation = CONSTELLATION_DEFAULT; - fe_transmit_mode_t TransmissionMode = TRANSMISSION_MODE_DEFAULT; - fe_bandwidth_t bandWidth = BANDWIDTH_DEFAULT; - 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; +extern char *get_path(char *); - if(!strncmp(dvbin_param_type, "CBL", 3)) - strncpy(type, "CBL", 3); - else if(!strncmp(dvbin_param_type, "TER", 3)) - strncpy(type, "TER", 3); - else - strncpy(type, "SAT", 3); - filename = get_path("channels.conf"); +static int dvb_streaming_start(stream_t *stream, struct stream_priv_s *opts, int tuner_type) +{ + int pids[MAX_CHANNELS], pestypes[MAX_CHANNELS], npids = 0, i, do_tuning=0; + dvb_priv_t *priv = (dvb_priv_t*) stream->priv; + dvb_channel_t *channel = NULL; + + + 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, PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s\n", dvbin_param_on, + opts->prog, opts->card, opts->vid, opts->aid, opts->type); - if(list_ptr == NULL) - { - if(filename) - { - if((list_ptr = dvb_get_channels(filename, type)) == NULL) - mp_msg(MSGT_DEMUX, MSGL_WARN, "EMPTY CHANNELS LIST!\n"); - else - { - priv->list = list_ptr; - priv->list->current = 0; - } + + + if(strlen(opts->prog)) + { + if(list_ptr != NULL) + { + i = 0; + while((channel == NULL) && i < list_ptr->NUM_CHANNELS) + { + if(! strcmp(list_ptr->channels[i].name, opts->prog)) + channel = &(list_ptr->channels[i]); + + i++; + } + + if(channel != NULL) + { + 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); + } + else if(opts->prog) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", opts->prog); + return 0; + } } else { - list_ptr = NULL; - mp_msg(MSGT_DEMUX, MSGL_WARN, "NO CHANNELS FILE FOUND!\n"); + mp_msg(MSGT_DEMUX, MSGL_ERR, "DVBIN: chanel %s requested, but no channel list supplied %s\n", opts->prog); + return 0; } } + - 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); - - npids = 0; - - if((dvb_prev_next.next > -1) && (dvb_prev_next.prev > -1) && (list_ptr != NULL)) //We are after a channel stepping + if(opts->vid > 0) { - 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)) - { - i = 0; - while((channel == NULL) && i < list_ptr->NUM_CHANNELS) - { - if(! strcmp(list_ptr->channels[i].name, dvbin_param_prog)) - channel = &(list_ptr->channels[i]); - - i++; - } - if(channel != NULL) - { - 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); - - } - } - - - if(dvbin_param_vid > 0) - { - pids[npids] = priv->channel.vpid = dvbin_param_vid; + pids[npids] = opts->vid; } else if(channel != NULL) { - pids[npids] = priv->channel.vpid = channel->vpid; + pids[npids] = channel->vpid; } pestypes[npids] = DMX_PES_VIDEO; npids++; - if(dvbin_param_aid > 0) + if(opts->aid > 0) { - pids[npids] = priv->channel.apid1 = dvbin_param_aid; + pids[npids] = opts->aid; } else if(channel != NULL) { - pids[npids] = priv->channel.vpid = channel->apid1; + pids[npids] = channel->apid1; } pestypes[npids] = DMX_PES_AUDIO; npids++; + + card = opts->card - 1; + priv->card = card; + + + strcpy(prev_tuning, ""); + if(!dvb_set_channel(stream, list_ptr->current, 1)) + { + mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR, COULDN'T SET CHANNEL %i: ", list_ptr->current); + return 0; + } + + + stream->fd = priv->dvr_fd; + dvbin_param_on = 1; - if(dvbin_param_freq) - freq = dvbin_param_freq * 1000UL; - else if(channel != NULL) - freq = channel->freq; + mp_msg(MSGT_DEMUX, MSGL_V, "SUCCESSFUL EXIT from dvb_streaming_start\n"); + + return 1; +} - if(dvbin_param_srate) - srate = dvbin_param_srate * 1000UL; - else if(channel != NULL) - srate = channel->srate; +int dvbin_close(dvb_priv_t *priv) +{ + //close(priv->dvr_fd); + close(priv->demux_fd[0]); + close(priv->demux_fd[1]); +} - 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) - 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) - specInv = channel->inv; - else - specInv = INVERSION_AUTO; +static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format) +{ + // I don't force the file format bacause, although it's almost always TS, + // there are some providers that stream an IP multicast with M$ Mpeg4 inside + struct stream_priv_s* p = (struct stream_priv_s*)opts; + char *name = NULL, *filename, *type; + dvb_priv_t *priv; + int tuner_type; + + printf("OPEN_DVB: prog=%s, card=%d, type=%s, vid=%d, aid=%d, file=%s\n", p->prog, p->card, p->type, p->vid, p->aid, p->file); + + if(mode != STREAM_READ) + return STREAM_UNSUPORTED; + stream->priv = (dvb_priv_t*) malloc(sizeof(dvb_priv_t)); + if(stream->priv == NULL) + return STREAM_ERROR; + priv = (dvb_priv_t*) stream->priv; - if(dvbin_param_mod) + type = malloc(sizeof(char)*4); + name = malloc(sizeof(char)*128); + + if((name == NULL) || (type == NULL)) { - 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; - } + mp_msg(MSGT_DEMUX, MSGL_ERR, "COULDN'T MALLOC SOME TMP MEMORY, EXIT!\n"); + return STREAM_ERROR; } - else if(channel != NULL) - modulation = channel->mod; - else - modulation=CONSTELLATION_DEFAULT; - - - if(dvbin_param_gi) + + if(!strncmp(p->type, "CBL", 3)) { - 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; - } + strcpy(type, "CBL"); + tuner_type = TUNER_CBL; } - else if(channel != NULL) - guardInterval = channel->gi; - else - guardInterval=GUARD_INTERVAL_DEFAULT; - - if(dvbin_param_tm) + else if(!strncmp(p->type, "TER", 3)) { - 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); - } + strcpy(type, "TER"); + tuner_type = TUNER_TER; } - 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; - } + strcpy(type, "SAT"); + tuner_type = TUNER_SAT; } - else if(channel != NULL) - bandWidth = channel->bw; - else - bandWidth=BANDWIDTH_DEFAULT; - - if(dvbin_param_cr) + p->type = type; + priv->tuner_type = tuner_type; + + if(list_ptr == NULL) { - switch(dvbin_param_cr) + filename = get_path(p->file); + if(filename) + { + if((list_ptr = dvb_get_channels(filename, p->type)) == NULL) + mp_msg(MSGT_DEMUX, MSGL_INFO, "EMPTY CHANNELS LIST FROM FILE %s!\n", filename); + else + { + priv->list = list_ptr; + } + } + else { - 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; + list_ptr = NULL; + mp_msg(MSGT_DEMUX, MSGL_WARN, "NO CHANNELS FILE FOUND!\n"); } } - 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; + priv->list = list_ptr; - 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]); - priv->channel.freq = freq; - priv->channel.srate = srate; - priv->channel.diseqc = diseqc; - priv->channel.pol = pol; - priv->channel.tone = tone; - priv->channel.inv = specInv; - priv->channel.mod = modulation; - priv->channel.gi = guardInterval; - priv->channel.trans = TransmissionMode; - priv->channel.bw = bandWidth; - priv->channel.cr = HP_CodeRate; - - if(freq && pol && srate) - if (! dvb_tune(priv, freq, pol, srate, diseqc, tone, specInv, modulation, guardInterval, TransmissionMode, bandWidth, HP_CodeRate)) - return 0; - - for (i=0; i < npids; i++) + if(! strcmp(p->prog, "")) { - if((priv->demux_fd[i] = open(demuxdev[card], O_RDWR)) < 0) - { - mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DEMUX %i: ", i); - return -1; - } + if(list_ptr != NULL) + { + dvb_channel_t *channel; + + channel = &(list_ptr->channels[list_ptr->current]); + p->prog = channel->name; + } } - - if((priv->dvr_fd = open(dvrdev[card], O_RDONLY| O_NONBLOCK)) < 0) + + + if(! dvb_streaming_start(stream, p, tuner_type)) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "DVR DEVICE: "); - return -1; + free(stream->priv); + stream->priv = NULL; + return STREAM_ERROR; } - - /* Now we set the filters */ - for (i=0; i< npids; i++) - { - set_ts_filt(priv->demux_fd[i], pids[i], pestypes[i]); - //make_nonblock(fd[i]); - } + stream->type = STREAMTYPE_DVB; + stream->fill_buffer = dvb_streaming_read; + m_struct_free(&stream_opts, opts); + + return STREAM_OK; +} - stream->fd = priv->dvr_fd; - dvbin_is_active = 1; +stream_info_t stream_info_dvb = { + "Dvb Input", + "dvbin", + "Albeu", + "based on the code from ??? (probably Arpi)", + dvb_open, //open_dvb_stream, + { "dvb", NULL }, + &stream_opts, + 1 // Urls are an option string +}; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "ESCO da dvb_streaming_start(s)\n"); - return 1; -} -int dvbin_close(dvb_priv_t *priv) -{ - //close(priv->dvr_fd); - close(priv->demux_fd[0]); - close(priv->demux_fd[1]); -} diff -Naur MPlayer-20030502/libmpdemux/dvbin.h MPlayer-20030502-new/libmpdemux/dvbin.h --- MPlayer-20030502/libmpdemux/dvbin.h 2003-03-16 23:59:16.000000000 +0100 +++ MPlayer-20030502-new/libmpdemux/dvbin.h 2003-05-02 22:24:57.000000000 +0200 @@ -2,6 +2,9 @@ #ifndef DVBIN_H #define DVBIN_H +#include "dvb_defaults.h" +#include "stream.h" + #ifdef HAVE_DVB_HEAD #include #include @@ -56,6 +59,7 @@ typedef struct { + int card; int fe_fd; int sec_fd; int demux_fd[3]; @@ -64,37 +68,19 @@ int output; int discard; - dvb_channel_t channel; dvb_channels_list *list; + int tuner_type; } dvb_priv_t; -extern dvb_history_t *dvb_step_channel(dvb_priv_t*, int, dvb_history_t*); +#define TUNER_SAT 1 +#define TUNER_TER 2 +#define TUNER_CBL 3 + +extern int dvb_step_channel(stream_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-20030502/libmpdemux/dvb_tune.c MPlayer-20030502-new/libmpdemux/dvb_tune.c --- MPlayer-20030502/libmpdemux/dvb_tune.c 2003-03-16 21:13:28.000000000 +0100 +++ MPlayer-20030502-new/libmpdemux/dvb_tune.c 2003-05-02 22:00:01.000000000 +0200 @@ -47,7 +47,6 @@ #endif #include "dvbin.h" -#include "dvb_defaults.h" #include "../mp_msg.h" @@ -97,7 +96,7 @@ if ((i = ioctl(fd, DMX_SET_PES_FILTER, &pesFilterParams)) < 0) { - mp_msg(MSGT_DEMUX, MSGL_DBG2, "ERROR IN SETTING DMX_FILTER %i: ", pid); + mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR IN SETTING DMX_FILTER %i: ", pid); } mp_msg(MSGT_DEMUX, MSGL_V, "SET PES FILTER ON PID %d, RESULT: %d\n", pid, i ); @@ -116,7 +115,6 @@ } - void make_nonblock(int f) { int oldflags; @@ -139,18 +137,15 @@ fe_transmit_mode_t TransmissionMode, fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth); -//int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone) dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone, fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval, fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate) { mp_msg(MSGT_DEMUX, MSGL_DBG2, "dvb_tune con Freq: %lu, pol: %c, srate: %lu, diseqc %d, tone %d\n", freq, pol, srate, diseqc, tone); - /* INPUT: frequency, polarization, srate */ if(freq > 100000000) { if(open_fe(&(priv->fe_fd), 0)) { - //tune_it(fd_frontend, 0, freq, 0, 0, tone, specInv, diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth); tune_it(priv->fe_fd, 0, freq, 0, 0, tone, specInv, diseqc, modulation, HP_CodeRate, TransmissionMode, guardInterval, bandWidth); close(priv->fe_fd); @@ -170,18 +165,6 @@ return 0; } - priv->channel.freq = freq; - priv->channel.srate = srate; - priv->channel.pol = pol; - priv->channel.diseqc = diseqc; - priv->channel.tone = tone; - priv->channel.inv = specInv; - priv->channel.mod = modulation; - priv->channel.gi = guardInterval; - priv->channel.trans = TransmissionMode; - priv->channel.bw = bandWidth; - priv->channel.cr = HP_CodeRate; - return 1; } @@ -585,6 +568,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 +586,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-20030502/libmpdemux/open.c MPlayer-20030502-new/libmpdemux/open.c --- MPlayer-20030502/libmpdemux/open.c 2003-04-10 12:59:12.000000000 +0200 +++ MPlayer-20030502-new/libmpdemux/open.c 2003-05-02 22:38:30.000000000 +0200 @@ -30,8 +30,6 @@ static URL_t* url; #endif -int dvbin_param_on=0; - /// We keep these 2 for the gui atm, but they will be removed. int dvd_title=0; int vcd_track=0; @@ -71,11 +69,6 @@ #include "cue_read.h" -#ifdef HAS_DVBIN_SUPPORT -#include "dvbin.h" -#endif - - // Define function about auth the libsmbclient library // FIXME: I really do not not is this function is properly working @@ -453,18 +446,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-20030502/libmpdemux/stream.c MPlayer-20030502-new/libmpdemux/stream.c --- MPlayer-20030502/libmpdemux/stream.c 2003-04-12 15:53:33.000000000 +0200 +++ MPlayer-20030502-new/libmpdemux/stream.c 2003-05-02 22:48:21.000000000 +0200 @@ -52,6 +52,10 @@ #endif extern stream_info_t stream_info_null; extern stream_info_t stream_info_file; +#ifdef HAS_DVBIN_SUPPORT +extern stream_info_t stream_info_dvb; +#endif + stream_info_t* auto_open_streams[] = { #ifdef HAVE_VCD @@ -63,6 +67,9 @@ #ifdef STREAMING &stream_info_netstream, #endif +#ifdef HAS_DVBIN_SUPPORT + &stream_info_dvb, +#endif &stream_info_null, &stream_info_file, NULL @@ -198,13 +205,6 @@ case STREAMTYPE_DS: len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); break; - -#ifdef HAS_DVBIN_SUPPORT - case STREAMTYPE_DVB: - len = dvb_streaming_read(s->fd, s->buffer, STREAM_BUFFER_SIZE, s->priv); - break; -#endif - default: @@ -400,11 +400,6 @@ smbc_close(s->fd); break; #endif -#ifdef HAS_DVBIN_SUPPORT - case STREAMTYPE_DVB: - dvbin_close(s->priv); - break; -#endif #ifdef USE_DVDREAD case STREAMTYPE_DVD: diff -Naur MPlayer-20030502/mplayer.c MPlayer-20030502-new/mplayer.c --- MPlayer-20030502/mplayer.c 2003-04-19 20:46:15.000000000 +0200 +++ MPlayer-20030502-new/mplayer.c 2003-05-02 22:43:38.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,13 +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)); mp_msg_init(); @@ -1321,6 +1312,7 @@ //============ Open DEMUXERS --- DETECT file type ======================= +goto_open_demuxer: current_module="demux_open"; demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename); @@ -2738,15 +2730,22 @@ #ifdef HAS_DVBIN_SUPPORT if(dvbin_param_on == 1) { + int dir; 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); + dir = DVB_CHANNEL_HIGHER; 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; + dir = DVB_CHANNEL_LOWER; + + + if(dvb_step_channel(demuxer->stream, dir)) + { + uninit_player(INITED_ALL-(INITED_STREAM)); + goto goto_open_demuxer; + } } -#endif +#endif break; case MP_CMD_TV_SET_CHANNEL : { @@ -3498,12 +3497,7 @@ } #endif -if(use_gui || playtree_iter != NULL -#ifdef HAS_DVBIN_SUPPORT - || dvbin_param_on -#endif - ){ - +if(use_gui || playtree_iter != NULL){ eof = 0; goto play_next_file; }