Add ECM reports and --ecm-report-time parameter.

camd.c

@@ -285,8 +285,11 @@ static void camd_do_msg(struct camd_msg *msg) {
 		if (camd35_send_emm(msg->ts, msg->ca_id, msg->data, msg->data_len) > 0)
 			msg->ts->emm_processed_count++;
 	}
-	if (msg->type == ECM_MSG)
-		camd35_send_ecm(msg->ts, msg->ca_id, msg->service_id, msg->idx, msg->data, msg->data_len);
+	if (msg->type == ECM_MSG) {
+		msg->ts->ecm_seen_count++;
+		if (camd35_send_ecm(msg->ts, msg->ca_id, msg->service_id, msg->idx, msg->data, msg->data_len) > 0)
+			msg->ts->ecm_processed_count++;
+	}
 
 	camd_msg_free(&msg);
 }

data.c

@@ -79,6 +79,9 @@ void data_init(struct ts *ts) {
 	ts->emm_report_interval = 60;
 	ts->emm_last_report     = time(NULL);
 
+	ts->ecm_report_interval = 60;
+	ts->ecm_last_report     = time(NULL);
+
 	ts->input.fd    = 0; // STDIN
 	ts->input.type  = FILE_IO;
 

data.h

@@ -110,6 +110,12 @@ struct ts {
 	unsigned int		emm_report_interval;
 	time_t				emm_last_report;
 
+	unsigned int		ecm_seen_count;
+	unsigned int		ecm_processed_count;
+	unsigned int		ecm_duplicate_count;
+	unsigned int		ecm_report_interval;
+	time_t				ecm_last_report;
+
 	// CAMD handling
 	struct key			key;
 	struct camd35		camd35;

tables.c

@@ -167,6 +167,8 @@ static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	struct ts_header *th = &ts->ecm->ts_header;
 	struct ts_section_header *sec = ts->ecm->section_header;
 	int duplicate = ts_privsec_is_same(ts->ecm, ts->last_ecm);
+	if (duplicate && !ts->is_cw_error)
+		ts->ecm_duplicate_count++;
 	if (!duplicate || ts->is_cw_error) {
 		if (ts->ecm_cw_log) {
 			ts_hex_dump_buf(dump, dump_buf_sz, sec->section_data, min(dump_sz, sec->section_data_len), 0);

tsdecrypt.1

@@ -128,6 +128,10 @@ always chooses the first stream from the chosen CA system. Run tsdecrypt
 with --debug 2 and look at CA descriptors in PMT to see what CA streams
 are available.
 .TP
+\fB\-H\fR, \fB\-\-ecm\-report\-time\fR <seconds>
+Set interval for ECM reports. The default is \fB60\fR seconds. Set to \fB0\fR
+to disable ECM reports.
+.TP
 \fB\-G\fR, \fB\-\-ecm\-irdeto\-type\fR <type>
 Set ECM IRDETO type. IRDETO CA send ECMs with different id mixed
 into one stream. Only one of the IDs are valid in given time. This

tsdecrypt.c

@@ -73,6 +73,7 @@ static const struct option long_options[] = {
 	{ "emm-report-time",	required_argument, NULL, 'f' },
 
 	{ "ecm-pid",			required_argument, NULL, 'X' },
+	{ "ecm-report-time",	required_argument, NULL, 'H' },
 	{ "ecm-irdeto-type",	required_argument, NULL, 'G' },
 	{ "ecm-no-log",			no_argument      , NULL, 'K' },
 
@@ -133,6 +134,9 @@ static void show_help(struct ts *ts) {
 	printf("\n");
 	printf("ECM options:\n");
 	printf(" -X --ecm-pid <pid>         | Force ECM pid. Default: none\n");
+	printf(" -H --ecm-report-time <sec> | Report each <sec> how much ECMs and CWs have been\n");
+	printf("                            . processed/skipped. Set <sec> to 0 to disable\n");
+	printf("                            . the reports. Default: %d sec\n", ts->ecm_report_interval);
 	printf(" -G --ecm-irdeto-type <int> | Process IRDETO ECMs with type X /0..3/. Default: %d\n", ts->irdeto_ecm);
 	printf(" -K --ecm-no-log            | Disable ECM and code words logging.\n");
 	printf("\n");
@@ -284,6 +288,11 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 'X':
 				ts->forced_ecm_pid = strtoul(optarg, NULL, 0) & 0x1fff;
 				break;
+			case 'H':
+				ts->ecm_report_interval = strtoul(optarg, NULL, 10);
+				if (ts->ecm_report_interval > 86400)
+					ts->ecm_report_interval = 86400;
+				break;
 			case 'G':
 				ts->irdeto_ecm = atoi(optarg);
 				break;
@@ -375,6 +384,10 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 		ts_LOGf("EMM send   : %s\n", ts->emm_send   ? "enabled" : "disabled");
 		ts_LOGf("Decoding   : %s\n", ts->threaded ? "threaded" : "single thread");
 	}
+	if (!ts->emm_only && ts->ecm_report_interval)
+		ts_LOGf("ECM report : %d sec\n", ts->emm_report_interval);
+	if (!ts->emm_only && ts->ecm_report_interval == 0)
+		ts_LOGf("ECM report : disabled\n");
 
 	if (!ts->ecm_cw_log)
 		ts_LOGf("ECM/CW log : disabled\n");
@@ -400,6 +413,19 @@ static void do_reports(struct ts *ts) {
 			ts->emm_processed_count = 0;
 		}
 	}
+	if (!ts->emm_only && ts->ecm_report_interval) {
+		if ((time_t)(ts->ecm_last_report + ts->ecm_report_interval) <= now) {
+			ts->ecm_last_report = now;
+			ts_LOGf("ECM | Received %u (%u dup) and processed %u in %u seconds.\n",
+				ts->ecm_seen_count,
+				ts->ecm_duplicate_count,
+				ts->ecm_processed_count,
+				ts->ecm_report_interval);
+			ts->ecm_seen_count = 0;
+			ts->ecm_duplicate_count = 0;
+			ts->ecm_processed_count = 0;
+		}
+	}
 }
 
 void signal_quit(int sig) {