Merge branch 'master' into reproducible-build

Makefile

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

README

    git clone git://github.com/gfto/mptsd.git
    git submodule init
    git submodule update
+     OR
+   git submodule update --recursive --remote  // if you like to checkout HEAD submodules.
 
 Compiling
 =========

config.c

 				}
 				// Init channel
 				if (channel == NULL) {
-					channel = channel_new(service_id, is_radio, id, name, source);
+					channel = channel_new(service_id, is_radio, id, name, source, i);
 				} else {
 					chansrc_add(channel, source);
 				}
 		if (r->cookie != cookie) {
 			proxy_log(r, "Remove");
 			/* Replace channel reference with real object and instruct free_restreamer to free it */
-			r->channel = channel_new(r->channel->service_id, r->channel->radio, r->channel->id, r->channel->name, r->channel->source);
+			r->channel = channel_new(r->channel->service_id, r->channel->radio, r->channel->id, r->channel->name, r->channel->source, r->channel->index);
 			r->freechannel = 1;
 			r->dienow = 1;
 		}

data.c

 	}
 };
 
-void chansrc_add(CHANNEL *c, char *src) {
+void chansrc_add(CHANNEL *c, const char *src) {
 	if (c->num_src >= MAX_CHANNEL_SOURCES-1)
 		return;
 	c->sources[c->num_src] = strdup(src);
 
 
 
-CHANNEL *channel_new(int service_id, int is_radio, char *id, char *name, char *source) {
+CHANNEL *channel_new(int service_id, int is_radio, const char *id, const char *name, const char *source, int channel_index){
+
+    if (channel_index<=0 || channel_index>=256)
+    {
+        
+	    LOGf("CONFIG: Error channel_new invalid index %d\n", channel_index);
+        return NULL;
+    }
+    //LOGf("CONFIG: ------------------channel_new() serviceid %d id %s name %s source %s index %d\n", service_id, id, name , source , channel_index);
+    
 	CHANNEL *c = calloc(1, sizeof(CHANNEL));
 	c->service_id = service_id;
 	c->radio = is_radio;
-	c->base_pid = service_id * 32; // The first pid is saved for PMT
+	c->index = channel_index;
+	c->base_pid = c->index * 32; // The first pid is saved for PMT , channel_index must > 0
 	c->pmt_pid = c->base_pid; // The first pid is saved for PMT
 	c->id = strdup(id);
 	c->name = strdup(name);
 	chansrc_add(c, source);
+
+
 	return c;
 }
 

data.h

 
 typedef struct {
 	/* Config */
+	int			index;
 	int			base_pid;
 	int			service_id;
 	int			pmt_pid;
 void		epg_free		(EPG_ENTRY **e);
 int			epg_changed		(EPG_ENTRY *a, EPG_ENTRY *b);
 
-CHANNEL *	channel_new		(int service_id, int is_radio, char *id, char *name, char *source);
+CHANNEL *	channel_new		(int service_id, int is_radio, const char *id, const char *name, const char *source, int channel_index);
 void		channel_free	(CHANNEL **c);
 void		channel_free_epg(CHANNEL *c);
 
 
 CHANSRC *	chansrc_init	(char *url);
 void		chansrc_free	(CHANSRC **url);
-void		chansrc_add		(CHANNEL *c, char *src);
+void		chansrc_add		(CHANNEL *c, const char *src);
 void		chansrc_next	(CHANNEL *c);
 void		chansrc_set		(CHANNEL *c, uint8_t src_id);
 

input.c

 	
 	if (s->last_pat->initialized) {
 		if (!ts_pat_is_same(s->pat, s->last_pat)) {
-			proxy_log(r, "PAT changed.");
+			proxy_log(r, "========================PAT changed.========================");
 			return -1; // Reconnect
 		}
 		ts_pat_free(&s->last_pat);
 		s->last_pat = ts_pat_alloc();
 	}
-    s->last_pat = ts_pat_push_packet(s->last_pat, ts_packet);
+	s->last_pat = ts_pat_push_packet(s->last_pat, ts_packet);
 	if (s->pat->initialized) {
 		// PMT pid is still unknown
 		if (!s->pmt_pid) {
 
 	s->pmt = ts_pmt_push_packet(s->pmt, ts_packet);
 
-	s->last_pmt = ts_pmt_push_packet(s->last_pmt, ts_packet);
+	
 	if (s->last_pmt->initialized) {
 		if (!ts_pmt_is_same(s->pmt, s->last_pmt)) {
-			proxy_log(r, "PMT changed.");
+			proxy_log(r, "========================PMT changed.========================");
 			return -2; // Reconnect
 		}
 		ts_pmt_free(&s->last_pmt);
 		s->last_pmt = ts_pmt_alloc();
 	}
 
+	s->last_pmt = ts_pmt_push_packet(s->last_pmt, ts_packet);
+
 	if (s->pmt->initialized) {
 		if (!s->pmt_rewritten || !s->pmt_rewritten->initialized) {
 			input_rewrite_pmt(r);

mptsd.conf

 network_id=1
 
 [Timeouts]
-pat = 100
-pmt = 200
-sdt = 500
-nit = 2000
-eit = 1000
-tdt = 5000
-tot = 15000
-stats = 1000
+pat = 100       // Min:25 Max:500
+#cat = 200      // Min:25 Max:500       ** unused **
+pmt = 200       // Min:25 Max:500
+nit = 2000      // Min:25 Max:10000
+sdt = 500       // Min:25 Max:2000
+#bat = 5000     // Min:25 Max:10000     ** unused **
+eit = 1000      // Min:25 Max:2000
+#rst = 20000    // Min:25 Max: -        ** unused **
+tdt = 5000      // Min:25 Max:30000
+tot = 15000     // Min:25 Max:30000
+stats = 1000    // No limits