annotate libmpdemux/dvbin.c @ 13520:5f4f9de738b2

fixed small memleak
author reimar
date Fri, 01 Oct 2004 19:51:03 +0000
parents fd40ef23053b
children 42d792053cde
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 },
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
82 {"username", ST_OFF(card), CONF_TYPE_INT, M_OPT_RANGE, 1, 4, NULL},
10560
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);
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
111 extern int dvb_get_tuner_type(int fd);
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
112 int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt, int *pids);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
113 int dvb_fix_demuxes(dvb_priv_t *priv, int cnt, int *pids);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
114
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
115 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
116 fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval,
13155
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
117 fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate,
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
118 fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
119 extern char *dvb_dvrdev[4], *dvb_demuxdev[4], *dvb_frontenddev[4];
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
120
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
121 static dvb_config_t *dvb_config = NULL;
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
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
124 static dvb_channels_list *dvb_get_channels(char *filename, int type)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
125 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
126 dvb_channels_list *list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
127 FILE *f;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
128 uint8_t line[CHANNEL_LINE_LEN];
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
129
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
130 int fields, cnt, pcnt;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
131 dvb_channel_t *ptr, *tmp, chn;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
132 char *tmp_lcr, *tmp_hier, *inv, *bw, *cr, *mod, *transm, *gi, *vpid_str, *apid_str;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
133 const char *cbl_conf = "%a[^:]:%d:%a[^:]:%d:%a[^:]:%a[^:]:%a[^:]:%a[^:]\n";
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
134 const char *sat_conf = "%a[^:]:%d:%c:%d:%d:%a[^:]:%a[^:]\n";
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
135 const char *ter_conf = "%a[^:]:%d:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]:%a[^:]\n";
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
136
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
137 mp_msg(MSGT_DEMUX, MSGL_V, "CONFIG_READ FILE: %s, type: %d\n", filename, type);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
138 if((f=fopen(filename, "r"))==NULL)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
139 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
140 mp_msg(MSGT_DEMUX, MSGL_FATAL, "CAN'T READ CONFIG FILE %s\n", filename);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
141 return NULL;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
142 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
143
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
144 list = malloc(sizeof(dvb_channels_list));
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
145 if(list == NULL)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
146 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
147 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
148 return NULL;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
149 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
150
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
151 ptr = &chn;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
152 list->NUM_CHANNELS = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
153 list->channels = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
154 while(! feof(f))
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
155 {
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
156 if( fgets(line, CHANNEL_LINE_LEN, f) == NULL )
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
157 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
158
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
159 if((line[0] == '#') || (strlen(line) == 0))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
160 continue;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
161
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
162
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
163 apid_str = vpid_str = NULL;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
164 ptr->pids_cnt = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
165 if(type == TUNER_TER)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
166 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
167 fields = sscanf(line, ter_conf,
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
168 &ptr->name, &ptr->freq, &inv, &bw, &cr, &tmp_lcr, &mod,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
169 &transm, &gi, &tmp_hier, &vpid_str, &apid_str);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
170 mp_msg(MSGT_DEMUX, MSGL_V,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
171 "TER, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d",
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
172 list->NUM_CHANNELS, fields, ptr->name, ptr->freq);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
173 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
174 else if(type == TUNER_CBL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
175 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
176 fields = sscanf(line, cbl_conf,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
177 &ptr->name, &ptr->freq, &inv, &ptr->srate,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
178 &cr, &mod, &vpid_str, &apid_str);
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
179 mp_msg(MSGT_DEMUX, MSGL_V,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
180 "CBL, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d",
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
181 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
182 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
183 else //SATELLITE
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
184 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
185 fields = sscanf(line, sat_conf,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
186 &ptr->name, &ptr->freq, &ptr->pol, &ptr->diseqc, &ptr->srate, &vpid_str, &apid_str);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
187 ptr->pol = toupper(ptr->pol);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
188 ptr->freq *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
189 ptr->srate *= 1000UL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
190 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
191 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
192 ptr->cr = FEC_AUTO;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
193 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
194 continue;
12116
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
195 if(ptr->diseqc > 0)
8d476d8a16ae fixed broken diseqc fetch from channels file
nicodvb
parents: 12108
diff changeset
196 ptr->diseqc--;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
197 mp_msg(MSGT_DEMUX, MSGL_V,
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
198 "SAT, NUM: %d, NUM_FIELDS: %d, NAME: %s, FREQ: %d, SRATE: %d, POL: %c, DISEQC: %d",
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
199 list->NUM_CHANNELS, fields, ptr->name, ptr->freq, ptr->srate, ptr->pol, ptr->diseqc);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
200 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
201
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
202 if(vpid_str != NULL)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
203 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
204 pcnt = sscanf(vpid_str, "%d+%d+%d+%d+%d+%d+%d", &ptr->pids[0], &ptr->pids[1], &ptr->pids[2], &ptr->pids[3],
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
205 &ptr->pids[4], &ptr->pids[5], &ptr->pids[6]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
206 if(pcnt > 0)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
207 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
208 ptr->pids_cnt = pcnt;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
209 fields++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
210 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
211 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
212
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
213 if(apid_str != NULL)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
214 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
215 cnt = ptr->pids_cnt;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
216 pcnt = sscanf(apid_str, "%d+%d+%d+%d+%d+%d+%d+%d", &ptr->pids[cnt], &ptr->pids[cnt+1], &ptr->pids[cnt+2],
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
217 &ptr->pids[cnt+3], &ptr->pids[cnt+4], &ptr->pids[cnt+5], &ptr->pids[cnt+6], &ptr->pids[cnt+7]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
218 if(pcnt > 0)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
219 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
220 ptr->pids_cnt += pcnt;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
221 fields++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
222 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
223 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
224
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
225 if((fields < 3) || (ptr->pids_cnt <= 0) || (ptr->freq == 0) || (strlen(ptr->name) == 0))
10708
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
226 continue;
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
227
a57e8d980652 This patch fixes:
alex
parents: 10560
diff changeset
228
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
229 ptr->pids[ptr->pids_cnt] = 0; //PID 0 is the PAT
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
230 ptr->pids_cnt++;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
231 mp_msg(MSGT_DEMUX, MSGL_V, " PIDS: ");
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
232 for(cnt = 0; cnt < ptr->pids_cnt; cnt++)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
233 mp_msg(MSGT_DEMUX, MSGL_V, " %d ", ptr->pids[cnt]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
234 mp_msg(MSGT_DEMUX, MSGL_V, "\n");
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
235
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
236 if((type == TUNER_TER) || (type == TUNER_CBL))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
237 {
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
238 if(! strcmp(inv, "INVERSION_ON"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
239 ptr->inv = INVERSION_ON;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
240 else if(! strcmp(inv, "INVERSION_OFF"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
241 ptr->inv = INVERSION_OFF;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
242 else
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
243 ptr->inv = INVERSION_AUTO;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
244
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(cr, "FEC_1_2"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
247 ptr->cr =FEC_1_2;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
248 else if(! strcmp(cr, "FEC_2_3"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
249 ptr->cr =FEC_2_3;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
250 else if(! strcmp(cr, "FEC_3_4"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
251 ptr->cr =FEC_3_4;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
252 #ifdef HAVE_DVB_HEAD
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
253 else if(! strcmp(cr, "FEC_4_5"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
254 ptr->cr =FEC_4_5;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
255 else if(! strcmp(cr, "FEC_6_7"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
256 ptr->cr =FEC_6_7;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
257 else if(! strcmp(cr, "FEC_8_9"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
258 ptr->cr =FEC_8_9;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
259 #endif
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
260 else if(! strcmp(cr, "FEC_5_6"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
261 ptr->cr =FEC_5_6;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
262 else if(! strcmp(cr, "FEC_7_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
263 ptr->cr =FEC_7_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
264 else if(! strcmp(cr, "FEC_NONE"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
265 ptr->cr =FEC_NONE;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
266 else ptr->cr =FEC_AUTO;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
267
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
268 if(! strcmp(mod, "QAM_128"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
269 ptr->mod = QAM_128;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
270 else if(! strcmp(mod, "QAM_256"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
271 ptr->mod = QAM_256;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
272 else if(! strcmp(mod, "QAM_64"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
273 ptr->mod = QAM_64;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
274 else if(! strcmp(mod, "QAM_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
275 ptr->mod = QAM_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
276 else if(! strcmp(mod, "QAM_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
277 ptr->mod = QAM_16;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
278 //else ptr->mod = QPSK;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
279 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
280
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
281
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
282 if(type == TUNER_TER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
283 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
284 if(! strcmp(bw, "BANDWIDTH_6_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
285 ptr->bw = BANDWIDTH_6_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
286 else if(! strcmp(bw, "BANDWIDTH_7_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
287 ptr->bw = BANDWIDTH_7_MHZ;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
288 else if(! strcmp(bw, "BANDWIDTH_8_MHZ"))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
289 ptr->bw = BANDWIDTH_8_MHZ;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
290
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
291
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
292 if(! strcmp(transm, "TRANSMISSION_MODE_2K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
293 ptr->trans = TRANSMISSION_MODE_2K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
294 else if(! strcmp(transm, "TRANSMISSION_MODE_8K"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
295 ptr->trans = TRANSMISSION_MODE_8K;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
296
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
297
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
298 if(! strcmp(gi, "GUARD_INTERVAL_1_32"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
299 ptr->gi = GUARD_INTERVAL_1_32;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
300 else if(! strcmp(gi, "GUARD_INTERVAL_1_16"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
301 ptr->gi = GUARD_INTERVAL_1_16;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
302 else if(! strcmp(gi, "GUARD_INTERVAL_1_8"))
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
303 ptr->gi = GUARD_INTERVAL_1_8;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
304 else ptr->gi = GUARD_INTERVAL_1_4;
13155
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
305
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
306 if(! strcmp(tmp_lcr, "FEC_1_2"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
307 ptr->cr_lp =FEC_1_2;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
308 else if(! strcmp(tmp_lcr, "FEC_2_3"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
309 ptr->cr_lp =FEC_2_3;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
310 else if(! strcmp(tmp_lcr, "FEC_3_4"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
311 ptr->cr_lp =FEC_3_4;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
312 #ifdef HAVE_DVB_HEAD
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
313 else if(! strcmp(tmp_lcr, "FEC_4_5"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
314 ptr->cr_lp =FEC_4_5;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
315 else if(! strcmp(tmp_lcr, "FEC_6_7"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
316 ptr->cr_lp =FEC_6_7;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
317 else if(! strcmp(tmp_lcr, "FEC_8_9"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
318 ptr->cr_lp =FEC_8_9;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
319 #endif
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
320 else if(! strcmp(tmp_lcr, "FEC_5_6"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
321 ptr->cr_lp =FEC_5_6;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
322 else if(! strcmp(tmp_lcr, "FEC_7_8"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
323 ptr->cr_lp =FEC_7_8;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
324 else if(! strcmp(tmp_lcr, "FEC_NONE"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
325 ptr->cr_lp =FEC_NONE;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
326 else ptr->cr_lp =FEC_AUTO;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
327
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
328
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
329 if(! strcmp(tmp_hier, "HIERARCHY_1"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
330 ptr->hier = HIERARCHY_1;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
331 else if(! strcmp(tmp_hier, "HIERARCHY_2"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
332 ptr->hier = HIERARCHY_2;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
333 else if(! strcmp(tmp_hier, "HIERARCHY_4"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
334 ptr->hier = HIERARCHY_4;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
335 #ifdef HAVE_DVB_HEAD
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
336 else if(! strcmp(tmp_hier, "HIERARCHY_AUTO"))
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
337 ptr->hier = HIERARCHY_AUTO;
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
338 #endif
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
339 else ptr->hier = HIERARCHY_NONE;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
340 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
341
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
342 tmp = (dvb_channel_t*)realloc(list->channels, sizeof(dvb_channel_t) * (list->NUM_CHANNELS + 1));
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
343 if(tmp == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
344 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
345
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
346 list->channels = tmp;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
347 memcpy(&(list->channels[list->NUM_CHANNELS]), ptr, sizeof(dvb_channel_t));
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
348 list->NUM_CHANNELS++;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
349 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
350
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
351 fclose(f);
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
352 if(list->NUM_CHANNELS == 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
353 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
354 if(list->channels != NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
355 free(list->channels);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
356 free(list);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
357 return NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
358 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
359
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
360 list->current = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
361 return list;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
362 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
363
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
364
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
365
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
366 static int dvb_streaming_read(stream_t *stream, char *buffer, int size)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
367 {
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
368 struct pollfd pfds[1];
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
369 int pos=0, tries, rk, fd;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
370 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
371
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
372 mp_msg(MSGT_DEMUX, MSGL_DBG3, "dvb_streaming_read(%d)\n", size);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
373
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
374 tries = priv->retry + 1;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
375
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
376 fd = stream->fd;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
377 while(pos < size)
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
378 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
379 pfds[0].fd = fd;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
380 pfds[0].events = POLLIN | POLLPRI;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
381
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
382 poll(pfds, 1, 500);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
383 rk = size - pos;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
384 if((rk = read(fd, &buffer[pos], rk)) > 0)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
385 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
386 pos += rk;
12047
6fbcdac049c6 added missing tuning parameters (inversion and coderate) and changed debug level in dvb_streaming_read()
nicodvb
parents: 11872
diff changeset
387 mp_msg(MSGT_DEMUX, MSGL_DBG3, "ret (%d) bytes\n", pos);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
388 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
389 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
390 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
391 errno = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
392 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
393 if(--tries > 0)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
394 continue;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
395 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
396 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
397 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
398 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
399
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
400 if(! pos)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
401 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
402
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
403 return pos;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
404 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
405
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
406 static void dvbin_close(stream_t *stream);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
407
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
408 int dvb_set_channel(dvb_priv_t *priv, int card, int n)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
409 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
410 dvb_channels_list *new_list;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
411 dvb_channel_t *channel;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
412 int do_tuning;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
413 stream_t *stream = (stream_t*) priv->stream;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
414 char buf[4096];
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
415 dvb_config_t *conf = (dvb_config_t *) priv->config;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
416 int devno;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
417 int i;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
418
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
419 if((card < 0) || (card > conf->count))
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
420 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
421 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CARD NUMBER: %d vs %d, abort\n", card, conf->count);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
422 return 0;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
423 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
424
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
425 devno = conf->cards[card].devno;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
426 new_list = conf->cards[card].list;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
427 if((n > new_list->NUM_CHANNELS) || (n < 0))
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
428 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
429 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_set_channel: INVALID CHANNEL NUMBER: %d, for card %d, abort\n", n, card);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
430 return 0;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
431 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
432 channel = &(new_list->channels[n]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
433
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
434 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
435 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
436 for(i = 0; i < priv->demux_fds_cnt; i++)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
437 dvb_demux_stop(priv->demux_fds[i]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
438
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
439 priv->retry = 0;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
440 while(dvb_streaming_read(stream, buf, 4096) > 0); //empty both the stream's and driver's buffer
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
441 if(priv->card != card)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
442 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
443 dvbin_close(stream);
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
444 if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids))
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
445 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
446 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
447 return 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
448 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
449 strcpy(priv->prev_tuning, "");
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
450 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
451 else //close all demux_fds with pos > pids required for the new channel or open other demux_fds if we have too few
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
452 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
453 if(! dvb_fix_demuxes(priv, channel->pids_cnt, channel->pids))
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
454 return 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
455 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
456 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
457 else
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
458 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
459 if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids))
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
460 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
461 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL2, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
462 return 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
463 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
464 strcpy(priv->prev_tuning, "");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
465 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
466
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
467 dvb_config->priv = priv;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
468 priv->card = card;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
469 priv->list = new_list;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
470 priv->retry = 5;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
471 new_list->current = n;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
472 stream->fd = priv->dvr_fd;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
473 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_SET_CHANNEL: new channel name=%s, card: %d, channel %d\n", channel->name, card, n);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
474
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
475 switch(priv->tuner_type)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
476 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
477 case TUNER_SAT:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
478 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
479 break;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
480
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
481 case TUNER_TER:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
482 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
483 channel->bw, channel->cr, channel->mod, channel->trans, channel->gi);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
484 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
485
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
486 case TUNER_CBL:
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
487 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
488 channel->cr, channel->mod);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
489 break;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
490 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
491
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
492
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
493
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
494 if(strcmp(priv->prev_tuning, priv->new_tuning))
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
495 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
496 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
497 strcpy(priv->prev_tuning, priv->new_tuning);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
498 do_tuning = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
499 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
500 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
501 {
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
502 mp_msg(MSGT_DEMUX, MSGL_V, "SAME TUNING PARAMETERS, NO TUNING\n");
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
503 do_tuning = 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
504 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
505
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
506 stream->eof=1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
507 stream_reset(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
508
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
509
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
510 if(do_tuning)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
511 if (! dvb_tune(priv, channel->freq, channel->pol, channel->srate, channel->diseqc, channel->tone,
13155
fd40ef23053b added forgotten dvb-t params lp_coderate and hierarchy
nicodvb
parents: 12803
diff changeset
512 channel->inv, channel->mod, channel->gi, channel->trans, channel->bw, channel->cr, channel->cr_lp, channel->hier))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
513 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
514
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
515
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
516 priv->is_on = 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
517
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
518 //sets demux filters and restart the stream
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
519 for(i = 0; i < channel->pids_cnt; i++)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
520 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
521 if(! dvb_set_ts_filt(priv->demux_fds[i], channel->pids[i], DMX_PES_OTHER))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
522 return 0;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
523 }
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
524
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
525 return 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
526 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
527
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
528
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
529
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
530 int dvb_step_channel(dvb_priv_t *priv, int dir)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
531 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
532 int new_current;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
533 dvb_channels_list *list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
534
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
535 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
536
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
537 if(priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
538 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
539 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL priv_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
540 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
541 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
542
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
543 list = priv->list;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
544 if(list == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
545 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
546 mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_step_channel: NULL list_ptr, quit\n");
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
547 return 0;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
548 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
549
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
550
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
551 if(dir == DVB_CHANNEL_HIGHER)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
552 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
553 if(list->current == list->NUM_CHANNELS-1)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
554 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
555
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
556 new_current = list->current + 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
557 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
558 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
559 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
560 if(list->current == 0)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
561 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
562
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
563 new_current = list->current - 1;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
564 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
565
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
566 return dvb_set_channel(priv, priv->card, new_current);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
567 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
568
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
569
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
570
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
571
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
572 extern char *get_path(char *);
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
573
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
574 static void dvbin_close(stream_t *stream)
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
575 {
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
576 int i;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
577 dvb_priv_t *priv = (dvb_priv_t *) stream->priv;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
578
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
579 for(i = priv->demux_fds_cnt-1; i >= 0; i--)
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
580 {
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
581 priv->demux_fds_cnt--;
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
582 mp_msg(MSGT_DEMUX, MSGL_V, "DVBIN_CLOSE, close(%d), fd=%d, COUNT=%d\n", i, priv->demux_fds[i], priv->demux_fds_cnt);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
583 close(priv->demux_fds[i]);
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
584 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
585 close(priv->dvr_fd);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
586
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
587 close(priv->fe_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
588 #ifdef HAVE_DVB
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
589 close(priv->sec_fd);
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
590 #endif
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
591
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
592 priv->is_on = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
593 dvb_config->priv = NULL;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
594 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
595
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
596
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
597 static int dvb_streaming_start(dvb_priv_t *priv, struct stream_priv_s *opts, int tuner_type, char *progname)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
598 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
599 int i;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
600 dvb_channel_t *channel = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
601 stream_t *stream = (stream_t*) priv->stream;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
602
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
603
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
604 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
605 mp_msg(MSGT_DEMUX, MSGL_INFO, "Released under the GPL.\n");
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
606 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
607 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
608 opts->prog, opts->card, opts->vid, opts->aid, opts->type, opts->file);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
609
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
610 priv->is_on = 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
611
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
612 i = 0;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
613 while((channel == NULL) && i < priv->list->NUM_CHANNELS)
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
614 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
615 if(! strcmp(priv->list->channels[i].name, progname))
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
616 channel = &(priv->list->channels[i]);
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
617
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
618 i++;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
619 }
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
620
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
621 if(channel != NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
622 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
623 priv->list->current = i-1;
12803
168238f8c715 added multi-pid parsing code (up to 15), pid 0 is always added (for the PAT)
nicodvb
parents: 12307
diff changeset
624 mp_msg(MSGT_DEMUX, MSGL_V, "PROGRAM NUMBER %d: name=%s, freq=%u\n", i-1, channel->name, channel->freq);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
625 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
626 else
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
627 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
628 mp_msg(MSGT_DEMUX, MSGL_ERR, "\n\nDVBIN: no such channel \"%s\"\n\n", progname);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
629 return 0;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
630 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
631
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
632
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
633 strcpy(priv->prev_tuning, "");
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
634 if(!dvb_set_channel(priv, priv->card, priv->list->current))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
635 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
636 mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR, COULDN'T SET CHANNEL %i: ", priv->list->current);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
637 dvbin_close(stream);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
638 return 0;
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 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
642
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
643 return 1;
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
644 }
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
645
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
646
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
647
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
648
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
649 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
650 {
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
651 // I don't force the file format bacause, although it's almost always TS,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
652 // there are some providers that stream an IP multicast with M$ Mpeg4 inside
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
653 struct stream_priv_s* p = (struct stream_priv_s*)opts;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
654 dvb_priv_t *priv;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
655 char *progname;
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
656 int tuner_type = 0;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
657
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
658
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
659 if(mode != STREAM_READ)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
660 return STREAM_UNSUPORTED;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
661
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
662 stream->priv = (dvb_priv_t*) malloc(sizeof(dvb_priv_t));
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
663 if(stream->priv == NULL)
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
664 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
665
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
666 priv = (dvb_priv_t *)stream->priv;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
667 priv->stream = stream;
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
668 dvb_config = dvb_get_config();
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
669 if(dvb_config == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
670 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
671 free(priv);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
672 mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB CONFIGURATION IS EMPTY, exit\n");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
673 return STREAM_ERROR;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
674 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
675 dvb_config->priv = priv;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
676 priv->config = dvb_config;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
677
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
678 if(p->card < 1 || p->card > priv->config->count)
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
679 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
680 free(priv);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
681 mp_msg(MSGT_DEMUX, MSGL_ERR, "NO CONFIGURATION FOUND FOR CARD N. %d, exit\n", p->card);
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
682 return STREAM_ERROR;
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
683 }
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
684 priv->card = p->card - 1;
11872
d158978a3d3c Compliance with the DVB power management specification (doesn't close
attila
parents: 11352
diff changeset
685
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
686 tuner_type = priv->config->cards[priv->card].type;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
687
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
688 if(tuner_type == 0)
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
689 {
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
690 free(priv);
11352
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
691 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
692 return STREAM_ERROR;
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
693 }
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
694
d8b1f7509df2 Patch by Nico <nsabbi@libero.it>
attila
parents: 10708
diff changeset
695
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
696 priv->tuner_type = tuner_type;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
697
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
698 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
699 p->prog, priv->card+1, priv->tuner_type, p->vid, p->aid);
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
700
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
701 priv->list = priv->config->cards[priv->card].list;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
702
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
703 if((! strcmp(p->prog, "")) && (priv->list != NULL))
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
704 progname = priv->list->channels[0].name;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
705 else
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
706 progname = p->prog;
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
707
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
708
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
709 if(! dvb_streaming_start(priv, p, tuner_type, progname))
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
710 {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
711 free(stream->priv);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
712 stream->priv = NULL;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
713 return STREAM_ERROR;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
714 }
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
715
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
716 stream->type = STREAMTYPE_DVB;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
717 stream->fill_buffer = dvb_streaming_read;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
718 stream->close = dvbin_close;
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
719 m_struct_free(&stream_opts, opts);
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
720
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
721 return STREAM_OK;
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents:
diff changeset
722 }
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
723
12307
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
724 #define MAX_CARDS 4
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
725 dvb_config_t *dvb_get_config()
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
726 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
727 int i, fd, type, size;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
728 char filename[30], *conf_file, *name;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
729 dvb_channels_list *list;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
730 dvb_card_config_t *cards = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
731 dvb_config_t *conf = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
732
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
733 if(dvb_config != NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
734 return dvb_config;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
735
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
736 conf = (dvb_config_t*) malloc(sizeof(dvb_config_t));
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
737 if(conf == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
738 return NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
739
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
740 conf->priv = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
741 conf->count = 0;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
742 conf->cards = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
743 for(i=0; i<MAX_CARDS; i++)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
744 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
745 sprintf(filename, "/dev/dvb/adapter%d/frontend0", i);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
746 fd = open(filename, O_RDWR | O_NONBLOCK);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
747 if(fd < 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
748 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
749 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't open device %s, skipping\n", filename);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
750 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
751 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
752
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
753 type = dvb_get_tuner_type(fd);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
754 close(fd);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
755 if(type != TUNER_SAT && type != TUNER_TER && type != TUNER_CBL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
756 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
757 mp_msg(MSGT_DEMUX, MSGL_V, "DVB_CONFIG, can't detect tuner type of card %d, skipping\n", i);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
758 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
759 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
760
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
761 switch(type)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
762 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
763 case TUNER_TER:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
764 conf_file = get_path("channels.conf.ter");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
765 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
766 case TUNER_CBL:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
767 conf_file = get_path("channels.conf.cbl");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
768 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
769 case TUNER_SAT:
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
770 conf_file = get_path("channels.conf.sat");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
771 break;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
772 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
773
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
774 if((access(conf_file, F_OK | R_OK) != 0))
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
775 conf_file = get_path("channels.conf");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
776
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
777 list = dvb_get_channels(conf_file, type);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
778 if(list == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
779 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
780
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
781 size = sizeof(dvb_card_config_t) * (conf->count + 1);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
782 cards = realloc(conf->cards, size);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
783
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
784 if(cards == NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
785 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
786 fprintf(stderr, "DVB_CONFIG, can't realloc %d bytes, skipping\n", size);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
787 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
788 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
789
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
790 name = (char*) malloc(20);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
791 if(name==NULL)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
792 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
793 fprintf(stderr, "DVB_CONFIG, can't realloc 20 bytes, skipping\n");
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
794 continue;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
795 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
796
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
797 conf->cards = cards;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
798 conf->cards[conf->count].devno = i;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
799 conf->cards[conf->count].list = list;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
800 conf->cards[conf->count].type = type;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
801 sprintf(name, "DVB-%c card n. %d", type==TUNER_TER ? 'T' : (type==TUNER_CBL ? 'C' : 'S'), conf->count+1);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
802 conf->cards[conf->count].name = name;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
803 conf->count++;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
804 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
805
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
806 if(conf->count == 0)
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
807 {
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
808 free(conf);
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
809 conf = NULL;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
810 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
811
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
812 dvb_config = conf;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
813 return conf;
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
814 }
44152bfdc002 new configuration structure, dvb_set_channel takes 2 parameters, 1000l memleak fix
nicodvb
parents: 12116
diff changeset
815
10560
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
816
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
817
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
818 stream_info_t stream_info_dvb = {
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
819 "Dvb Input",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
820 "dvbin",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
821 "Nico",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
822 "based on the code from ??? (probably Arpi)",
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
823 dvb_open,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
824 { "dvb", NULL },
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
825 &stream_opts,
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
826 1 // Urls are an option string
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
827 };
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
828
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
829
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
830
11826d9f90c7 this patch fixes
arpi
parents: 9610
diff changeset
831