Mercurial > mplayer.hg
annotate libmpdemux/dvbin.c @ 17566:f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.
Comments about a similar patch applied to ffmpeg:
That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter
Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- M\ns Rullg\rd
author | rathann |
---|---|
date | Thu, 09 Feb 2006 14:08:03 +0000 |
parents | 6ff3379a0862 |
children | 0acfff9388f6 |
rev | line source |
---|---|
9610 | 1 /* |
2 | |
3 dvbstream | |
4 (C) Dave Chapman <dave@dchapman.com> 2001, 2002. | |
5 | |
6 The latest version can be found at http://www.linuxstb.org/dvbstream | |
7 | |
15178
8dd7a656eaf8
Mark modified imported files as such to comply more closely with GPL 2a.
diego
parents:
14382
diff
changeset
|
8 Modified for use with MPlayer, for details see the CVS changelog at |
8dd7a656eaf8
Mark modified imported files as such to comply more closely with GPL 2a.
diego
parents:
14382
diff
changeset
|
9 http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/ |
8dd7a656eaf8
Mark modified imported files as such to comply more closely with GPL 2a.
diego
parents:
14382
diff
changeset
|
10 $Id$ |
8dd7a656eaf8
Mark modified imported files as such to comply more closely with GPL 2a.
diego
parents:
14382
diff
changeset
|
11 |
9610 | 12 Copyright notice: |
13 | |
14 This program is free software; you can redistribute it and/or modify | |
15 it under the terms of the GNU General Public License as published by | |
16 the Free Software Foundation; either version 2 of the License, or | |
17 (at your option) any later version. | |
18 | |
19 This program is distributed in the hope that it will be useful, | |
20 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 GNU General Public License for more details. | |
23 | |
24 You should have received a copy of the GNU General Public License | |
25 along with this program; if not, write to the Free Software | |
26 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | |
27 | |
28 */ | |
29 | |
10560 | 30 #include "config.h" |
9610 | 31 #include <stdio.h> |
32 #include <stdlib.h> | |
33 #include <string.h> | |
34 #include <ctype.h> | |
35 #include <sys/ioctl.h> | |
36 #include <sys/time.h> | |
37 #include <sys/poll.h> | |
10560 | 38 #include <unistd.h> |
9610 | 39 #include <fcntl.h> |
40 #include <string.h> | |
41 #include <errno.h> | |
42 #include <fcntl.h> | |
43 | |
44 #include "stream.h" | |
45 #include "demuxer.h" | |
10560 | 46 #include "help_mp.h" |
17012 | 47 #include "m_option.h" |
48 #include "m_struct.h" | |
9610 | 49 |
50 #include "dvbin.h" | |
51 | |
52 | |
53 #define MAX_CHANNELS 8 | |
10560 | 54 #define CHANNEL_LINE_LEN 256 |
9610 | 55 #define min(a, b) ((a) <= (b) ? (a) : (b)) |
56 | |
10560 | 57 |
58 //TODO: CAMBIARE list_ptr e da globale a per_priv | |
59 | |
60 | |
61 static struct stream_priv_s | |
62 { | |
63 char *prog; | |
64 int card; | |
65 char *type; | |
66 int vid, aid; | |
67 char *file; | |
68 } | |
69 stream_defaults = | |
70 { | |
12108
06c4780332bc
disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents:
12047
diff
changeset
|
71 "", 1, "", 0, 0, NULL |
10560 | 72 }; |
73 | |
74 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f) | |
9610 | 75 |
10560 | 76 /// URL definition |
77 static m_option_t stream_params[] = { | |
78 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL}, | |
79 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, | |
80 {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL}, | |
81 {"vid", ST_OFF(vid), CONF_TYPE_INT, 0, 0 ,0, NULL}, | |
82 {"aid", ST_OFF(aid), CONF_TYPE_INT, 0, 0 ,0, NULL}, | |
83 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL}, | |
84 | |
85 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL }, | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
86 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, |
10560 | 87 {NULL, NULL, 0, 0, 0, 0, NULL} |
88 }; | |
89 | |
90 static struct m_struct_st stream_opts = { | |
91 "dvbin", | |
92 sizeof(struct stream_priv_s), | |
93 &stream_defaults, | |
94 stream_params | |
9610 | 95 }; |
96 | |
97 | |
10560 | 98 |
99 m_option_t dvbin_opts_conf[] = { | |
100 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL}, | |
101 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL}, | |
12108
06c4780332bc
disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents:
12047
diff
changeset
|
102 {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL}, |
10560 | 103 {"vid", &stream_defaults.vid, CONF_TYPE_INT, 0, 0 ,0, NULL}, |
104 {"aid", &stream_defaults.aid, CONF_TYPE_INT, 0, 0 ,0, NULL}, | |
105 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL}, | |
9610 | 106 |
10560 | 107 {NULL, NULL, 0, 0, 0, 0, NULL} |
108 }; | |
109 | |
110 | |
111 | |
112 | |
113 extern int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype); | |
114 extern int dvb_demux_stop(int fd); | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
115 extern int dvb_get_tuner_type(int fd); |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
116 int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt, int *pids); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
117 int dvb_fix_demuxes(dvb_priv_t *priv, int cnt, int *pids); |
10560 | 118 |
9610 | 119 extern int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone, |
120 fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval, | |
13155
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
121 fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate, |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
122 fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier); |
11872
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
123 extern char *dvb_dvrdev[4], *dvb_demuxdev[4], *dvb_frontenddev[4]; |
10560 | 124 |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
125 static dvb_config_t *dvb_config = NULL; |
9610 | 126 |
127 | |
10560 | 128 static dvb_channels_list *dvb_get_channels(char *filename, int type) |
9610 | 129 { |
130 dvb_channels_list *list; | |
131 FILE *f; | |
16516 | 132 char line[CHANNEL_LINE_LEN], *colon; |
10560 | 133 |
16516 | 134 int fields, cnt, pcnt, k; |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
135 dvb_channel_t *ptr, *tmp, chn; |
16516 | 136 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]; |
137 const char *cbl_conf = "%d:%255[^:]:%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n"; | |
138 const char *sat_conf = "%d:%c:%d:%d:%255[^:]:%255[^:]\n"; | |
139 const char *ter_conf = "%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n"; | |
140 const char *atsc_conf = "%d:%255[^:]:%255[^:]:%255[^:]\n"; | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
141 |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
142 mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
143 if((f=fopen(filename, "r"))==NULL) |
10560 | 144 { |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
145 mp_msg(MSGT_DEMUX, MSGL_FATAL, "CAN'T READ CONFIG FILE %s\n", filename); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
146 return NULL; |
10560 | 147 } |
148 | |
9610 | 149 list = malloc(sizeof(dvb_channels_list)); |
150 if(list == NULL) | |
151 { | |
152 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_GET_CHANNELS: couldn't malloc enough memory\n"); | |
153 return NULL; | |
154 } | |
155 | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
156 ptr = &chn; |
9610 | 157 list->NUM_CHANNELS = 0; |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
158 list->channels = NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
159 while(! feof(f)) |
9610 | 160 { |
10708 | 161 if( fgets(line, CHANNEL_LINE_LEN, f) == NULL ) |
162 continue; | |
9610 | 163 |
10708 | 164 if((line[0] == '#') || (strlen(line) == 0)) |
10560 | 165 continue; |
9610 | 166 |
16516 | 167 colon = index(line, ':'); |
168 if(colon) | |
169 { | |
170 k = colon - line; | |
171 if(!k) | |
172 continue; | |
173 ptr->name = (char*) malloc(k+1); | |
174 if(! ptr->name) | |
175 continue; | |
176 strncpy(ptr->name, line, k); | |
177 ptr->name[k] = 0; | |
178 } | |
179 else | |
180 continue; | |
181 k++; | |
182 apid_str[0] = vpid_str[0] = 0; | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
183 ptr->pids_cnt = 0; |
16516 | 184 ptr->freq = 0; |
10560 | 185 if(type == TUNER_TER) |
9610 | 186 { |
16516 | 187 fields = sscanf(&line[k], ter_conf, |
188 &ptr->freq, inv, bw, cr, tmp_lcr, mod, | |
189 transm, gi, tmp_hier, vpid_str, apid_str); | |
10708 | 190 mp_msg(MSGT_DEMUX, MSGL_V, |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
191 "TER, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d", |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
192 list->NUM_CHANNELS, fields, ptr->name, ptr->freq); |
10560 | 193 } |
194 else if(type == TUNER_CBL) | |
195 { | |
16516 | 196 fields = sscanf(&line[k], cbl_conf, |
197 &ptr->freq, inv, &ptr->srate, | |
198 cr, mod, vpid_str, apid_str); | |
10708 | 199 mp_msg(MSGT_DEMUX, MSGL_V, |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
200 "CBL, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d", |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
201 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate); |
10560 | 202 } |
14382 | 203 #ifdef DVB_ATSC |
204 else if(type == TUNER_ATSC) | |
205 { | |
16516 | 206 fields = sscanf(&line[k], atsc_conf, |
207 &ptr->freq, mod, vpid_str, apid_str); | |
14382 | 208 mp_msg(MSGT_DEMUX, MSGL_V, |
209 "ATSC, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d\n", | |
210 list->NUM_CHANNELS, fields, ptr->name, ptr->freq); | |
211 } | |
212 #endif | |
10560 | 213 else //SATELLITE |
214 { | |
16516 | 215 fields = sscanf(&line[k], sat_conf, |
216 &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate, vpid_str, apid_str); | |
10560 | 217 ptr->pol = toupper(ptr->pol); |
218 ptr->freq *= 1000UL; | |
219 ptr->srate *= 1000UL; | |
220 ptr->tone = -1; | |
12047
6fbcdac049c6
added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents:
11872
diff
changeset
|
221 ptr->inv = INVERSION_AUTO; |
6fbcdac049c6
added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents:
11872
diff
changeset
|
222 ptr->cr = FEC_AUTO; |
12116 | 223 if((ptr->diseqc > 4) || (ptr->diseqc < 0)) |
12047
6fbcdac049c6
added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents:
11872
diff
changeset
|
224 continue; |
12116 | 225 if(ptr->diseqc > 0) |
226 ptr->diseqc--; | |
10560 | 227 mp_msg(MSGT_DEMUX, MSGL_V, |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
228 "SAT, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d, POL: %c, DISEQC: %d", |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
229 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->pol, ptr->diseqc); |
10560 | 230 } |
9610 | 231 |
16516 | 232 if(vpid_str[0]) |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
233 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
234 pcnt = sscanf(vpid_str, "%d+%d+%d+%d+%d+%d+%d", &ptr->pids[0], &ptr->pids[1], &ptr->pids[2], &ptr->pids[3], |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
235 &ptr->pids[4], &ptr->pids[5], &ptr->pids[6]); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
236 if(pcnt > 0) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
237 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
238 ptr->pids_cnt = pcnt; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
239 fields++; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
240 } |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
241 } |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
242 |
16516 | 243 if(apid_str[0]) |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
244 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
245 cnt = ptr->pids_cnt; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
246 pcnt = sscanf(apid_str, "%d+%d+%d+%d+%d+%d+%d+%d", &ptr->pids[cnt], &ptr->pids[cnt+1], &ptr->pids[cnt+2], |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
247 &ptr->pids[cnt+3], &ptr->pids[cnt+4], &ptr->pids[cnt+5], &ptr->pids[cnt+6], &ptr->pids[cnt+7]); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
248 if(pcnt > 0) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
249 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
250 ptr->pids_cnt += pcnt; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
251 fields++; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
252 } |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
253 } |
10560 | 254 |
16516 | 255 if((fields < 2) || (ptr->pids_cnt <= 0) || (ptr->freq == 0) || (strlen(ptr->name) == 0)) |
10708 | 256 continue; |
257 | |
258 | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
259 ptr->pids[ptr->pids_cnt] = 0; //PID 0 is the PAT |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
260 ptr->pids_cnt++; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
261 mp_msg(MSGT_DEMUX, MSGL_V, " PIDS: "); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
262 for(cnt = 0; cnt < ptr->pids_cnt; cnt++) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
263 mp_msg(MSGT_DEMUX, MSGL_V, " %d ", ptr->pids[cnt]); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
264 mp_msg(MSGT_DEMUX, MSGL_V, "\n"); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
265 |
10560 | 266 if((type == TUNER_TER) || (type == TUNER_CBL)) |
267 { | |
9610 | 268 if(! strcmp(inv, "INVERSION_ON")) |
269 ptr->inv = INVERSION_ON; | |
270 else if(! strcmp(inv, "INVERSION_OFF")) | |
271 ptr->inv = INVERSION_OFF; | |
272 else | |
273 ptr->inv = INVERSION_AUTO; | |
274 | |
275 | |
276 if(! strcmp(cr, "FEC_1_2")) | |
277 ptr->cr =FEC_1_2; | |
278 else if(! strcmp(cr, "FEC_2_3")) | |
279 ptr->cr =FEC_2_3; | |
280 else if(! strcmp(cr, "FEC_3_4")) | |
281 ptr->cr =FEC_3_4; | |
282 #ifdef HAVE_DVB_HEAD | |
283 else if(! strcmp(cr, "FEC_4_5")) | |
284 ptr->cr =FEC_4_5; | |
285 else if(! strcmp(cr, "FEC_6_7")) | |
286 ptr->cr =FEC_6_7; | |
287 else if(! strcmp(cr, "FEC_8_9")) | |
288 ptr->cr =FEC_8_9; | |
289 #endif | |
290 else if(! strcmp(cr, "FEC_5_6")) | |
291 ptr->cr =FEC_5_6; | |
292 else if(! strcmp(cr, "FEC_7_8")) | |
293 ptr->cr =FEC_7_8; | |
294 else if(! strcmp(cr, "FEC_NONE")) | |
295 ptr->cr =FEC_NONE; | |
296 else ptr->cr =FEC_AUTO; | |
14382 | 297 } |
298 | |
9610 | 299 |
14382 | 300 if((type == TUNER_TER) || (type == TUNER_CBL) || (type == TUNER_ATSC)) |
301 { | |
9610 | 302 if(! strcmp(mod, "QAM_128")) |
303 ptr->mod = QAM_128; | |
304 else if(! strcmp(mod, "QAM_256")) | |
305 ptr->mod = QAM_256; | |
306 else if(! strcmp(mod, "QAM_64")) | |
307 ptr->mod = QAM_64; | |
308 else if(! strcmp(mod, "QAM_32")) | |
309 ptr->mod = QAM_32; | |
310 else if(! strcmp(mod, "QAM_16")) | |
311 ptr->mod = QAM_16; | |
14382 | 312 #ifdef DVB_ATSC |
313 else if(! strcmp(mod, "VSB_8") || ! strcmp(mod, "8VSB")) | |
314 ptr->mod = VSB_8; | |
315 else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB")) | |
316 ptr->mod = VSB_16; | |
317 | |
318 ptr->inv = INVERSION_AUTO; | |
319 #endif | |
10560 | 320 } |
321 | |
322 if(type == TUNER_TER) | |
323 { | |
324 if(! strcmp(bw, "BANDWIDTH_6_MHZ")) | |
325 ptr->bw = BANDWIDTH_6_MHZ; | |
326 else if(! strcmp(bw, "BANDWIDTH_7_MHZ")) | |
327 ptr->bw = BANDWIDTH_7_MHZ; | |
328 else if(! strcmp(bw, "BANDWIDTH_8_MHZ")) | |
329 ptr->bw = BANDWIDTH_8_MHZ; | |
9610 | 330 |
331 | |
332 if(! strcmp(transm, "TRANSMISSION_MODE_2K")) | |
333 ptr->trans = TRANSMISSION_MODE_2K; | |
334 else if(! strcmp(transm, "TRANSMISSION_MODE_8K")) | |
335 ptr->trans = TRANSMISSION_MODE_8K; | |
336 | |
10560 | 337 |
9610 | 338 if(! strcmp(gi, "GUARD_INTERVAL_1_32")) |
339 ptr->gi = GUARD_INTERVAL_1_32; | |
340 else if(! strcmp(gi, "GUARD_INTERVAL_1_16")) | |
341 ptr->gi = GUARD_INTERVAL_1_16; | |
342 else if(! strcmp(gi, "GUARD_INTERVAL_1_8")) | |
343 ptr->gi = GUARD_INTERVAL_1_8; | |
344 else ptr->gi = GUARD_INTERVAL_1_4; | |
13155
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
345 |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
346 if(! strcmp(tmp_lcr, "FEC_1_2")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
347 ptr->cr_lp =FEC_1_2; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
348 else if(! strcmp(tmp_lcr, "FEC_2_3")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
349 ptr->cr_lp =FEC_2_3; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
350 else if(! strcmp(tmp_lcr, "FEC_3_4")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
351 ptr->cr_lp =FEC_3_4; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
352 #ifdef HAVE_DVB_HEAD |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
353 else if(! strcmp(tmp_lcr, "FEC_4_5")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
354 ptr->cr_lp =FEC_4_5; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
355 else if(! strcmp(tmp_lcr, "FEC_6_7")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
356 ptr->cr_lp =FEC_6_7; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
357 else if(! strcmp(tmp_lcr, "FEC_8_9")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
358 ptr->cr_lp =FEC_8_9; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
359 #endif |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
360 else if(! strcmp(tmp_lcr, "FEC_5_6")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
361 ptr->cr_lp =FEC_5_6; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
362 else if(! strcmp(tmp_lcr, "FEC_7_8")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
363 ptr->cr_lp =FEC_7_8; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
364 else if(! strcmp(tmp_lcr, "FEC_NONE")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
365 ptr->cr_lp =FEC_NONE; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
366 else ptr->cr_lp =FEC_AUTO; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
367 |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
368 |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
369 if(! strcmp(tmp_hier, "HIERARCHY_1")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
370 ptr->hier = HIERARCHY_1; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
371 else if(! strcmp(tmp_hier, "HIERARCHY_2")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
372 ptr->hier = HIERARCHY_2; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
373 else if(! strcmp(tmp_hier, "HIERARCHY_4")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
374 ptr->hier = HIERARCHY_4; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
375 #ifdef HAVE_DVB_HEAD |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
376 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO")) |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
377 ptr->hier = HIERARCHY_AUTO; |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
378 #endif |
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
379 else ptr->hier = HIERARCHY_NONE; |
9610 | 380 } |
381 | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
382 tmp = (dvb_channel_t*)realloc(list->channels, sizeof(dvb_channel_t) * (list->NUM_CHANNELS + 1)); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
383 if(tmp == NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
384 break; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
385 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
386 list->channels = tmp; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
387 memcpy(&(list->channels[list->NUM_CHANNELS]), ptr, sizeof(dvb_channel_t)); |
9610 | 388 list->NUM_CHANNELS++; |
389 } | |
390 | |
391 fclose(f); | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
392 if(list->NUM_CHANNELS == 0) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
393 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
394 if(list->channels != NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
395 free(list->channels); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
396 free(list); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
397 return NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
398 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
399 |
10560 | 400 list->current = 0; |
9610 | 401 return list; |
402 } | |
403 | |
404 | |
405 | |
10560 | 406 static int dvb_streaming_read(stream_t *stream, char *buffer, int size) |
9610 | 407 { |
408 struct pollfd pfds[1]; | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
409 int pos=0, tries, rk, fd; |
10560 | 410 dvb_priv_t *priv = (dvb_priv_t *) stream->priv; |
9610 | 411 |
12047
6fbcdac049c6
added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents:
11872
diff
changeset
|
412 mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size); |
9610 | 413 |
11352 | 414 tries = priv->retry + 1; |
415 | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
416 fd = stream->fd; |
9610 | 417 while(pos < size) |
418 { | |
10560 | 419 pfds[0].fd = fd; |
420 pfds[0].events = POLLIN | POLLPRI; | |
9610 | 421 |
10560 | 422 rk = size - pos; |
15213
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
423 if(poll(pfds, 1, 500) <= 0) |
10560 | 424 { |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
425 errno = 0; |
10560 | 426 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, attempt N. %d failed with errno %d when reading %d bytes\n", tries, errno, size-pos); |
427 if(--tries > 0) | |
428 continue; | |
429 else | |
430 break; | |
431 } | |
15213
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
432 if((rk = read(fd, &buffer[pos], rk)) > 0) |
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
433 { |
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
434 pos += rk; |
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
435 mp_msg(MSGT_DEMUX, MSGL_DBG3, "ret (%d) bytes\n", pos); |
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
436 } |
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
437 } |
4d8a0ecce6ac
check the result of poll() before read()ing; 100l
nicodvb
parents:
15178
diff
changeset
|
438 |
9610 | 439 |
10560 | 440 if(! pos) |
441 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, return %d bytes\n", pos); | |
9610 | 442 |
443 return pos; | |
444 } | |
445 | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
446 static void dvbin_close(stream_t *stream); |
10560 | 447 |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
448 int dvb_set_channel(dvb_priv_t *priv, int card, int n) |
10560 | 449 { |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
450 dvb_channels_list *new_list; |
10560 | 451 dvb_channel_t *channel; |
452 int do_tuning; | |
453 stream_t *stream = (stream_t*) priv->stream; | |
454 char buf[4096]; | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
455 dvb_config_t *conf = (dvb_config_t *) priv->config; |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
456 int devno; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
457 int i; |
9610 | 458 |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
459 if((card < 0) || (card > conf->count)) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
460 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
461 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CARD NUMBER: %d vs %d, abort\n", card, conf->count); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
462 return 0; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
463 } |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
464 |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
465 devno = conf->cards[card].devno; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
466 new_list = conf->cards[card].list; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
467 if((n > new_list->NUM_CHANNELS) || (n < 0)) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
468 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
469 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, for card %d, abort\n", n, card); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
470 return 0; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
471 } |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
472 channel = &(new_list->channels[n]); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
473 |
10560 | 474 if(priv->is_on) //the fds are already open and we have to stop the demuxers |
475 { | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
476 for(i = 0; i < priv->demux_fds_cnt; i++) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
477 dvb_demux_stop(priv->demux_fds[i]); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
478 |
10560 | 479 priv->retry = 0; |
11352 | 480 while(dvb_streaming_read(stream, buf, 4096) > 0); //empty both the stream's and driver's buffer |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
481 if(priv->card != card) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
482 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
483 dvbin_close(stream); |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
484 if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids)) |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
485 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
486 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
487 return 0; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
488 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
489 strcpy(priv->prev_tuning, ""); |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
490 } |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
491 else //close all demux_fds with pos > pids required for the new channel or open other demux_fds if we have too few |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
492 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
493 if(! dvb_fix_demuxes(priv, channel->pids_cnt, channel->pids)) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
494 return 0; |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
495 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
496 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
497 else |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
498 { |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
499 if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids)) |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
500 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
501 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL2, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
502 return 0; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
503 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
504 strcpy(priv->prev_tuning, ""); |
10560 | 505 } |
506 | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
507 dvb_config->priv = priv; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
508 priv->card = card; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
509 priv->list = new_list; |
11352 | 510 priv->retry = 5; |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
511 new_list->current = n; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
512 stream->fd = priv->dvr_fd; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
513 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s, card: %d, channel %d\n", channel->name, card, n); |
10560 | 514 |
515 switch(priv->tuner_type) | |
516 { | |
517 case TUNER_SAT: | |
518 sprintf(priv->new_tuning, "%d|%09d|%09d|%d|%c", priv->card, channel->freq, channel->srate, channel->diseqc, channel->pol); | |
519 break; | |
9610 | 520 |
10560 | 521 case TUNER_TER: |
522 sprintf(priv->new_tuning, "%d|%09d|%d|%d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv, | |
523 channel->bw, channel->cr, channel->mod, channel->trans, channel->gi); | |
524 break; | |
525 | |
526 case TUNER_CBL: | |
527 sprintf(priv->new_tuning, "%d|%09d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv, channel->srate, | |
528 channel->cr, channel->mod); | |
529 break; | |
14382 | 530 #ifdef DVB_ATSC |
531 case TUNER_ATSC: | |
532 sprintf(priv->new_tuning, "%d|%09d|%d", priv->card, channel->freq, channel->mod); | |
533 break; | |
534 #endif | |
10560 | 535 } |
536 | |
537 | |
9610 | 538 |
10560 | 539 if(strcmp(priv->prev_tuning, priv->new_tuning)) |
540 { | |
541 mp_msg(MSGT_DEMUX, MSGL_V, "DIFFERENT TUNING THAN THE PREVIOUS: %s -> %s\n", priv->prev_tuning, priv->new_tuning); | |
542 strcpy(priv->prev_tuning, priv->new_tuning); | |
543 do_tuning = 1; | |
544 } | |
545 else | |
546 { | |
11352 | 547 mp_msg(MSGT_DEMUX, MSGL_V, "SAME TUNING PARAMETERS, NO TUNING\n"); |
10560 | 548 do_tuning = 0; |
549 } | |
550 | |
551 stream->eof=1; | |
552 stream_reset(stream); | |
553 | |
9610 | 554 |
10560 | 555 if(do_tuning) |
556 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone, | |
13155
fd40ef23053b
added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents:
12803
diff
changeset
|
557 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier)) |
10560 | 558 return 0; |
559 | |
560 | |
561 priv->is_on = 1; | |
562 | |
563 //sets demux filters and restart the stream | |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
564 for(i = 0; i < channel->pids_cnt; i++) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
565 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
566 if(! dvb_set_ts_filt(priv->demux_fds[i], channel->pids[i], DMX_PES_OTHER)) |
10560 | 567 return 0; |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
568 } |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
569 |
10560 | 570 return 1; |
571 } | |
572 | |
573 | |
9610 | 574 |
10560 | 575 int dvb_step_channel(dvb_priv_t *priv, int dir) |
576 { | |
577 int new_current; | |
578 dvb_channels_list *list; | |
579 | |
580 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_STEP_CHANNEL dir %d\n", dir); | |
9610 | 581 |
10560 | 582 if(priv == NULL) |
583 { | |
584 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n"); | |
585 return 0; | |
586 } | |
9610 | 587 |
10560 | 588 list = priv->list; |
589 if(list == NULL) | |
590 { | |
591 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n"); | |
592 return 0; | |
593 } | |
9610 | 594 |
10560 | 595 |
596 if(dir == DVB_CHANNEL_HIGHER) | |
597 { | |
598 if(list->current == list->NUM_CHANNELS-1) | |
599 return 0; | |
9610 | 600 |
10560 | 601 new_current = list->current + 1; |
602 } | |
603 else | |
604 { | |
605 if(list->current == 0) | |
606 return 0; | |
9610 | 607 |
10560 | 608 new_current = list->current - 1; |
609 } | |
610 | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
611 return dvb_set_channel(priv, priv->card, new_current); |
9610 | 612 } |
613 | |
614 | |
10560 | 615 |
616 | |
9610 | 617 extern char *get_path(char *); |
618 | |
10560 | 619 static void dvbin_close(stream_t *stream) |
9610 | 620 { |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
621 int i; |
10560 | 622 dvb_priv_t *priv = (dvb_priv_t *) stream->priv; |
9610 | 623 |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
624 for(i = priv->demux_fds_cnt-1; i >= 0; i--) |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
625 { |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
626 priv->demux_fds_cnt--; |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
627 mp_msg(MSGT_DEMUX, MSGL_V, "DVBIN_CLOSE, close(%d), fd=%d, COUNT=%d\n", i, priv->demux_fds[i], priv->demux_fds_cnt); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
628 close(priv->demux_fds[i]); |
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
629 } |
10560 | 630 close(priv->dvr_fd); |
11872
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
631 |
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
632 close(priv->fe_fd); |
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
633 #ifdef HAVE_DVB |
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
634 close(priv->sec_fd); |
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
635 #endif |
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
636 |
10560 | 637 priv->is_on = 0; |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
638 dvb_config->priv = NULL; |
10560 | 639 } |
9610 | 640 |
641 | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
642 static int dvb_streaming_start(dvb_priv_t *priv, struct stream_priv_s *opts, int tuner_type, char *progname) |
10560 | 643 { |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
644 int i; |
10560 | 645 dvb_channel_t *channel = NULL; |
646 stream_t *stream = (stream_t*) priv->stream; | |
9610 | 647 |
648 | |
649 mp_msg(MSGT_DEMUX, MSGL_INFO, "code taken from dvbstream for mplayer v0.4pre1 - (C) Dave Chapman 2001\n"); | |
650 mp_msg(MSGT_DEMUX, MSGL_INFO, "Released under the GPL.\n"); | |
651 mp_msg(MSGT_DEMUX, MSGL_INFO, "Latest version available from http://www.linuxstb.org/\n"); | |
10560 | 652 mp_msg(MSGT_DEMUX, MSGL_V, "PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s, FILE: %s\n", |
653 opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file); | |
9610 | 654 |
10560 | 655 priv->is_on = 0; |
9610 | 656 |
10560 | 657 i = 0; |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
658 while((channel == NULL) && i < priv->list->NUM_CHANNELS) |
10560 | 659 { |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
660 if(! strcmp(priv->list->channels[i].name, progname)) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
661 channel = &(priv->list->channels[i]); |
9610 | 662 |
10560 | 663 i++; |
664 } | |
9610 | 665 |
10560 | 666 if(channel != NULL) |
667 { | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
668 priv->list->current = i-1; |
12803
168238f8c715
added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents:
12307
diff
changeset
|
669 mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i-1, channel->name, channel->freq); |
10560 | 670 } |
671 else | |
672 { | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
673 mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", progname); |
10560 | 674 return 0; |
9610 | 675 } |
676 | |
677 | |
10560 | 678 strcpy(priv->prev_tuning, ""); |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
679 if(!dvb_set_channel(priv, priv->card, priv->list->current)) |
10560 | 680 { |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
681 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR, COULDN'T SET CHANNEL %i: ", priv->list->current); |
10560 | 682 dvbin_close(stream); |
683 return 0; | |
684 } | |
685 | |
686 mp_msg(MSGT_DEMUX, MSGL_V, "SUCCESSFUL EXIT from dvb_streaming_start\n"); | |
9610 | 687 |
688 return 1; | |
689 } | |
690 | |
691 | |
10560 | 692 |
693 | |
694 static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format) | |
9610 | 695 { |
10560 | 696 // I don't force the file format bacause, although it's almost always TS, |
697 // there are some providers that stream an IP multicast with M$ Mpeg4 inside | |
698 struct stream_priv_s* p = (struct stream_priv_s*)opts; | |
699 dvb_priv_t *priv; | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
700 char *progname; |
11352 | 701 int tuner_type = 0; |
10560 | 702 |
703 | |
704 if(mode != STREAM_READ) | |
705 return STREAM_UNSUPORTED; | |
706 | |
707 stream->priv = (dvb_priv_t*) malloc(sizeof(dvb_priv_t)); | |
708 if(stream->priv == NULL) | |
709 return STREAM_ERROR; | |
710 | |
711 priv = (dvb_priv_t *)stream->priv; | |
712 priv->stream = stream; | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
713 dvb_config = dvb_get_config(); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
714 if(dvb_config == NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
715 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
716 free(priv); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
717 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB CONFIGURATION IS EMPTY, exit\n"); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
718 return STREAM_ERROR; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
719 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
720 dvb_config->priv = priv; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
721 priv->config = dvb_config; |
10560 | 722 |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
723 if(p->card < 1 || p->card > priv->config->count) |
11872
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
724 { |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
725 free(priv); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
726 mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card); |
11872
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
727 return STREAM_ERROR; |
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
728 } |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
729 priv->card = p->card - 1; |
11872
d158978a3d3c
Compliance with the DVB power management specification (doesn't close
attila
parents:
11352
diff
changeset
|
730 |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
731 tuner_type = priv->config->cards[priv->card].type; |
10560 | 732 |
11352 | 733 if(tuner_type == 0) |
734 { | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
735 free(priv); |
11352 | 736 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: UNKNOWN OR UNDETECTABLE TUNER TYPE, EXIT\n"); |
737 return STREAM_ERROR; | |
738 } | |
739 | |
740 | |
10560 | 741 priv->tuner_type = tuner_type; |
742 | |
12108
06c4780332bc
disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents:
12047
diff
changeset
|
743 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d, vid=%d, aid=%d\n", |
06c4780332bc
disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents:
12047
diff
changeset
|
744 p->prog, priv->card+1, priv->tuner_type, p->vid, p->aid); |
10560 | 745 |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
746 priv->list = priv->config->cards[priv->card].list; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
747 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
748 if((! strcmp(p->prog, "")) && (priv->list != NULL)) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
749 progname = priv->list->channels[0].name; |
10560 | 750 else |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
751 progname = p->prog; |
10560 | 752 |
753 | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
754 if(! dvb_streaming_start(priv, p, tuner_type, progname)) |
10560 | 755 { |
756 free(stream->priv); | |
757 stream->priv = NULL; | |
758 return STREAM_ERROR; | |
759 } | |
760 | |
761 stream->type = STREAMTYPE_DVB; | |
762 stream->fill_buffer = dvb_streaming_read; | |
763 stream->close = dvbin_close; | |
764 m_struct_free(&stream_opts, opts); | |
765 | |
766 return STREAM_OK; | |
9610 | 767 } |
10560 | 768 |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
769 #define MAX_CARDS 4 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
17012
diff
changeset
|
770 dvb_config_t *dvb_get_config(void) |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
771 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
772 int i, fd, type, size; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
773 char filename[30], *conf_file, *name; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
774 dvb_channels_list *list; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
775 dvb_card_config_t *cards = NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
776 dvb_config_t *conf = NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
777 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
778 if(dvb_config != NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
779 return dvb_config; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
780 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
781 conf = (dvb_config_t*) malloc(sizeof(dvb_config_t)); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
782 if(conf == NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
783 return NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
784 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
785 conf->priv = NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
786 conf->count = 0; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
787 conf->cards = NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
788 for(i=0; i<MAX_CARDS; i++) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
789 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
790 sprintf(filename, "/dev/dvb/adapter%d/frontend0", i); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
791 fd = open(filename, O_RDWR | O_NONBLOCK); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
792 if(fd < 0) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
793 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
794 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
795 continue; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
796 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
797 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
798 type = dvb_get_tuner_type(fd); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
799 close(fd); |
14382 | 800 if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL && type != TUNER_ATSC) |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
801 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
802 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't detect tuner type of card %d, skipping\n", i); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
803 continue; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
804 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
805 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
806 switch(type) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
807 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
808 case TUNER_TER: |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
809 conf_file = get_path("channels.conf.ter"); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
810 break; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
811 case TUNER_CBL: |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
812 conf_file = get_path("channels.conf.cbl"); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
813 break; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
814 case TUNER_SAT: |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
815 conf_file = get_path("channels.conf.sat"); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
816 break; |
14382 | 817 case TUNER_ATSC: |
818 conf_file = get_path("channels.conf.atsc"); | |
819 break; | |
12307
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
820 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
821 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
822 if((access(conf_file, F_OK | R_OK) != 0)) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
823 conf_file = get_path("channels.conf"); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
824 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
825 list = dvb_get_channels(conf_file, type); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
826 if(list == NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
827 continue; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
828 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
829 size = sizeof(dvb_card_config_t) * (conf->count + 1); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
830 cards = realloc(conf->cards, size); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
831 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
832 if(cards == NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
833 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
834 fprintf(stderr, "DVB_CONFIG, can't realloc %d bytes, skipping\n", size); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
835 continue; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
836 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
837 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
838 name = (char*) malloc(20); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
839 if(name==NULL) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
840 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
841 fprintf(stderr, "DVB_CONFIG, can't realloc 20 bytes, skipping\n"); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
842 continue; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
843 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
844 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
845 conf->cards = cards; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
846 conf->cards[conf->count].devno = i; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
847 conf->cards[conf->count].list = list; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
848 conf->cards[conf->count].type = type; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
849 sprintf(name, "DVB-%c card n. %d", type==TUNER_TER ? 'T' : (type==TUNER_CBL ? 'C' : 'S'), conf->count+1); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
850 conf->cards[conf->count].name = name; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
851 conf->count++; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
852 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
853 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
854 if(conf->count == 0) |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
855 { |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
856 free(conf); |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
857 conf = NULL; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
858 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
859 |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
860 dvb_config = conf; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
861 return conf; |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
862 } |
44152bfdc002
new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents:
12116
diff
changeset
|
863 |
10560 | 864 |
865 | |
866 stream_info_t stream_info_dvb = { | |
867 "Dvb Input", | |
868 "dvbin", | |
869 "Nico", | |
870 "based on the code from ??? (probably Arpi)", | |
871 dvb_open, | |
872 { "dvb", NULL }, | |
873 &stream_opts, | |
874 1 // Urls are an option string | |
875 }; | |
876 | |
877 | |
878 | |
879 |