mplayer.hg: stream/stream_dvb.c comparison

comparison stream/stream_dvb.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.

author	diego
date	Wed, 13 May 2009 02:58:57 +0000
parents	9e739bdb049c
children	b5e34617a096

comparison

equal deleted inserted replaced

-:7d545a6b8aff
+:0f1b5b68af32
 	char tmp_lcr[256], tmp_hier[256], inv[256], bw[256], cr[256], mod[256], transm[256], gi[256], vpid_str[256], apid_str[256];
 	const char *cbl_conf = "%d:%255[^:]:%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
 	const char *sat_conf = "%d:%c:%d:%d:%255[^:]:%255[^:]\n";
 	const char *ter_conf = "%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
 	const char *atsc_conf = "%d:%255[^:]:%255[^:]:%255[^:]\n";
 	mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type);
 	if((f=fopen(filename, "r"))==NULL)
 	{
 		mp_msg(MSGT_DEMUX, MSGL_FATAL, "CAN'T READ CONFIG FILE %s\n", filename);
 		return NULL;
 			{
 				ptr->pids_cnt = pcnt;
 				fields++;
 			}
 		}
 		if(apid_str[0])
 		{
 			cnt = ptr->pids_cnt;
 			pcnt = sscanf(apid_str, "%d+%d+%d+%d+%d+%d+%d+%d", &ptr->pids[cnt], &ptr->pids[cnt+1], &ptr->pids[cnt+2],
 				&ptr->pids[cnt+3], &ptr->pids[cnt+4], &ptr->pids[cnt+5], &ptr->pids[cnt+6], &ptr->pids[cnt+7]);
 		}
 		mp_msg(MSGT_DEMUX, MSGL_V, " PIDS: ");
 		for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
 			mp_msg(MSGT_DEMUX, MSGL_V, " %d ", ptr->pids[cnt]);
 		mp_msg(MSGT_DEMUX, MSGL_V, "\n");
 		if((type == TUNER_TER) || (type == TUNER_CBL))
 		{
 			if(! strcmp(inv, "INVERSION_ON"))
 				ptr->inv = INVERSION_ON;
 			else if(! strcmp(inv, "INVERSION_OFF"))
 				ptr->cr =FEC_7_8;
 			else if(! strcmp(cr, "FEC_NONE"))
 				ptr->cr =FEC_NONE;
 			else ptr->cr =FEC_AUTO;
 		}
 		if((type == TUNER_TER) || (type == TUNER_CBL) || (type == TUNER_ATSC))
 		{
 			if(! strcmp(mod, "QAM_128"))
 				ptr->mod = QAM_128;
 				ptr->mod = QAM_64;
 			else if(! strcmp(mod, "QAM_32"))
 				ptr->mod = QAM_32;
 			else if(! strcmp(mod, "QAM_16"))
 				ptr->mod = QAM_16;
 #ifdef DVB_ATSC
 			else if(! strcmp(mod, "VSB_8") || ! strcmp(mod, "8VSB"))
 				ptr->mod = VSB_8;
 			else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB"))
 				ptr->mod = VSB_16;
 			else if(! strcmp(gi, "GUARD_INTERVAL_1_16"))
 				ptr->gi = GUARD_INTERVAL_1_16;
 			else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
 				ptr->gi = GUARD_INTERVAL_1_8;
 			else ptr->gi = GUARD_INTERVAL_1_4;
 			if(! strcmp(tmp_lcr, "FEC_1_2"))
 				ptr->cr_lp =FEC_1_2;
 			else if(! strcmp(tmp_lcr, "FEC_2_3"))
 				ptr->cr_lp =FEC_2_3;
 			else if(! strcmp(tmp_lcr, "FEC_3_4"))
 			else if(! strcmp(tmp_lcr, "FEC_7_8"))
 				ptr->cr_lp =FEC_7_8;
 			else if(! strcmp(tmp_lcr, "FEC_NONE"))
 				ptr->cr_lp =FEC_NONE;
 			else ptr->cr_lp =FEC_AUTO;
 			if(! strcmp(tmp_hier, "HIERARCHY_1"))
 				ptr->hier = HIERARCHY_1;
 			else if(! strcmp(tmp_hier, "HIERARCHY_2"))
 				ptr->hier = HIERARCHY_2;
 			else if(! strcmp(tmp_hier, "HIERARCHY_4"))
 void dvb_free_config(dvb_config_t *config)
 {
 	int i, j;
 	for(i=0; i<config->count; i++)
 	{
 		if(config->cards[i].name)
 			free(config->cards[i].name);
 		if(!config->cards[i].list)
 			continue;
 					free(config->cards[i].list->channels[j].name);
 			}
 			free(config->cards[i].list->channels);
 		}
 		free(config->cards[i].list);
 	}
 	free(config);
 }
 static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
 {
 	dvb_priv_t *priv  = (dvb_priv_t *) stream->priv;
 	mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size);
 	tries = priv->retry + 1;
 	fd = stream->fd;
 	while(pos < size)
 	{
 		pfds[0].fd = fd;
 		pfds[0].events = POLLIN | POLLPRI;
 		{
 			pos += rk;
 			mp_msg(MSGT_DEMUX, MSGL_DBG3, "ret (%d) bytes\n", pos);
 		}
 	}
 	if(! pos)
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, return %d bytes\n", pos);
 	return pos;
 	if((card < 0) || (card > conf->count))
 	{
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CARD NUMBER: %d vs %d, abort\n", card, conf->count);
 		return 0;
 	}
 	devno = conf->cards[card].devno;
 	new_list = conf->cards[card].list;
 	if((n > new_list->NUM_CHANNELS) || (n < 0))
 	{
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, for card %d, abort\n", n, card);
 		return 0;
 	}
 	channel = &(new_list->channels[n]);
 	if(priv->is_on)	//the fds are already open and we have to stop the demuxers
 	{
 		for(i = 0; i < priv->demux_fds_cnt; i++)
 			dvb_demux_stop(priv->demux_fds[i]);
 		priv->retry = 0;
 		while(dvb_streaming_read(stream, buf, 4096) > 0);	//empty both the stream's and driver's buffer
 		if(priv->card != card)
 		{
 			dvbin_close(stream);
 				mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
 				return 0;
 			}
 		}
 		else	//close all demux_fds with pos > pids required for the new channel or open other demux_fds if we have too few
 		{
 			if(! dvb_fix_demuxes(priv, channel->pids_cnt))
 				return 0;
 		}
 	}
 	else
 	for(i = 0; i < channel->pids_cnt; i++)
 	{
 		if(! dvb_set_ts_filt(priv->demux_fds[i], channel->pids[i], DMX_PES_OTHER))
 			return 0;
 	}
 	return 1;
 }
 		free(priv);
 		mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card);
 		return STREAM_ERROR;
 	}
 	priv->timeout = p->timeout;
 	tuner_type = priv->config->cards[priv->card].type;
 	if(tuner_type == 0)
 	{
 		free(priv);
 	mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d\n",
 		p->prog, priv->card+1, priv->tuner_type);
 	priv->list = priv->config->cards[priv->card].list;
 	if((! strcmp(p->prog, "")) && (priv->list != NULL))
 		progname = priv->list->channels[0].name;
 	else
 		progname = p->prog;
 	stream->type = STREAMTYPE_DVB;
 	stream->fill_buffer = dvb_streaming_read;
 	stream->close = dvbin_close;
 	m_struct_free(&stream_opts, opts);
 	*file_format = DEMUXER_TYPE_MPEG_TS;
 	return STREAM_OK;
 }
 	int i, fd, type, size;
 	char filename[30], *conf_file, *name;
 	dvb_channels_list *list;
 	dvb_card_config_t *cards = NULL, *tmp;
 	dvb_config_t *conf = NULL;
 	conf = malloc(sizeof(dvb_config_t));
 	if(conf == NULL)
 		return NULL;
 	conf->priv = NULL;
 	conf->count = 0;
 	conf->cards = NULL;
 	for(i=0; i<MAX_CARDS; i++)
 	{
 		snprintf(filename, sizeof(filename), "/dev/dvb/adapter%d/frontend0", i);
 		if(fd < 0)
 		{
 			mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename);
 			continue;
 		}
 		type = dvb_get_tuner_type(fd);
 		close(fd);
 		if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL && type != TUNER_ATSC)
 		{
 			mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't detect tuner type of card %d, skipping\n", i);
 			continue;
 		}
 		switch(type)
 		{
 			case TUNER_TER:
 			conf_file = get_path("channels.conf.ter");
 				break;
 				break;
 			case TUNER_ATSC:
 			conf_file = get_path("channels.conf.atsc");
 				break;
 		}
 		if((access(conf_file, F_OK | R_OK) != 0))
 		{
 			if(conf_file)
 				free(conf_file);
 			conf_file = get_path("channels.conf");
 		list = dvb_get_channels(conf_file, type);
 		if(conf_file)
 			free(conf_file);
 		if(list == NULL)
 			continue;
 		size = sizeof(dvb_card_config_t) * (conf->count + 1);
 		tmp = realloc(conf->cards, size);
 		if(tmp == NULL)
 		{
 const stream_info_t stream_info_dvb = {
 	"Dvb Input",
 	"dvbin",
 	"Nico",
 	"based on the code from ??? (probably Arpi)",
 	dvb_open,
 	{ "dvb", NULL },
 	&stream_opts,
 	1 				// Urls are an option string
 };

Mercurial > mplayer.hg

comparison stream/stream_dvb.c @ 29263:0f1b5b68af32