annotate stream/stream_dvb.c @ 33259:04dc3e55cd90

Increase the maximum value of the DVB timeout to 240 seconds. Some devices may need more time for the initial tune (e.g. firmware loading). Let the user specify higher timeout value if there is need to. The default remains 30 seconds.
author iive
date Sun, 01 May 2011 18:07:59 +0000
parents b39155e98ac3
children a93891202051
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
1 /*
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
2
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
3 dvbstream
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
4 (C) Dave Chapman <dave@dchapman.com> 2001, 2002.
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
5
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
6 The latest version can be found at http://www.linuxstb.org/dvbstream
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
7
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
8 Modified for use with MPlayer, for details see the changelog at
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
9 http://svn.mplayerhq.hu/mplayer/trunk/
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
10 $Id$
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
11
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
12 Copyright notice:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
13
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
14 This program is free software; you can redistribute it and/or modify
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
15 it under the terms of the GNU General Public License as published by
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
16 the Free Software Foundation; either version 2 of the License, or
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
17 (at your option) any later version.
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
18
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
19 This program is distributed in the hope that it will be useful,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
20 but WITHOUT ANY WARRANTY; without even the implied warranty of
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
22 GNU General Public License for more details.
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
23
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
24 You should have received a copy of the GNU General Public License
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
25 along with this program; if not, write to the Free Software
21977
cea0eb833758 Fix FSF address and otherwise broken license headers.
diego
parents: 21834
diff changeset
26 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
27
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
28 */
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
29
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
30 #include "config.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
31 #include <stdio.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
32 #include <stdlib.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
33 #include <string.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
34 #include <ctype.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
35 #include <sys/ioctl.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
36 #include <sys/time.h>
27431
bb738b9ea7c4 Use '#include <poll.h>' instead of '#include <sys/poll.h>'.
diego
parents: 27370
diff changeset
37 #include <poll.h>
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
38 #include <unistd.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
39 #include <fcntl.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
40 #include <errno.h>
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
41
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
42 #include "stream.h"
19312
ab8d6b6deb63 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
ben
parents: 19296
diff changeset
43 #include "libmpdemux/demuxer.h"
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
44 #include "help_mp.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
45 #include "m_option.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
46 #include "m_struct.h"
30901
76a13038105e Rename get_path.[ch] --> path.[ch].
diego
parents: 30776
diff changeset
47 #include "path.h"
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23629
diff changeset
48 #include "libavutil/avstring.h"
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
49
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
50 #include "dvbin.h"
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
51
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
52
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
53 #define MAX_CHANNELS 8
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
54 #define CHANNEL_LINE_LEN 256
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
55 #define min(a, b) ((a) <= (b) ? (a) : (b))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
56
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
57
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
58 //TODO: CAMBIARE list_ptr e da globale a per_priv
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
59
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
60
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
61 static struct stream_priv_s
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
62 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
63 char *prog;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
64 int card;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
65 int timeout;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
66 char *file;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
67 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
68 stream_defaults =
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
69 {
26391
16ab100f5870 removed useless parameter :type from -dvbin (the frontend type is reported by the card)
nicodvb
parents: 26390
diff changeset
70 "", 1, 30, NULL
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
71 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
72
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
73 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
74
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
75 /// URL definition
25242
371a40dcc1cc stream_opts arrays should be const
reimar
parents: 25241
diff changeset
76 static const m_option_t stream_params[] = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
77 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
78 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
33259
04dc3e55cd90 Increase the maximum value of the DVB timeout to 240 seconds.
iive
parents: 32511
diff changeset
79 {"timeout",ST_OFF(timeout), CONF_TYPE_INT, M_OPT_RANGE, 1, 240, NULL},
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
80 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
81
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
82 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL },
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
83 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
84 {NULL, NULL, 0, 0, 0, 0, NULL}
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
85 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
86
25691
68015115f63a stream_opts should be const
reimar
parents: 25389
diff changeset
87 static const struct m_struct_st stream_opts = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
88 "dvbin",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
89 sizeof(struct stream_priv_s),
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
90 &stream_defaults,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
91 stream_params
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
92 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
93
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
94
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
95
25241
bb7c65f2a289 Make m_option_t arrays referenced by cfg-common.h const
reimar
parents: 25211
diff changeset
96 const m_option_t dvbin_opts_conf[] = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
97 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
98 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
33259
04dc3e55cd90 Increase the maximum value of the DVB timeout to 240 seconds.
iive
parents: 32511
diff changeset
99 {"timeout", &stream_defaults.timeout, CONF_TYPE_INT, M_OPT_RANGE, 1, 240, NULL},
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
100 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL},
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
101
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
102 {NULL, NULL, 0, 0, 0, 0, NULL}
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
103 };
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
104
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
105
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
106
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
107
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
108 int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
109 int dvb_demux_stop(int fd);
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
110 int dvb_get_tuner_type(int fd);
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
111 int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt);
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
112 int dvb_fix_demuxes(dvb_priv_t *priv, int cnt);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
113
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27863
diff changeset
114 int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone,
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
115 fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
116 fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
117 fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
118
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
119
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
120
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
121 static dvb_channels_list *dvb_get_channels(char *filename, int type)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
122 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
123 dvb_channels_list *list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
124 FILE *f;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
125 char line[CHANNEL_LINE_LEN], *colon;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
126
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
127 int fields, cnt, pcnt, k;
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
128 int has8192, has0;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
129 dvb_channel_t *ptr, *tmp, chn;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
130 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];
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
131 const char *cbl_conf = "%d:%255[^:]:%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
132 const char *sat_conf = "%d:%c:%d:%d:%255[^:]:%255[^:]\n";
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
133 const char *ter_conf = "%d:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]\n";
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
134 const char *atsc_conf = "%d:%255[^:]:%255[^:]:%255[^:]\n";
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
135
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
136 mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
137 if((f=fopen(filename, "r"))==NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
138 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
139 mp_msg(MSGT_DEMUX, MSGL_FATAL, "CAN'T READ CONFIG FILE %s\n", filename);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
140 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
141 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
142
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
143 list = malloc(sizeof(dvb_channels_list));
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
144 if(list == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
145 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
146 fclose(f);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
147 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_GET_CHANNELS: couldn't malloc enough memory\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
148 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
149 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
150
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
151 ptr = &chn;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
152 list->NUM_CHANNELS = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
153 list->channels = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
154 while(! feof(f))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
155 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
156 if( fgets(line, CHANNEL_LINE_LEN, f) == NULL )
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
157 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
158
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
159 if((line[0] == '#') || (strlen(line) == 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
160 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
161
21464
f43100cbeee5 use strchr() instead of index()
aurel
parents: 21241
diff changeset
162 colon = strchr(line, ':');
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
163 if(colon)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
164 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
165 k = colon - line;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
166 if(!k)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
167 continue;
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
168 ptr->name = malloc(k+1);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
169 if(! ptr->name)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
170 continue;
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23629
diff changeset
171 av_strlcpy(ptr->name, line, k+1);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
172 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
173 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
174 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
175 k++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
176 apid_str[0] = vpid_str[0] = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
177 ptr->pids_cnt = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
178 ptr->freq = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
179 if(type == TUNER_TER)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
180 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
181 fields = sscanf(&line[k], ter_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
182 &ptr->freq, inv, bw, cr, tmp_lcr, mod,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
183 transm, gi, tmp_hier, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
184 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
185 "TER, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
186 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
187 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
188 else if(type == TUNER_CBL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
189 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
190 fields = sscanf(&line[k], cbl_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
191 &ptr->freq, inv, &ptr->srate,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
192 cr, mod, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
193 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
194 "CBL, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
195 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
196 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
197 #ifdef DVB_ATSC
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
198 else if(type == TUNER_ATSC)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
199 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
200 fields = sscanf(&line[k], atsc_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
201 &ptr->freq, mod, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
202 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
203 "ATSC, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d\n",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
204 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
205 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
206 #endif
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
207 else //SATELLITE
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
208 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
209 fields = sscanf(&line[k], sat_conf,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
210 &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate, vpid_str, apid_str);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
211 ptr->pol = toupper(ptr->pol);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
212 ptr->freq *= 1000UL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
213 ptr->srate *= 1000UL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
214 ptr->tone = -1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
215 ptr->inv = INVERSION_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
216 ptr->cr = FEC_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
217 if((ptr->diseqc > 4) || (ptr->diseqc < 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
218 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
219 if(ptr->diseqc > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
220 ptr->diseqc--;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
221 mp_msg(MSGT_DEMUX, MSGL_V,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
222 "SAT, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d, POL: %c, DISEQC: %d",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
223 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->pol, ptr->diseqc);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
224 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
225
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
226 if(vpid_str[0])
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
227 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
228 pcnt = sscanf(vpid_str, "%d+%d+%d+%d+%d+%d+%d", &ptr->pids[0], &ptr->pids[1], &ptr->pids[2], &ptr->pids[3],
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
229 &ptr->pids[4], &ptr->pids[5], &ptr->pids[6]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
230 if(pcnt > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
231 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
232 ptr->pids_cnt = pcnt;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
233 fields++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
234 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
235 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
236
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
237 if(apid_str[0])
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
238 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
239 cnt = ptr->pids_cnt;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
240 pcnt = sscanf(apid_str, "%d+%d+%d+%d+%d+%d+%d+%d", &ptr->pids[cnt], &ptr->pids[cnt+1], &ptr->pids[cnt+2],
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
241 &ptr->pids[cnt+3], &ptr->pids[cnt+4], &ptr->pids[cnt+5], &ptr->pids[cnt+6], &ptr->pids[cnt+7]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
242 if(pcnt > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
243 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
244 ptr->pids_cnt += pcnt;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
245 fields++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
246 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
247 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
248
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
249 if((fields < 2) || (ptr->pids_cnt <= 0) || (ptr->freq == 0) || (strlen(ptr->name) == 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
250 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
251
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
252 has8192 = has0 = 0;
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
253 for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
254 {
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
255 if(ptr->pids[cnt] == 8192)
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
256 has8192 = 1;
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
257 if(ptr->pids[cnt] == 0)
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
258 has0 = 1;
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
259 }
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
260 if(has8192)
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
261 {
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
262 ptr->pids[0] = 8192;
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
263 ptr->pids_cnt = 1;
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
264 }
21814
8032b9d9349d don't add pid 0 if it's already present in the list
nicodvb
parents: 21465
diff changeset
265 else if(! has0)
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
266 {
21034
5357da9f0690 riformatted after previous commit
nicodvb
parents: 21033
diff changeset
267 ptr->pids[ptr->pids_cnt] = 0; //PID 0 is the PAT
5357da9f0690 riformatted after previous commit
nicodvb
parents: 21033
diff changeset
268 ptr->pids_cnt++;
21033
087cad309e9c if in the list of pids appears at least one 8192 (while TS) remove all other pid filters
nicodvb
parents: 20660
diff changeset
269 }
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
270 mp_msg(MSGT_DEMUX, MSGL_V, " PIDS: ");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
271 for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
272 mp_msg(MSGT_DEMUX, MSGL_V, " %d ", ptr->pids[cnt]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
273 mp_msg(MSGT_DEMUX, MSGL_V, "\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
274
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
275 if((type == TUNER_TER) || (type == TUNER_CBL))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
276 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
277 if(! strcmp(inv, "INVERSION_ON"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
278 ptr->inv = INVERSION_ON;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
279 else if(! strcmp(inv, "INVERSION_OFF"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
280 ptr->inv = INVERSION_OFF;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
281 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
282 ptr->inv = INVERSION_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
283
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
284
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
285 if(! strcmp(cr, "FEC_1_2"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
286 ptr->cr =FEC_1_2;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
287 else if(! strcmp(cr, "FEC_2_3"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
288 ptr->cr =FEC_2_3;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
289 else if(! strcmp(cr, "FEC_3_4"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
290 ptr->cr =FEC_3_4;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
291 else if(! strcmp(cr, "FEC_4_5"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
292 ptr->cr =FEC_4_5;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
293 else if(! strcmp(cr, "FEC_6_7"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
294 ptr->cr =FEC_6_7;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
295 else if(! strcmp(cr, "FEC_8_9"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
296 ptr->cr =FEC_8_9;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
297 else if(! strcmp(cr, "FEC_5_6"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
298 ptr->cr =FEC_5_6;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
299 else if(! strcmp(cr, "FEC_7_8"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
300 ptr->cr =FEC_7_8;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
301 else if(! strcmp(cr, "FEC_NONE"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
302 ptr->cr =FEC_NONE;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
303 else ptr->cr =FEC_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
304 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
305
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
306
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
307 if((type == TUNER_TER) || (type == TUNER_CBL) || (type == TUNER_ATSC))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
308 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
309 if(! strcmp(mod, "QAM_128"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
310 ptr->mod = QAM_128;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
311 else if(! strcmp(mod, "QAM_256"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
312 ptr->mod = QAM_256;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
313 else if(! strcmp(mod, "QAM_64"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
314 ptr->mod = QAM_64;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
315 else if(! strcmp(mod, "QAM_32"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
316 ptr->mod = QAM_32;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
317 else if(! strcmp(mod, "QAM_16"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
318 ptr->mod = QAM_16;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
319 #ifdef DVB_ATSC
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
320 else if(! strcmp(mod, "VSB_8") || ! strcmp(mod, "8VSB"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
321 ptr->mod = VSB_8;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
322 else if(! strcmp(mod, "VSB_16") || !strcmp(mod, "16VSB"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
323 ptr->mod = VSB_16;
29761
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
324 else if(! strcmp(mod, "QAM_AUTO"))
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
325 ptr->mod = QAM_AUTO;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
326
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
327 #endif
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
328 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
329
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
330 if(type == TUNER_TER)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
331 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
332 if(! strcmp(bw, "BANDWIDTH_6_MHZ"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
333 ptr->bw = BANDWIDTH_6_MHZ;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
334 else if(! strcmp(bw, "BANDWIDTH_7_MHZ"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
335 ptr->bw = BANDWIDTH_7_MHZ;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
336 else if(! strcmp(bw, "BANDWIDTH_8_MHZ"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
337 ptr->bw = BANDWIDTH_8_MHZ;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
338
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
339
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
340 if(! strcmp(transm, "TRANSMISSION_MODE_2K"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
341 ptr->trans = TRANSMISSION_MODE_2K;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
342 else if(! strcmp(transm, "TRANSMISSION_MODE_8K"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
343 ptr->trans = TRANSMISSION_MODE_8K;
29761
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
344 else if(! strcmp(transm, "TRANSMISSION_MODE_AUTO"))
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
345 ptr->trans = TRANSMISSION_MODE_AUTO;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
346
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
347 if(! strcmp(gi, "GUARD_INTERVAL_1_32"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
348 ptr->gi = GUARD_INTERVAL_1_32;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
349 else if(! strcmp(gi, "GUARD_INTERVAL_1_16"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
350 ptr->gi = GUARD_INTERVAL_1_16;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
351 else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
352 ptr->gi = GUARD_INTERVAL_1_8;
29761
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
353 else if(! strcmp(gi, "GUARD_INTERVAL_1_4"))
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
354 ptr->gi = GUARD_INTERVAL_1_4;
b5e34617a096 Support ISDB-Tb tunning in Brazil
cehoyos
parents: 29263
diff changeset
355 else ptr->gi = GUARD_INTERVAL_AUTO;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
356
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
357 if(! strcmp(tmp_lcr, "FEC_1_2"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
358 ptr->cr_lp =FEC_1_2;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
359 else if(! strcmp(tmp_lcr, "FEC_2_3"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
360 ptr->cr_lp =FEC_2_3;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
361 else if(! strcmp(tmp_lcr, "FEC_3_4"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
362 ptr->cr_lp =FEC_3_4;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
363 else if(! strcmp(tmp_lcr, "FEC_4_5"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
364 ptr->cr_lp =FEC_4_5;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
365 else if(! strcmp(tmp_lcr, "FEC_6_7"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
366 ptr->cr_lp =FEC_6_7;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
367 else if(! strcmp(tmp_lcr, "FEC_8_9"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
368 ptr->cr_lp =FEC_8_9;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
369 else if(! strcmp(tmp_lcr, "FEC_5_6"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
370 ptr->cr_lp =FEC_5_6;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
371 else if(! strcmp(tmp_lcr, "FEC_7_8"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
372 ptr->cr_lp =FEC_7_8;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
373 else if(! strcmp(tmp_lcr, "FEC_NONE"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
374 ptr->cr_lp =FEC_NONE;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
375 else ptr->cr_lp =FEC_AUTO;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
376
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
377
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
378 if(! strcmp(tmp_hier, "HIERARCHY_1"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
379 ptr->hier = HIERARCHY_1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
380 else if(! strcmp(tmp_hier, "HIERARCHY_2"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
381 ptr->hier = HIERARCHY_2;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
382 else if(! strcmp(tmp_hier, "HIERARCHY_4"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
383 ptr->hier = HIERARCHY_4;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
384 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
385 ptr->hier = HIERARCHY_AUTO;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
386 else ptr->hier = HIERARCHY_NONE;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
387 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
388
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
389 tmp = realloc(list->channels, sizeof(dvb_channel_t) * (list->NUM_CHANNELS + 1));
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
390 if(tmp == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
391 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
392
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
393 list->channels = tmp;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
394 memcpy(&(list->channels[list->NUM_CHANNELS]), ptr, sizeof(dvb_channel_t));
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
395 list->NUM_CHANNELS++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
396 if(sizeof(dvb_channel_t) * list->NUM_CHANNELS >= 1024*1024)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
397 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
398 mp_msg(MSGT_DEMUX, MSGL_V, "dvbin.c, > 1MB allocated for channels struct, dropping the rest of the file\r\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
399 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
400 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
401 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
402
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
403 fclose(f);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
404 if(list->NUM_CHANNELS == 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
405 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
406 free(list->channels);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
407 free(list);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
408 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
409 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
410
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
411 list->current = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
412 return list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
413 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
414
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
415 void dvb_free_config(dvb_config_t *config)
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
416 {
25389
cd65c1242675 10l, in dvb_free_config() channels' names must be free individually
nicodvb
parents: 25380
diff changeset
417 int i, j;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
418
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
419 for(i=0; i<config->count; i++)
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
420 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
421 free(config->cards[i].name);
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
422 if(!config->cards[i].list)
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
423 continue;
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
424 if(config->cards[i].list->channels)
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
425 {
25389
cd65c1242675 10l, in dvb_free_config() channels' names must be free individually
nicodvb
parents: 25380
diff changeset
426 for(j=0; j<config->cards[i].list->NUM_CHANNELS; j++)
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
427 free(config->cards[i].list->channels[j].name);
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
428 free(config->cards[i].list->channels);
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
429 }
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
430 free(config->cards[i].list);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
431 }
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
432 free(config);
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
433 }
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
434
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
435 static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
436 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
437 struct pollfd pfds[1];
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
438 int pos=0, tries, rk, fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
439 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
440
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
441 mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
442
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
443 tries = priv->retry + 1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
444
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
445 fd = stream->fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
446 while(pos < size)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
447 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
448 pfds[0].fd = fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
449 pfds[0].events = POLLIN | POLLPRI;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
450
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
451 rk = size - pos;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
452 if(poll(pfds, 1, 500) <= 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
453 {
23486
056c2968b148 Set errno to 0 after printing it, not before
reimar
parents: 22402
diff changeset
454 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);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
455 errno = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
456 if(--tries > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
457 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
458 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
459 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
460 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
461 if((rk = read(fd, &buffer[pos], rk)) > 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
462 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
463 pos += rk;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
464 mp_msg(MSGT_DEMUX, MSGL_DBG3, "ret (%d) bytes\n", pos);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
465 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
466 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
467
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
468
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
469 if(! pos)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
470 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, return %d bytes\n", pos);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
471
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
472 return pos;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
473 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
474
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
475 static void dvbin_close(stream_t *stream);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
476
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
477 int dvb_set_channel(stream_t *stream, int card, int n)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
478 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
479 dvb_channels_list *new_list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
480 dvb_channel_t *channel;
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
481 dvb_priv_t *priv = stream->priv;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
482 char buf[4096];
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
483 dvb_config_t *conf = (dvb_config_t *) priv->config;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
484 int devno;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
485 int i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
486
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
487 if((card < 0) || (card > conf->count))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
488 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
489 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CARD NUMBER: %d vs %d, abort\n", card, conf->count);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
490 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
491 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
492
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
493 devno = conf->cards[card].devno;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
494 new_list = conf->cards[card].list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
495 if((n > new_list->NUM_CHANNELS) || (n < 0))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
496 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
497 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, for card %d, abort\n", n, card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
498 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
499 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
500 channel = &(new_list->channels[n]);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
501
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
502 if(priv->is_on) //the fds are already open and we have to stop the demuxers
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
503 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
504 for(i = 0; i < priv->demux_fds_cnt; i++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
505 dvb_demux_stop(priv->demux_fds[i]);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
506
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
507 priv->retry = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
508 while(dvb_streaming_read(stream, buf, 4096) > 0); //empty both the stream's and driver's buffer
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
509 if(priv->card != card)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
510 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
511 dvbin_close(stream);
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
512 if(! dvb_open_devices(priv, devno, channel->pids_cnt))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
513 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
514 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
515 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
516 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
517 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
518 else //close all demux_fds with pos > pids required for the new channel or open other demux_fds if we have too few
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
519 {
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
520 if(! dvb_fix_demuxes(priv, channel->pids_cnt))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
521 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
522 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
523 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
524 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
525 {
24875
fe6dc73c7314 removed unused variables and parameters
nicodvb
parents: 24257
diff changeset
526 if(! dvb_open_devices(priv, devno, channel->pids_cnt))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
527 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
528 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL2, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
529 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
530 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
531 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
532
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
533 priv->card = card;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
534 priv->list = new_list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
535 priv->retry = 5;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
536 new_list->current = n;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
537 stream->fd = priv->dvr_fd;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
538 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s, card: %d, channel %d\n", channel->name, card, n);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
539
30625
bc29a1172753 Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.
reimar
parents: 29761
diff changeset
540 stream->buf_pos = stream->buf_len = 0;
bc29a1172753 Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.
reimar
parents: 29761
diff changeset
541 stream->pos = 0;
bc29a1172753 Replace misuse of stream_reset to set stream pos to 0 by more appropriate code.
reimar
parents: 29761
diff changeset
542 stream->eof = 0;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
543
20659
31b525f90395 nonsense removal: compare old and new frequency in order to skip tuning
nicodvb
parents: 19312
diff changeset
544 if(channel->freq != priv->last_freq)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
545 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
546 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier, priv->timeout))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
547 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
548
20659
31b525f90395 nonsense removal: compare old and new frequency in order to skip tuning
nicodvb
parents: 19312
diff changeset
549 priv->last_freq = channel->freq;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
550 priv->is_on = 1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
551
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
552 //sets demux filters and restart the stream
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
553 for(i = 0; i < channel->pids_cnt; i++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
554 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
555 if(! dvb_set_ts_filt(priv->demux_fds[i], channel->pids[i], DMX_PES_OTHER))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
556 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
557 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
558
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
559 return 1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
560 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
561
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
562
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
563
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
564 int dvb_step_channel(stream_t *stream, int dir)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
565 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
566 int new_current;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
567 dvb_channels_list *list;
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
568 dvb_priv_t *priv = stream->priv;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
569
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
570 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_STEP_CHANNEL dir %d\n", dir);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
571
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
572 if(priv == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
573 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
574 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
575 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
576 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
577
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
578 list = priv->list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
579 if(list == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
580 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
581 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
582 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
583 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
584
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
585 new_current = (list->NUM_CHANNELS + list->current + (dir == DVB_CHANNEL_HIGHER ? 1 : -1)) % list->NUM_CHANNELS;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
586
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
587 return dvb_set_channel(stream, priv->card, new_current);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
588 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
589
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
590
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
591
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
592
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
593 static void dvbin_close(stream_t *stream)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
594 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
595 int i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
596 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
597
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
598 for(i = priv->demux_fds_cnt-1; i >= 0; i--)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
599 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
600 priv->demux_fds_cnt--;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
601 mp_msg(MSGT_DEMUX, MSGL_V, "DVBIN_CLOSE, close(%d), fd=%d, COUNT=%d\n", i, priv->demux_fds[i], priv->demux_fds_cnt);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
602 close(priv->demux_fds[i]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
603 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
604 close(priv->dvr_fd);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
605
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
606 close(priv->fe_fd);
27863
f3384addfb0b set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar
nicodvb
parents: 27858
diff changeset
607 priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
608
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
609 priv->is_on = 0;
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
610 dvb_free_config(priv->config);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
611 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
612
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
613
25380
5857ec4dedb4 removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
nicodvb
parents: 25379
diff changeset
614 static int dvb_streaming_start(stream_t *stream, struct stream_priv_s *opts, int tuner_type, char *progname)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
615 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
616 int i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
617 dvb_channel_t *channel = NULL;
25380
5857ec4dedb4 removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
nicodvb
parents: 25379
diff changeset
618 dvb_priv_t *priv = stream->priv;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
619
26391
16ab100f5870 removed useless parameter :type from -dvbin (the frontend type is reported by the card)
nicodvb
parents: 26390
diff changeset
620 mp_msg(MSGT_DEMUX, MSGL_V, "\r\ndvb_streaming_start(PROG: %s, CARD: %d, FILE: %s)\r\n",
16ab100f5870 removed useless parameter :type from -dvbin (the frontend type is reported by the card)
nicodvb
parents: 26390
diff changeset
621 opts->prog, opts->card, opts->file);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
622
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
623 priv->is_on = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
624
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
625 i = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
626 while((channel == NULL) && i < priv->list->NUM_CHANNELS)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
627 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
628 if(! strcmp(priv->list->channels[i].name, progname))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
629 channel = &(priv->list->channels[i]);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
630
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
631 i++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
632 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
633
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
634 if(channel != NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
635 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
636 priv->list->current = i-1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
637 mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i-1, channel->name, channel->freq);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
638 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
639 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
640 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
641 mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
642 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
643 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
644
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
645
25377
31e0937ebe38 dvb cleanup: call dvb_(set|step)_channel() without dereferencing stream->priv (1000l to me)
nicodvb
parents: 25355
diff changeset
646 if(!dvb_set_channel(stream, priv->card, priv->list->current))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
647 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
648 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR, COULDN'T SET CHANNEL %i: ", priv->list->current);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
649 dvbin_close(stream);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
650 return 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
651 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
652
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
653 mp_msg(MSGT_DEMUX, MSGL_V, "SUCCESSFUL EXIT from dvb_streaming_start\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
654
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
655 return 1;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
656 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
657
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
658
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
659
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
660
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
661 static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
662 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
663 // I don't force the file format bacause, although it's almost always TS,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
664 // there are some providers that stream an IP multicast with M$ Mpeg4 inside
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
665 struct stream_priv_s* p = (struct stream_priv_s*)opts;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
666 dvb_priv_t *priv;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
667 char *progname;
21241
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
668 int tuner_type = 0, i;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
669
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
670
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
671 if(mode != STREAM_READ)
24257
d261f5109660 cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
diego
parents: 24242
diff changeset
672 return STREAM_UNSUPPORTED;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
673
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
674 stream->priv = calloc(1, sizeof(dvb_priv_t));
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
675 if(stream->priv == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
676 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
677
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
678 priv = (dvb_priv_t *)stream->priv;
27863
f3384addfb0b set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar
nicodvb
parents: 27858
diff changeset
679 priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
25379
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
680 priv->config = dvb_get_config();
9befb9809011 get rid of the file-static dvb_config and free the config at close() . Patch by Andrew Calkin and me
nicodvb
parents: 25377
diff changeset
681 if(priv->config == NULL)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
682 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
683 free(priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
684 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB CONFIGURATION IS EMPTY, exit\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
685 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
686 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
687
21241
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
688 priv->card = -1;
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
689 for(i=0; i<priv->config->count; i++)
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
690 {
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
691 if(priv->config->cards[i].devno+1 == p->card)
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
692 {
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
693 priv->card = i;
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
694 break;
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
695 }
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
696 }
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
697
6e3fb3e851ac match exactly card number N specified, rather than the N-th actually usable
nicodvb
parents: 21034
diff changeset
698 if(priv->card == -1)
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
699 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
700 free(priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
701 mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
702 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
703 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
704 priv->timeout = p->timeout;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
705
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
706 tuner_type = priv->config->cards[priv->card].type;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
707
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
708 if(tuner_type == 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
709 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
710 free(priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
711 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: UNKNOWN OR UNDETECTABLE TUNER TYPE, EXIT\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
712 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
713 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
714
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
715
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
716 priv->tuner_type = tuner_type;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
717
26390
b2cc442c095d removed defunct options :vid and :aid from -dvbin (they were useless from the start)
nicodvb
parents: 26123
diff changeset
718 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d\n",
b2cc442c095d removed defunct options :vid and :aid from -dvbin (they were useless from the start)
nicodvb
parents: 26123
diff changeset
719 p->prog, priv->card+1, priv->tuner_type);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
720
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
721 priv->list = priv->config->cards[priv->card].list;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
722
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
723 if((! strcmp(p->prog, "")) && (priv->list != NULL))
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
724 progname = priv->list->channels[0].name;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
725 else
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
726 progname = p->prog;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
727
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
728
25380
5857ec4dedb4 removed the obscene priv->stream entry. Someone must have injected vodka in my milk when I wrote it
nicodvb
parents: 25379
diff changeset
729 if(! dvb_streaming_start(stream, p, tuner_type, progname))
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
730 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
731 free(stream->priv);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
732 stream->priv = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
733 return STREAM_ERROR;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
734 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
735
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
736 stream->type = STREAMTYPE_DVB;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
737 stream->fill_buffer = dvb_streaming_read;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
738 stream->close = dvbin_close;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
739 m_struct_free(&stream_opts, opts);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
740
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
741 *file_format = DEMUXER_TYPE_MPEG_TS;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
742
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
743 return STREAM_OK;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
744 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
745
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
746 #define MAX_CARDS 4
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
747 dvb_config_t *dvb_get_config(void)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
748 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
749 int i, fd, type, size;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
750 char filename[30], *conf_file, *name;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
751 dvb_channels_list *list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
752 dvb_card_config_t *cards = NULL, *tmp;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
753 dvb_config_t *conf = NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
754
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
755
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
756 conf = malloc(sizeof(dvb_config_t));
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
757 if(conf == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
758 return NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
759
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
760 conf->priv = NULL;
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
761 conf->count = 0;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
762 conf->cards = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
763 for(i=0; i<MAX_CARDS; i++)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
764 {
22402
963d93b2fe7c replaced 2 instances of sprintf() with snprintf() and one instance
nicodvb
parents: 21977
diff changeset
765 snprintf(filename, sizeof(filename), "/dev/dvb/adapter%d/frontend0", i);
21834
8d486fd6cf2f in dvb_get_config() open the frontend in READ_ONLY mode for probing (worksaround some buggy driver)
nicodvb
parents: 21814
diff changeset
766 fd = open(filename, O_RDONLY|O_NONBLOCK);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
767 if(fd < 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
768 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
769 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
770 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
771 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
772
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
773 type = dvb_get_tuner_type(fd);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
774 close(fd);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
775 if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL && type != TUNER_ATSC)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
776 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
777 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't detect tuner type of card %d, skipping\n", i);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
778 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
779 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
780
31800
20e5447d78f9 Initialize conf_file variable to kill the warning:
diego
parents: 30901
diff changeset
781 conf_file = get_path("channels.conf");
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
782 switch(type)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
783 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
784 case TUNER_TER:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
785 conf_file = get_path("channels.conf.ter");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
786 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
787 case TUNER_CBL:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
788 conf_file = get_path("channels.conf.cbl");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
789 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
790 case TUNER_SAT:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
791 conf_file = get_path("channels.conf.sat");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
792 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
793 case TUNER_ATSC:
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
794 conf_file = get_path("channels.conf.atsc");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
795 break;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
796 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
797
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
798 if((access(conf_file, F_OK | R_OK) != 0))
25355
3110688d2406 fix memleaks; patch by andrew calkin from gmail com
nicodvb
parents: 25242
diff changeset
799 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
800 free(conf_file);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
801 conf_file = get_path("channels.conf");
26123
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
802 if((access(conf_file, F_OK | R_OK) != 0))
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
803 {
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
804 free(conf_file);
26123
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
805 conf_file = strdup(MPLAYER_CONFDIR "/channels.conf");
37786c8469b2 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
nicodvb
parents: 25692
diff changeset
806 }
25355
3110688d2406 fix memleaks; patch by andrew calkin from gmail com
nicodvb
parents: 25242
diff changeset
807 }
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
808
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
809 list = dvb_get_channels(conf_file, type);
32511
b39155e98ac3 Remove some useless NULL pointer checks before invoking free() on the pointer.
diego
parents: 31800
diff changeset
810 free(conf_file);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
811 if(list == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
812 continue;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
813
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
814 size = sizeof(dvb_card_config_t) * (conf->count + 1);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
815 tmp = realloc(conf->cards, size);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
816
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
817 if(tmp == NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
818 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
819 fprintf(stderr, "DVB_CONFIG, can't realloc %d bytes, skipping\n", size);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
820 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
821 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
822 cards = tmp;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
823
23629
cb1277fb9d7e get rid of useless *alloc casts
reimar
parents: 23486
diff changeset
824 name = malloc(20);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
825 if(name==NULL)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
826 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
827 fprintf(stderr, "DVB_CONFIG, can't realloc 20 bytes, skipping\n");
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
828 continue;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
829 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
830
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
831 conf->cards = cards;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
832 conf->cards[conf->count].devno = i;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
833 conf->cards[conf->count].list = list;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
834 conf->cards[conf->count].type = type;
22402
963d93b2fe7c replaced 2 instances of sprintf() with snprintf() and one instance
nicodvb
parents: 21977
diff changeset
835 snprintf(name, 20, "DVB-%c card n. %d", type==TUNER_TER ? 'T' : (type==TUNER_CBL ? 'C' : 'S'), conf->count+1);
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
836 conf->cards[conf->count].name = name;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
837 conf->count++;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
838 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
839
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
840 if(conf->count == 0)
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
841 {
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
842 free(conf);
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
843 conf = NULL;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
844 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
845
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
846 return conf;
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
847 }
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
848
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
849
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
850
25211
c1d17bd6683c Mark all stream_info_t as const
reimar
parents: 24875
diff changeset
851 const stream_info_t stream_info_dvb = {
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
852 "Dvb Input",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
853 "dvbin",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
854 "Nico",
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
855 "based on the code from ??? (probably Arpi)",
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
856 dvb_open,
19296
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
857 { "dvb", NULL },
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
858 &stream_opts,
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
859 1 // Urls are an option string
3583e8ff4da4 renamed dvbin.c to stream_dvb.c for consistency
ben
parents:
diff changeset
860 };