Browse Source

Merge branch 'master' into reproducible-build

Georgi Chorbadzhiyski 1 year ago
parent
commit
52db752265
No account linked to committer's email
7 changed files with 42 additions and 21 deletions
  1. 3 2
      Makefile
  2. 2 0
      README
  3. 2 2
      config.c
  4. 15 3
      data.c
  5. 3 2
      data.h
  6. 6 4
      input.c
  7. 11 8
      mptsd.conf

+ 3 - 2
Makefile View File

@@ -1,11 +1,12 @@
1
-CC = $(CROSS)$(TARGET)gcc
1
+CC? = $(CROSS)$(TARGET)gcc
2 2
 STRIP = $(CROSS)$(TARGET)strip
3 3
 VERSION="v1.1"
4 4
 ifndef REPRODUCIBLE_BUILD
5 5
 BUILD_ID = $(shell date +%F_%R)
6 6
 GIT_VER = $(shell git describe --tags --dirty --always 2>/dev/null)
7 7
 endif
8
-CFLAGS = -ggdb -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -O2 -D_GNU_SOURCE -DBUILD_ID=\"$(BUILD_ID)\"
8
+CFLAGS ?= -ggdb -O2
9
+CFLAGS += -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -D_GNU_SOURCE -DBUILD_ID=\"$(BUILD_ID)\"
9 10
 ifneq "$(GIT_VER)" ""
10 11
 CFLAGS += -DGIT_VER=\"$(GIT_VER)\"
11 12
 else

+ 2 - 0
README View File

@@ -47,6 +47,8 @@ to get it, run the following command:
47 47
    git clone git://github.com/gfto/mptsd.git
48 48
    git submodule init
49 49
    git submodule update
50
+     OR
51
+   git submodule update --recursive --remote  // if you like to checkout HEAD submodules.
50 52
 
51 53
 Compiling
52 54
 =========

+ 2 - 2
config.c View File

@@ -142,7 +142,7 @@ int config_load_channels(CONFIG *conf) {
142 142
 				}
143 143
 				// Init channel
144 144
 				if (channel == NULL) {
145
-					channel = channel_new(service_id, is_radio, id, name, source);
145
+					channel = channel_new(service_id, is_radio, id, name, source, i);
146 146
 				} else {
147 147
 					chansrc_add(channel, source);
148 148
 				}
@@ -222,7 +222,7 @@ int config_load_channels(CONFIG *conf) {
222 222
 		if (r->cookie != cookie) {
223 223
 			proxy_log(r, "Remove");
224 224
 			/* Replace channel reference with real object and instruct free_restreamer to free it */
225
-			r->channel = channel_new(r->channel->service_id, r->channel->radio, r->channel->id, r->channel->name, r->channel->source);
225
+			r->channel = channel_new(r->channel->service_id, r->channel->radio, r->channel->id, r->channel->name, r->channel->source, r->channel->index);
226 226
 			r->freechannel = 1;
227 227
 			r->dienow = 1;
228 228
 		}

+ 15 - 3
data.c View File

@@ -88,7 +88,7 @@ void chansrc_free(CHANSRC **purl) {
88 88
 	}
89 89
 };
90 90
 
91
-void chansrc_add(CHANNEL *c, char *src) {
91
+void chansrc_add(CHANNEL *c, const char *src) {
92 92
 	if (c->num_src >= MAX_CHANNEL_SOURCES-1)
93 93
 		return;
94 94
 	c->sources[c->num_src] = strdup(src);
@@ -121,15 +121,27 @@ void chansrc_set(CHANNEL *c, uint8_t src_id) {
121 121
 
122 122
 
123 123
 
124
-CHANNEL *channel_new(int service_id, int is_radio, char *id, char *name, char *source) {
124
+CHANNEL *channel_new(int service_id, int is_radio, const char *id, const char *name, const char *source, int channel_index){
125
+
126
+    if (channel_index<=0 || channel_index>=256)
127
+    {
128
+        
129
+	    LOGf("CONFIG: Error channel_new invalid index %d\n", channel_index);
130
+        return NULL;
131
+    }
132
+    //LOGf("CONFIG: ------------------channel_new() serviceid %d id %s name %s source %s index %d\n", service_id, id, name , source , channel_index);
133
+    
125 134
 	CHANNEL *c = calloc(1, sizeof(CHANNEL));
126 135
 	c->service_id = service_id;
127 136
 	c->radio = is_radio;
128
-	c->base_pid = service_id * 32; // The first pid is saved for PMT
137
+	c->index = channel_index;
138
+	c->base_pid = c->index * 32; // The first pid is saved for PMT , channel_index must > 0
129 139
 	c->pmt_pid = c->base_pid; // The first pid is saved for PMT
130 140
 	c->id = strdup(id);
131 141
 	c->name = strdup(name);
132 142
 	chansrc_add(c, source);
143
+
144
+
133 145
 	return c;
134 146
 }
135 147
 

+ 3 - 2
data.h View File

@@ -59,6 +59,7 @@ typedef struct {
59 59
 
60 60
 typedef struct {
61 61
 	/* Config */
62
+	int			index;
62 63
 	int			base_pid;
63 64
 	int			service_id;
64 65
 	int			pmt_pid;
@@ -219,7 +220,7 @@ EPG_ENTRY *	epg_new			(time_t start, int duration, char *encoding, char *event,
219 220
 void		epg_free		(EPG_ENTRY **e);
220 221
 int			epg_changed		(EPG_ENTRY *a, EPG_ENTRY *b);
221 222
 
222
-CHANNEL *	channel_new		(int service_id, int is_radio, char *id, char *name, char *source);
223
+CHANNEL *	channel_new		(int service_id, int is_radio, const char *id, const char *name, const char *source, int channel_index);
223 224
 void		channel_free	(CHANNEL **c);
224 225
 void		channel_free_epg(CHANNEL *c);
225 226
 
@@ -228,7 +229,7 @@ int is_rtp(char *url);
228 229
 
229 230
 CHANSRC *	chansrc_init	(char *url);
230 231
 void		chansrc_free	(CHANSRC **url);
231
-void		chansrc_add		(CHANNEL *c, char *src);
232
+void		chansrc_add		(CHANNEL *c, const char *src);
232 233
 void		chansrc_next	(CHANNEL *c);
233 234
 void		chansrc_set		(CHANNEL *c, uint8_t src_id);
234 235
 

+ 6 - 4
input.c View File

@@ -185,13 +185,13 @@ int process_pat(INPUT *r, uint16_t pid, uint8_t *ts_packet) {
185 185
 	
186 186
 	if (s->last_pat->initialized) {
187 187
 		if (!ts_pat_is_same(s->pat, s->last_pat)) {
188
-			proxy_log(r, "PAT changed.");
188
+			proxy_log(r, "========================PAT changed.========================");
189 189
 			return -1; // Reconnect
190 190
 		}
191 191
 		ts_pat_free(&s->last_pat);
192 192
 		s->last_pat = ts_pat_alloc();
193 193
 	}
194
-    s->last_pat = ts_pat_push_packet(s->last_pat, ts_packet);
194
+	s->last_pat = ts_pat_push_packet(s->last_pat, ts_packet);
195 195
 	if (s->pat->initialized) {
196 196
 		// PMT pid is still unknown
197 197
 		if (!s->pmt_pid) {
@@ -243,16 +243,18 @@ int process_pmt(INPUT *r, uint16_t pid, uint8_t *ts_packet) {
243 243
 
244 244
 	s->pmt = ts_pmt_push_packet(s->pmt, ts_packet);
245 245
 
246
-	s->last_pmt = ts_pmt_push_packet(s->last_pmt, ts_packet);
246
+	
247 247
 	if (s->last_pmt->initialized) {
248 248
 		if (!ts_pmt_is_same(s->pmt, s->last_pmt)) {
249
-			proxy_log(r, "PMT changed.");
249
+			proxy_log(r, "========================PMT changed.========================");
250 250
 			return -2; // Reconnect
251 251
 		}
252 252
 		ts_pmt_free(&s->last_pmt);
253 253
 		s->last_pmt = ts_pmt_alloc();
254 254
 	}
255 255
 
256
+	s->last_pmt = ts_pmt_push_packet(s->last_pmt, ts_packet);
257
+
256 258
 	if (s->pmt->initialized) {
257 259
 		if (!s->pmt_rewritten || !s->pmt_rewritten->initialized) {
258 260
 			input_rewrite_pmt(r);

+ 11 - 8
mptsd.conf View File

@@ -2,11 +2,14 @@
2 2
 network_id=1
3 3
 
4 4
 [Timeouts]
5
-pat = 100
6
-pmt = 200
7
-sdt = 500
8
-nit = 2000
9
-eit = 1000
10
-tdt = 5000
11
-tot = 15000
12
-stats = 1000
5
+pat = 100       // Min:25 Max:500
6
+#cat = 200      // Min:25 Max:500       ** unused **
7
+pmt = 200       // Min:25 Max:500
8
+nit = 2000      // Min:25 Max:10000
9
+sdt = 500       // Min:25 Max:2000
10
+#bat = 5000     // Min:25 Max:10000     ** unused **
11
+eit = 1000      // Min:25 Max:2000
12
+#rst = 20000    // Min:25 Max: -        ** unused **
13
+tdt = 5000      // Min:25 Max:30000
14
+tot = 15000     // Min:25 Max:30000
15
+stats = 1000    // No limits