annotate libmpdemux/dvbin.c @ 12304:434242b0706c

fix possible segfault on lavf demuxer patch by (adland <adland123 at yahoo dot com>)
author michael
date Mon, 26 Apr 2004 19:55:55 +0000
parents 8d476d8a16ae
children 44152bfdc002
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
1 /*
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
2
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
3 dvbstream
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
4 (C) Dave Chapman <dave@dchapman.com> 2001, 2002.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
5
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
6 The latest version can be found at http://www.linuxstb.org/dvbstream
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
7
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
8 Copyright notice:
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
9
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
10 This program is free software; you can redistribute it and/or modify
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
11 it under the terms of the GNU General Public License as published by
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
12 the Free Software Foundation; either version 2 of the License, or
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
13 (at your option) any later version.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
14
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
15 This program is distributed in the hope that it will be useful,
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
16 but WITHOUT ANY WARRANTY; without even the implied warranty of
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
18 GNU General Public License for more details.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
19
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
20 You should have received a copy of the GNU General Public License
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
21 along with this program; if not, write to the Free Software
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
22 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
23
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
24 */
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
25
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
26 #include "config.h"
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
27 #include <stdio.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
28 #include <stdlib.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
29 #include <string.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
30 #include <ctype.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
31 #include <sys/ioctl.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
32 #include <sys/time.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
33 #include <sys/poll.h>
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
34 #include <unistd.h>
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
35 #include <fcntl.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
36 #include <string.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
37 #include <errno.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
38 #include <fcntl.h>
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
39
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
40 #include "stream.h"
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
41 #include "demuxer.h"
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
42 #include "help_mp.h"
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
43 #include "../m_option.h"
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
44 #include "../m_struct.h"
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
45
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
46 #include "dvbin.h"
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
47
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
48
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
49 #define MAX_CHANNELS 8
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
50 #define CHANNEL_LINE_LEN 256
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
51 #define min(a, b) ((a) <= (b) ? (a) : (b))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
52
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
53
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
54 //TODO: CAMBIARE list_ptr e da globale a per_priv
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
55
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
56
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
57 static struct stream_priv_s
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
58 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
59 char *prog;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
60 int card;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
61 char *type;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
62 int vid, aid;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
63 char *file;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
64 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
65 stream_defaults =
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
66 {
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
67 "", 1, "", 0, 0, NULL
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
68 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
69
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
70 #define ST_OFF(f) M_ST_OFF(struct stream_priv_s, f)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
71
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
72 /// URL definition
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
73 static m_option_t stream_params[] = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
74 {"prog", ST_OFF(prog), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
75 {"card", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
76 {"type", ST_OFF(type), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
77 {"vid", ST_OFF(vid), CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
78 {"aid", ST_OFF(aid), CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
79 {"file", ST_OFF(file), CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
80
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
81 {"hostname", ST_OFF(prog), CONF_TYPE_STRING, 0, 0, 0, NULL },
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
82 {"filename", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
83 {NULL, NULL, 0, 0, 0, 0, NULL}
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
84 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
85
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
86 static struct m_struct_st stream_opts = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
87 "dvbin",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
88 sizeof(struct stream_priv_s),
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
89 &stream_defaults,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
90 stream_params
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
91 };
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
92
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
93
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
94
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
95 m_option_t dvbin_opts_conf[] = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
96 {"prog", &stream_defaults.prog, CONF_TYPE_STRING, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
97 {"card", &stream_defaults.card, CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
98 {"type", "DVB card type is autodetected and can't be overridden\n", CONF_TYPE_PRINT, CONF_NOCFG, 0 ,0, NULL},
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
99 {"vid", &stream_defaults.vid, CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
100 {"aid", &stream_defaults.aid, CONF_TYPE_INT, 0, 0 ,0, NULL},
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
101 {"file", &stream_defaults.file, CONF_TYPE_STRING, 0, 0 ,0, NULL},
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
102
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
103 {NULL, NULL, 0, 0, 0, 0, NULL}
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
104 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
105
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
106
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
107
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
108
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
109 extern int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
110 extern int dvb_demux_stop(int fd);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
111 extern int dvb_get_tuner_type(dvb_priv_t *priv);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
112
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
113 extern int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone,
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
114 fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval,
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
115 fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
116 extern char *dvb_dvrdev[4], *dvb_demuxdev[4], *dvb_frontenddev[4];
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
117
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
118 dvb_channels_list *dvb_list_ptr = NULL;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
119
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
120
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
121 static dvb_channels_list *dvb_get_channels(char *filename, int type)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
122 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
123 dvb_channels_list *list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
124 FILE *f;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
125 uint8_t line[CHANNEL_LINE_LEN];
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
126
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
127 int fields, row_count;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
128 dvb_channel_t *ptr;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
129 char *tmp_lcr, *tmp_hier, *inv, *bw, *cr, *mod, *transm, *gi;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
130 const char *cbl_conf = "%a[^:]:%d:%a[^:]:%d:%a[^:]:%a[^:]:%d:%d\n";
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
131 const char *sat_conf = "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d:%d\n";
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
132 const char *ter_conf = "%a[^:]:%d:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%d:%d\n";
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
133
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
134 if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
135 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
136 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_GET_CHANNELS: wrong tuner type, exit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
137 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
138 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
139
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
140 list = malloc(sizeof(dvb_channels_list));
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
141 if(list == NULL)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
142 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
143 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_GET_CHANNELS: couldn't malloc enough memory\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
144 return NULL;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
145 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
146
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
147 bzero(list, sizeof(dvb_channels_list));
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
148 mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
149 if((f=fopen(filename, "r"))==NULL)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
150 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
151 mp_msg(MSGT_DEMUX, MSGL_FATAL, "CAN'T READ CONFIG FILE %s\n", filename);
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
152 return NULL;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
153 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
154
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
155 list->NUM_CHANNELS = 0;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
156 row_count = 0;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
157 while(! feof(f) && row_count < 512)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
158 {
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
159 if( fgets(line, CHANNEL_LINE_LEN, f) == NULL )
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
160 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
161
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
162 if((line[0] == '#') || (strlen(line) == 0))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
163 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
164
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
165 ptr = &(list->channels[list->NUM_CHANNELS]);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
166
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
167 if(type == TUNER_TER)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
168 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
169 fields = sscanf(line, ter_conf,
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
170 &ptr->name, &ptr->freq, &inv, &bw, &cr, &tmp_lcr, &mod,
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
171 &transm, &gi, &tmp_hier, &ptr->vpid, &ptr->apid1);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
172 /*
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
173 mp_msg(MSGT_DEMUX, MSGL_V,
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
174 "NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, VPID: %d, APID1: %d\n",
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
175 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->vpid, ptr->apid1);
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
176 */
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
177 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
178 else if(type == TUNER_CBL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
179 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
180 fields = sscanf(line, cbl_conf,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
181 &ptr->name, &ptr->freq, &inv, &ptr->srate,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
182 &cr, &mod, &ptr->vpid, &ptr->apid1);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
183 /*
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
184 mp_msg(MSGT_DEMUX, MSGL_V,
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
185 "NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d, VPID: %d, APID1: %d\n",
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
186 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->vpid, ptr->apid1);
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
187 */
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
188 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
189 else //SATELLITE
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
190 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
191 fields = sscanf(line, sat_conf,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
192 &ptr->name, &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate, &ptr->vpid, &ptr->apid1,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
193 &ptr->tpid, &ptr->ca, &ptr->progid);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
194 ptr->pol = toupper(ptr->pol);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
195 ptr->freq *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
196 ptr->srate *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
197 ptr->tone = -1;
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
198 ptr->inv = INVERSION_AUTO;
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
199 ptr->cr = FEC_AUTO;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
200 if((ptr->diseqc > 4) || (ptr->diseqc < 0))
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
201 continue;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
202 if(ptr->diseqc > 0)
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
203 ptr->diseqc--;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
204 mp_msg(MSGT_DEMUX, MSGL_V,
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
205 "NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d, POL: %c, DISEQC: %d, TONE: %d, VPID: %d, APID1: %d, APID2: %d, TPID: %d, PROGID: %d\n",
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
206 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->pol, ptr->diseqc, ptr->tone, ptr->vpid, ptr->apid1, ptr->apid2, ptr->tpid, ptr->progid);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
207 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
208
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
209
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
210 if(((ptr->vpid <= 0) && (ptr->apid1 <=0)) || (ptr->freq == 0))
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
211 continue;
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
212
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
213
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
214 if((type == TUNER_TER) || (type == TUNER_CBL))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
215 {
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
216 if(! strcmp(inv, "INVERSION_ON"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
217 ptr->inv = INVERSION_ON;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
218 else if(! strcmp(inv, "INVERSION_OFF"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
219 ptr->inv = INVERSION_OFF;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
220 else
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
221 ptr->inv = INVERSION_AUTO;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
222
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
223
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
224 if(! strcmp(cr, "FEC_1_2"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
225 ptr->cr =FEC_1_2;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
226 else if(! strcmp(cr, "FEC_2_3"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
227 ptr->cr =FEC_2_3;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
228 else if(! strcmp(cr, "FEC_3_4"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
229 ptr->cr =FEC_3_4;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
230 #ifdef HAVE_DVB_HEAD
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
231 else if(! strcmp(cr, "FEC_4_5"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
232 ptr->cr =FEC_4_5;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
233 else if(! strcmp(cr, "FEC_6_7"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
234 ptr->cr =FEC_6_7;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
235 else if(! strcmp(cr, "FEC_8_9"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
236 ptr->cr =FEC_8_9;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
237 #endif
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
238 else if(! strcmp(cr, "FEC_5_6"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
239 ptr->cr =FEC_5_6;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
240 else if(! strcmp(cr, "FEC_7_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
241 ptr->cr =FEC_7_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
242 else if(! strcmp(cr, "FEC_NONE"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
243 ptr->cr =FEC_NONE;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
244 else ptr->cr =FEC_AUTO;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
245
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
246 if(! strcmp(mod, "QAM_128"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
247 ptr->mod = QAM_128;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
248 else if(! strcmp(mod, "QAM_256"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
249 ptr->mod = QAM_256;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
250 else if(! strcmp(mod, "QAM_64"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
251 ptr->mod = QAM_64;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
252 else if(! strcmp(mod, "QAM_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
253 ptr->mod = QAM_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
254 else if(! strcmp(mod, "QAM_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
255 ptr->mod = QAM_16;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
256 //else ptr->mod = QPSK;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
257 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
258
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
259
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
260 if(type == TUNER_TER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
261 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
262 if(! strcmp(bw, "BANDWIDTH_6_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
263 ptr->bw = BANDWIDTH_6_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
264 else if(! strcmp(bw, "BANDWIDTH_7_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
265 ptr->bw = BANDWIDTH_7_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
266 else if(! strcmp(bw, "BANDWIDTH_8_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
267 ptr->bw = BANDWIDTH_8_MHZ;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
268
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
269
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
270 if(! strcmp(transm, "TRANSMISSION_MODE_2K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
271 ptr->trans = TRANSMISSION_MODE_2K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
272 else if(! strcmp(transm, "TRANSMISSION_MODE_8K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
273 ptr->trans = TRANSMISSION_MODE_8K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
274
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
275
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
276 if(! strcmp(gi, "GUARD_INTERVAL_1_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
277 ptr->gi = GUARD_INTERVAL_1_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
278 else if(! strcmp(gi, "GUARD_INTERVAL_1_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
279 ptr->gi = GUARD_INTERVAL_1_16;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
280 else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
281 ptr->gi = GUARD_INTERVAL_1_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
282 else ptr->gi = GUARD_INTERVAL_1_4;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
283 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
284
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
285 list->NUM_CHANNELS++;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
286 row_count++;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
287 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
288
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
289 fclose(f);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
290 list->current = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
291 return list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
292 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
293
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
294
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
295
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
296 static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
297 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
298 struct pollfd pfds[1];
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
299 int pos=0, tries, rk;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
300 int fd = stream->fd;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
301 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
302
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
303 mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
304
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
305 tries = priv->retry + 1;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
306
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
307 while(pos < size)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
308 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
309 pfds[0].fd = fd;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
310 pfds[0].events = POLLIN | POLLPRI;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
311
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
312 poll(pfds, 1, 500);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
313 rk = size - pos;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
314 if((rk = read(fd, &buffer[pos], rk)) > 0)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
315 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
316 pos += rk;
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
317 mp_msg(MSGT_DEMUX, MSGL_DBG3, "ret (%d) bytes\n", pos);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
318 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
319 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
320 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
321 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);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
322 if(--tries > 0)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
323 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
324 errno = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
325 //reset_demuxers(priv);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
326 continue;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
327 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
328 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
329 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
330 errno = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
331 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
332 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
333 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
334 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
335
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
336 if(! pos)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
337 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_streaming_read, return %d bytes\n", pos);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
338
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
339 return pos;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
340 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
341
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
342
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
343 static int reset_demuxers(dvb_priv_t *priv)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
344 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
345 dvb_channel_t *channel;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
346 dvb_channels_list *list = priv->list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
347
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
348 channel = &(list->channels[list->current]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
349
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
350 if(priv->is_on) //the fds are already open and we have to stop the demuxers
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
351 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
352 dvb_demux_stop(priv->demux_fd[0]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
353 dvb_demux_stop(priv->demux_fd[1]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
354 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
355
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
356 if(channel->vpid)
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
357 if(! dvb_set_ts_filt(priv->demux_fd[0], channel->vpid, DMX_PES_OTHER))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
358 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
359
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
360 if(channel->apid1)
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
361 if(! dvb_set_ts_filt(priv->demux_fd[1], channel->apid1, DMX_PES_OTHER))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
362 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
363
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
364 return 1;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
365 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
366
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
367
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
368 int dvb_set_channel(dvb_priv_t *priv, int n)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
369 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
370 dvb_channels_list *list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
371 dvb_channel_t *channel;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
372 int do_tuning;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
373 stream_t *stream = (stream_t*) priv->stream;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
374 char buf[4096];
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
375
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
376 if(priv->is_on) //the fds are already open and we have to stop the demuxers
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
377 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
378 dvb_demux_stop(priv->demux_fd[0]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
379 dvb_demux_stop(priv->demux_fd[1]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
380 priv->retry = 0;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
381 while(dvb_streaming_read(stream, buf, 4096) > 0); //empty both the stream's and driver's buffer
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
382 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
383
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
384 priv->retry = 5;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
385 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: channel %d\n", n);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
386 list = priv->list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
387 if(list == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
388 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
389 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: LIST NULL PTR, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
390 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
391 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
392
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
393 if((n > list->NUM_CHANNELS) || (n < 0))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
394 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
395 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, abort\n", n);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
396 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
397 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
398
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
399 list->current = n;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
400 channel = &(list->channels[list->current]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
401 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s\n", channel->name);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
402
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
403 switch(priv->tuner_type)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
404 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
405 case TUNER_SAT:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
406 sprintf(priv->new_tuning, "%d|%09d|%09d|%d|%c", priv->card, channel->freq, channel->srate, channel->diseqc, channel->pol);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
407 break;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
408
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
409 case TUNER_TER:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
410 sprintf(priv->new_tuning, "%d|%09d|%d|%d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
411 channel->bw, channel->cr, channel->mod, channel->trans, channel->gi);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
412 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
413
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
414 case TUNER_CBL:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
415 sprintf(priv->new_tuning, "%d|%09d|%d|%d|%d|%d", priv->card, channel->freq, channel->inv, channel->srate,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
416 channel->cr, channel->mod);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
417 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
418 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
419
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
420
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
421
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
422 if(strcmp(priv->prev_tuning, priv->new_tuning))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
423 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
424 mp_msg(MSGT_DEMUX, MSGL_V, "DIFFERENT TUNING THAN THE PREVIOUS: %s -> %s\n", priv->prev_tuning, priv->new_tuning);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
425 strcpy(priv->prev_tuning, priv->new_tuning);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
426 do_tuning = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
427 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
428 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
429 {
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
430 mp_msg(MSGT_DEMUX, MSGL_V, "SAME TUNING PARAMETERS, NO TUNING\n");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
431 do_tuning = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
432 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
433
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
434 stream->eof=1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
435 stream_reset(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
436
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
437
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
438 if(do_tuning)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
439 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
440 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
441 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
442
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
443
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
444 priv->is_on = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
445
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
446 //sets demux filters and restart the stream
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
447 if(channel->vpid)
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
448 if(! dvb_set_ts_filt(priv->demux_fd[0], channel->vpid, DMX_PES_OTHER))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
449 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
450
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
451 if(channel->apid1)
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
452 if(! dvb_set_ts_filt(priv->demux_fd[1], channel->apid1, DMX_PES_OTHER))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
453 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
454
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
455 return 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
456 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
457
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
458
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
459
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
460 int dvb_step_channel(dvb_priv_t *priv, int dir)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
461 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
462 int new_current;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
463 dvb_channels_list *list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
464
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
465 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_STEP_CHANNEL dir %d\n", dir);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
466
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
467 if(priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
468 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
469 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
470 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
471 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
472
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
473 list = priv->list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
474 if(list == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
475 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
476 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
477 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
478 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
479
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
480
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
481 if(dir == DVB_CHANNEL_HIGHER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
482 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
483 if(list->current == list->NUM_CHANNELS-1)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
484 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
485
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
486 new_current = list->current + 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
487 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
488 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
489 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
490 if(list->current == 0)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
491 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
492
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
493 new_current = list->current - 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
494 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
495
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
496 return dvb_set_channel(priv, new_current);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
497 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
498
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
499
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
500
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
501
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
502 extern char *get_path(char *);
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
503
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
504 static void dvbin_close(stream_t *stream)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
505 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
506 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
507
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
508 close(priv->dvr_fd);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
509 close(priv->demux_fd[0]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
510 close(priv->demux_fd[1]);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
511
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
512 close(priv->fe_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
513 #ifdef HAVE_DVB
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
514 close(priv->sec_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
515 #endif
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
516
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
517 priv->is_on = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
518 priv->stream = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
519 if(dvb_list_ptr)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
520 free(dvb_list_ptr);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
521
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
522 dvb_list_ptr = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
523 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
524
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
525
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
526 static int dvb_streaming_start(dvb_priv_t *priv, struct stream_priv_s *opts, int tuner_type)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
527 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
528 int pids[MAX_CHANNELS], pestypes[MAX_CHANNELS], npids = 0, i;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
529 dvb_channel_t *channel = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
530 stream_t *stream = (stream_t*) priv->stream;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
531
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
532
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
533 mp_msg(MSGT_DEMUX, MSGL_INFO, "code taken from dvbstream for mplayer v0.4pre1 - (C) Dave Chapman 2001\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
534 mp_msg(MSGT_DEMUX, MSGL_INFO, "Released under the GPL.\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
535 mp_msg(MSGT_DEMUX, MSGL_INFO, "Latest version available from http://www.linuxstb.org/\n");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
536 mp_msg(MSGT_DEMUX, MSGL_V, "PROG: %s, CARD: %d, VID: %d, AID: %d, TYPE: %s, FILE: %s\n",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
537 opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
538
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
539 priv->is_on = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
540
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
541 if(strlen(opts->prog))
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
542 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
543 if(dvb_list_ptr != NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
544 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
545 i = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
546 while((channel == NULL) && i < dvb_list_ptr->NUM_CHANNELS)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
547 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
548 if(! strcmp(dvb_list_ptr->channels[i].name, opts->prog))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
549 channel = &(dvb_list_ptr->channels[i]);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
550
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
551 i++;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
552 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
553
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
554 if(channel != NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
555 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
556 dvb_list_ptr->current = i-1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
557 mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, vid=%d, aid=%d, freq=%lu, srate=%lu, pol=%c, diseqc: %d, tone: %d\n", i-1,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
558 channel->name, channel->vpid, channel->apid1,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
559 channel->freq, channel->srate, channel->pol, channel->diseqc, channel->tone);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
560 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
561 else if(opts->prog)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
562 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
563 mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", opts->prog);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
564 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
565 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
566 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
567 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
568 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
569 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVBIN: chanel %s requested, but no channel list supplied %s\n", opts->prog);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
570 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
571 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
572 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
573
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
574
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
575
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
576 if(opts->vid > 0)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
577 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
578 pids[npids] = opts->vid;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
579 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
580 else if(channel != NULL)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
581 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
582 pids[npids] = channel->vpid;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
583 }
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
584 pestypes[npids] = DMX_PES_OTHER;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
585 npids++;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
586
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
587 if(opts->aid > 0)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
588 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
589 pids[npids] = opts->aid;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
590 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
591 else if(channel != NULL)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
592 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
593 pids[npids] = channel->apid1;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
594 }
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
595 pestypes[npids] = DMX_PES_OTHER;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
596 npids++;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
597
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
598
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
599
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
600 priv->demux_fd[0] = open(dvb_demuxdev[priv->card], O_RDWR);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
601 if(priv->demux_fd[0] < 0)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
602 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
603 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DEMUX 0: %d\n", errno);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
604 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
605 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
606
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
607 priv->demux_fd[1] = open(dvb_demuxdev[priv->card], O_RDWR);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
608 if(priv->demux_fd[1] < 0)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
609 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
610 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DEMUX 1: %d\n", errno);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
611 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
612 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
613
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
614
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
615 priv->dvr_fd = open(dvb_dvrdev[priv->card], O_RDONLY| O_NONBLOCK);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
616 if(priv->dvr_fd < 0)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
617 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
618 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING DVR DEVICE %s: %d\n", dvb_dvrdev[priv->card], errno);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
619 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
620 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
621
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
622
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
623 strcpy(priv->prev_tuning, "");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
624 if(!dvb_set_channel(priv, dvb_list_ptr->current))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
625 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
626 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR, COULDN'T SET CHANNEL %i: ", dvb_list_ptr->current);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
627 dvbin_close(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
628 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
629 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
630
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
631 stream->fd = priv->dvr_fd;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
632
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
633 mp_msg(MSGT_DEMUX, MSGL_V, "SUCCESSFUL EXIT from dvb_streaming_start\n");
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
634
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
635 return 1;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
636 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
637
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
638
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
639
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
640
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
641 static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
642 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
643 // I don't force the file format bacause, although it's almost always TS,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
644 // there are some providers that stream an IP multicast with M$ Mpeg4 inside
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
645 struct stream_priv_s* p = (struct stream_priv_s*)opts;
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
646 char *filename;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
647 dvb_priv_t *priv;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
648 int tuner_type = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
649
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
650
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
651 if(mode != STREAM_READ)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
652 return STREAM_UNSUPORTED;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
653
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
654 stream->priv = (dvb_priv_t*) malloc(sizeof(dvb_priv_t));
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
655 if(stream->priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
656 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
657
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
658 priv = (dvb_priv_t *)stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
659 priv->stream = stream;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
660
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
661 priv->card = p->card - 1;
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
662 if(! dvb_open_fe(priv))
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
663 {
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
664 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: %d\n", dvb_frontenddev[priv->card], errno);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
665 return STREAM_ERROR;
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
666 }
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
667
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
668 tuner_type = dvb_get_tuner_type(priv);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
669
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
670 if(tuner_type == 0)
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
671 {
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
672 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: UNKNOWN OR UNDETECTABLE TUNER TYPE, EXIT\n");
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
673 return STREAM_ERROR;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
674 }
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
675
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
676
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
677 priv->tuner_type = tuner_type;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
678
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
679 mp_msg(MSGT_DEMUX, MSGL_V, "OPEN_DVB: prog=%s, card=%d, type=%d, vid=%d, aid=%d\n",
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
680 p->prog, priv->card+1, priv->tuner_type, p->vid, p->aid);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
681
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
682 if(dvb_list_ptr == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
683 {
12108
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
684 if(p->file != NULL)
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
685 {
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
686 if(p->file[0] == '/')
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
687 filename = p->file;
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
688 else
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
689 filename = get_path(p->file);
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
690 }
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
691 else
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
692 {
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
693 switch(priv->tuner_type)
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
694 {
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
695 case TUNER_TER:
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
696 filename = get_path("channels.conf.ter");
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
697 break;
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
698 case TUNER_CBL:
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
699 filename = get_path("channels.conf.cbl");
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
700 break;
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
701 case TUNER_SAT:
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
702 filename = get_path("channels.conf.sat");
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
703 break;
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
704 }
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
705 }
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
706
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
707 if((filename == NULL) || (access(filename, F_OK | R_OK) != 0))
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
708 filename = get_path("channels.conf");
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
709
06c4780332bc disallow non-sense type parameter; added support for absolute file path; prefer channels.conf.{sat,ter,cbl} over channels.conf if the file is available
nicodvb
parents: 12047
diff changeset
710
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
711 if(filename)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
712 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
713 if((dvb_list_ptr = dvb_get_channels(filename, tuner_type)) == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
714 mp_msg(MSGT_DEMUX, MSGL_ERR, "EMPTY CHANNELS LIST FROM FILE %s!\n", filename);
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
715 priv->list = dvb_list_ptr;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
716 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
717 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
718 {
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
719 priv->list = dvb_list_ptr = NULL;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
720 mp_msg(MSGT_DEMUX, MSGL_WARN, "NO CHANNELS FILE FOUND!\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
721 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
722 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
723 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
724 priv->list = dvb_list_ptr;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
725
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
726
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
727 if(priv->list == NULL)
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
728 {
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
729 mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CHANNELS AVAILABLE, EXIT!\n");
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
730 return STREAM_ERROR;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
731 }
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
732
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
733 if(! strcmp(p->prog, ""))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
734 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
735 if(dvb_list_ptr != NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
736 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
737 dvb_channel_t *channel;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
738
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
739 channel = &(dvb_list_ptr->channels[dvb_list_ptr->current]);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
740 p->prog = channel->name;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
741 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
742 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
743
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
744
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
745 if(! dvb_streaming_start(priv, p, tuner_type))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
746 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
747 free(stream->priv);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
748 stream->priv = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
749 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
750 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
751
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
752 stream->type = STREAMTYPE_DVB;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
753 stream->fill_buffer = dvb_streaming_read;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
754 stream->close = dvbin_close;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
755 m_struct_free(&stream_opts, opts);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
756
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
757 return STREAM_OK;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
758 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
759
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
760
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
761
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
762 stream_info_t stream_info_dvb = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
763 "Dvb Input",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
764 "dvbin",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
765 "Nico",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
766 "based on the code from ??? (probably Arpi)",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
767 dvb_open,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
768 { "dvb", NULL },
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
769 &stream_opts,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
770 1 // Urls are an option string
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
771 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
772
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
773
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
774
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
775