Report TS discontinuity in input stream

data.c

@@ -23,6 +23,8 @@ void data_init(struct ts *ts) {
 	ts->last_ecm = ts_privsec_alloc();
 
 	pidmap_clear(&ts->pidmap);
+	pidmap_clear(&ts->cc);
+	pidmap_clear(&ts->pid_seen);
 
 	// Key
 	memset(&ts->key, 0, sizeof(ts->key));
@@ -41,6 +43,8 @@ void data_init(struct ts *ts) {
 	strcpy(ts->camd35.pass, "pass");
 
 	// Config
+	ts->ts_discont  = 1;
+
 	ts->debug_level = 0;
 	ts->req_CA_sys  = CA_CONNAX;
 	ts->emm_send    = 1;

data.h

@@ -81,6 +81,8 @@ struct ts {
 	uint16_t			ecm_caid, ecm_pid;
 	uint16_t			ecm_counter;
 	pidmap_t			pidmap;
+	pidmap_t			cc; // Continuity counters
+	pidmap_t			pid_seen;
 
 	// CAMD handling
 	struct key			key;
@@ -96,6 +98,7 @@ struct ts {
 	struct io			output;
 
 	int					debug_level;
+	int					ts_discont;
 
 	int					camd_stop;
 	int					is_cw_error;

libts

@@ -1 +1 @@
-Subproject commit 69322e5eeff4826d5faceb0bcaef442f15fe5dab
+Subproject commit a2a3c0b9af834b7f598f0ec004ebe5cbf5487e4c

process.c

@@ -1,4 +1,5 @@
 #include <unistd.h>
+#include <string.h>
 
 #include "data.h"
 #include "tables.h"
@@ -6,6 +7,47 @@
 static unsigned long ts_pack;
 static int ts_pack_shown;
 
+static char *get_pid_desc(struct ts *ts, uint16_t pid) {
+	int i;
+	uint16_t nitpid = 0x0010, pmtpid = 0xffff, pcrpid = 0xffff;
+
+	if (ts->pat->initialized) {
+		for (i=0;i<ts->pat->programs_num;i++) {
+			struct ts_pat_program *prg = ts->pat->programs[i];
+			if (prg->pid) {
+				if (prg->program == 0)
+					nitpid = prg->pid;
+			}
+		}
+	}
+
+	if (ts->pmt->initialized) {
+		pmtpid = ts->pmt->ts_header.pid;
+		pcrpid = ts->pmt->PCR_pid;
+		for (i=0;i<ts->pmt->streams_num;i++) {
+			struct ts_pmt_stream *stream = ts->pmt->streams[i];
+			if (pid == stream->pid)
+				return h222_stream_type_desc(stream->stream_type);
+		}
+	}
+
+	switch (pid) {
+		case 0x0000: return "PAT"; break;
+		case 0x0001: return "CAT"; break;
+		case 0x0011: return "SDT"; break;
+		case 0x0012: return "EPG"; break;
+		case 0x0014: return "TDT/TOT"; break;
+	}
+
+	if (pid == nitpid)		return "NIT";
+	else if (pid == pmtpid)	return "PMT";
+	else if (pid == pcrpid)	return "PCR";
+	else if (pid == ts->emm_pid)	return "EMM";
+	else if (pid == ts->ecm_pid)	return "ECM";
+
+	return "Unknown";
+}
+
 void show_ts_pack(struct ts *ts, uint16_t pid, char *wtf, char *extra, uint8_t *ts_packet) {
 	char cw1_dump[8 * 6];
 	char cw2_dump[8 * 6];
@@ -160,6 +202,36 @@ void *write_thread(void *_ts) {
 	return NULL;
 }
 
+static void detect_discontinuity(struct ts *ts, uint8_t *ts_packet) {
+	uint16_t pid;
+	uint8_t cur_cc, last_cc;
+
+	if (!ts->ts_discont)
+		return;
+
+	pid = ts_packet_get_pid(ts_packet);
+	cur_cc = ts_packet_get_cont(ts_packet);
+
+	if (!pidmap_get(&ts->pid_seen, pid)) {
+		if (strcmp(get_pid_desc(ts, pid), "Unknown") == 0)
+			return;
+
+		pidmap_set(&ts->pid_seen, pid);
+		pidmap_set_val(&ts->cc, pid, cur_cc);
+		ts_LOGf("Input PID 0x%03x appeared (%s)\n",
+				pid, get_pid_desc(ts, pid));
+		return;
+	}
+
+	last_cc = pidmap_get(&ts->cc, pid);
+	if (last_cc != cur_cc && ((last_cc + 1) & 0x0f) != cur_cc)
+		ts_LOGf("Input discontinuity (expected %2d got %2d) PID 0x%03x (%s)\n",
+				((last_cc + 1) & 0x0f), cur_cc,
+				pid,
+				get_pid_desc(ts, pid));
+	pidmap_set_val(&ts->cc, pid, cur_cc);
+}
+
 void process_packets(struct ts *ts, uint8_t *data, ssize_t data_len) {
 	ssize_t i;
 	for (i=0; i<data_len; i += 188) {
@@ -174,6 +246,8 @@ void process_packets(struct ts *ts, uint8_t *data, ssize_t data_len) {
 		process_emm(ts, pid, ts_packet);
 		process_ecm(ts, pid, ts_packet);
 
+		detect_discontinuity(ts, ts_packet);
+
 		if (!ts_pack_shown)
 			dump_ts_pack(ts, pid, ts_packet);
 

tsdecrypt.c

@@ -35,6 +35,7 @@ static void show_help(struct ts *ts) {
 	printf("                   |    -I -              (read from STDIN, the default)\n");
 	printf("\n");
 	printf("    -c ca_system   | default: %s valid: IRDETO, CONNAX, CRYPTOWORKS\n", ts_get_CA_sys_txt(ts->req_CA_sys));
+	printf("    -z             | Detect discontinuty errors in input stream (default: %s).\n", ts->ts_discont ? "report" : "ignore");
 	printf("\n");
 	printf("  Output options:\n");
 	printf("    -O output      | Where to send output. Supports files and multicast\n");
@@ -92,7 +93,7 @@ static int parse_io_param(struct io *io, char *opt, int open_flags, mode_t open_
 
 static void parse_options(struct ts *ts, int argc, char **argv) {
 	int j, ca_err = 0, server_err = 1, input_addr_err = 0, output_addr_err = 0, output_intf_err = 0;
-	while ((j = getopt(argc, argv, "cFs:I:O:i:t:U:P:epD:h")) != -1) {
+	while ((j = getopt(argc, argv, "cFs:I:O:i:t:U:P:ezpD:h")) != -1) {
 		char *p = NULL;
 		switch (j) {
 			case 'c':
@@ -144,6 +145,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				ts->camd35.pass[sizeof(ts->camd35.pass) - 1] = 0;
 				break;
 
+			case 'z':
+				ts->ts_discont = !ts->ts_discont;
+				break;
 			case 'e':
 				ts->emm_send = !ts->emm_send;
 				break;
@@ -192,6 +196,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	ts_LOGf("Server pass: %s\n", ts->camd35.pass);
 	ts_LOGf("EMM send   : %s\n", ts->emm_send   ? "enabled" : "disabled");
 	ts_LOGf("PID filter : %s\n", ts->pid_filter ? "enabled" : "disabled");
+	ts_LOGf("TS discont : %s\n", ts->ts_discont ? "report" : "ignore");
 	ts->threaded = !(ts->input.type == FILE_IO && ts->input.fd != 0);
 	ts_LOGf("Decoding   : %s\n", ts->threaded ? "threaded" : "single thread");
 }