Add --ecm-pid option to manually set ECM pid.

data.h

@@ -103,6 +103,7 @@ struct ts {
 	uint16_t			emm_caid, emm_pid;
 	uint16_t			ecm_caid, ecm_pid;
 	uint16_t			forced_emm_pid;
+	uint16_t			forced_ecm_pid;
 	uint16_t			ecm_counter;
 	pidmap_t			pidmap;
 	pidmap_t			cc; // Continuity counters

tables.c

@@ -101,10 +101,18 @@ void process_pmt(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	}
 
 	ts_get_ecm_info(ts->pmt, ts->req_CA_sys, &ts->ecm_caid, &ts->ecm_pid);
+	if (!ts->ecm_caid && ts->forced_ecm_pid)
+		ts->ecm_caid = 0xffff;
 	if (ts->ecm_caid) {
 		char *CA_sys = ts_get_CA_sys_txt(ts_get_CA_sys(ts->ecm_caid));
 		ts_LOGf("--- | ECM CAID: 0x%04x (%s)\n", ts->ecm_caid, CA_sys);
-		ts_LOGf("--- | ECM pid : 0x%04x (%s)\n", ts->ecm_pid, CA_sys);
+		if (!ts->forced_ecm_pid) {
+			ts_LOGf("--- | ECM pid : 0x%04x (%s)\n", ts->ecm_pid, CA_sys);
+		} else {
+			ts_LOGf("--- | ECM pid : 0x%04x (%s) (forced: 0x%04x)\n",
+				ts->ecm_pid, CA_sys, ts->forced_ecm_pid);
+			ts->ecm_pid = ts->forced_ecm_pid;
+		}
 	} else {
 		ts_LOGf("*** | ERROR: Can't detect ECM pid.\n");
 	}

tsdecrypt.1

@@ -121,6 +121,13 @@ Set to \fB0\fR to disable EMM reporting.
 .SH ECM OPTIONS
 .PP
 .TP
+\fB\-X\fR, \fB\-\-ecm\-pid\fR <pid>
+Set ECM pid manually. This option is useful for services that have
+couple of ECM streams from one CA system. Without this option tsdecrypt
+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\-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

@@ -72,6 +72,7 @@ static const struct option long_options[] = {
 	{ "emm-only",			no_argument,       NULL, 'E' },
 	{ "emm-report-time",	required_argument, NULL, 'f' },
 
+	{ "ecm-pid",			required_argument, NULL, 'X' },
 	{ "ecm-irdeto-type",	required_argument, NULL, 'G' },
 
 	{ "debug",				required_argument, NULL, 'D' },
@@ -129,6 +130,7 @@ static void show_help(struct ts *ts) {
 	printf("                            | Set <sec> to 0 to disable reporting. Default: %d\n", ts->camd35.emm_count_report_interval);
 	printf("\n");
 	printf("ECM options:\n");
+	printf(" -X --ecm-pid <pid>         | Force ECM pid. Default: none\n");
 	printf(" -G --ecm-irdeto-type <int> | Process only IRDETO ECMs with selected type (0,1,2,3). Default: %d\n", ts->irdeto_ecm);
 	printf("\n");
 	printf("Misc options:\n");
@@ -164,7 +166,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, i, ca_err = 0, server_err = 1, input_addr_err = 0, output_addr_err = 0, output_intf_err = 0, ident_err = 0;
-	while ( (j = getopt_long(argc, argv, "i:d:l:L:I:RzO:o:t:pc:s:U:P:y:eZ:Ef:G:D:h", long_options, NULL)) != -1 ) {
+	while ( (j = getopt_long(argc, argv, "i:d:l:L:I:RzO:o:t:pc:s:U:P:y:eZ:Ef:X:G:D:h", long_options, NULL)) != -1 ) {
 		char *p = NULL;
 		switch (j) {
 			case 'i':
@@ -275,6 +277,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 					ts->camd35.emm_count_report_interval = 86400;
 				break;
 
+			case 'X':
+				ts->forced_ecm_pid = strtoul(optarg, NULL, 0) & 0x1fff;
+				break;
 			case 'G':
 				ts->irdeto_ecm = atoi(optarg);
 				break;
@@ -332,6 +337,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	if (ts->forced_emm_pid)
 		ts_LOGf("EMM pid    : 0x%04x (%d)\n", ts->forced_emm_pid, ts->forced_emm_pid);
 
+	if (ts->forced_ecm_pid)
+		ts_LOGf("ECM pid    : 0x%04x (%d)\n", ts->forced_ecm_pid, ts->forced_ecm_pid);
+
 	if (!ts->emm_only)
 	{
 		if (ts->output.type == NET_IO) {