Add --service option, to choose service id (program) in MPTS input.

ChangeLog

@@ -1,3 +1,6 @@
+xxxx-xx-xx : Version next
+ * Add --service option, to choose service id (program) in MPTS input.
+
 2011-11-18 : Version 4.0
  * Set CAMD sockets NODELAY to avoid OSCAM errors when many packets are sent.
  * Add --syslog parameter to enable local syslog logging.

data.h

@@ -113,6 +113,7 @@ struct ts {
 	struct ts_privsec	*tmp_ecm;
 	uint16_t			pmt_pid;
 	uint16_t			service_id;
+	uint16_t			forced_service_id;
 	uint16_t			emm_caid, emm_pid;
 	uint16_t			ecm_caid, ecm_pid;
 	uint16_t			forced_caid;

tables.c

@@ -43,6 +43,8 @@ extern void show_ts_pack(struct ts *ts, uint16_t pid, char *wtf, char *extra, ui
 
 void process_pat(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	int i;
+	int num_services = 0;
+	uint16_t f_service = 0, f_pid = 0;
 	if (pid != 0x00)
 		return;
 
@@ -50,13 +52,38 @@ void process_pat(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 
 	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) {
-				ts->pmt_pid    = prg->pid;
-				ts->service_id = prg->program;
+		if (prg->pid && prg->program != 0) {
+			num_services++;
+			ts->pmt_pid    = prg->pid;
+			ts->service_id = prg->program;
+			if (prg->program == ts->forced_service_id) {
+				f_pid     = prg->pid;
+				f_service = prg->program;
 			}
 		}
 	}
+
+	if (f_service && f_pid) {
+		ts->pmt_pid    = f_pid;
+		ts->service_id = f_service;
+	}
+
+	if (num_services > 1 && !f_service) {
+		ts_LOGf("PAT | %d services exists. Consider using --service parameter.\n",
+			num_services);
+		for (i = 0; i < ts->pat->programs_num; i++) {
+			struct ts_pat_program *prg = ts->pat->programs[i];
+			if (prg->pid && prg->program != 0) {
+				ts_LOGf("PAT | Service 0x%04x (%5d) with PMT PID %04x (%d)\n",
+					prg->program, prg->program,
+					prg->pid, prg->pid);
+			}
+		}
+	}
+
+	ts_LOGf("PAT | Using service 0x%04x (%d), PMT pid: %04x (%d)\n",
+		ts->service_id, ts->service_id,
+		ts->pmt_pid, ts->pmt_pid);
 }
 
 void process_cat(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {

tsdecrypt.1

@@ -68,6 +68,12 @@ stream over UDP multicast.
 \fB\-z\fR, \fB\-\-input\-ignore\-disc\fR
 Do not report input discontinuity or RTP discontinuity errors.
 .TP
+\fB\-M\fR, \fB\-\-service\fR <service_id>
+Choose the service id. This option must be used when the input is MPTS
+in order to select the correct service (program). If the input is MPTS
+and \fB\-\-service\fR is not used, tsdecrypt chooses the last service
+listed in PAT.
+.TP
 .SH OUTPUT OPTIONS
 .PP
 .TP

tsdecrypt.c

@@ -65,6 +65,7 @@ static const struct option long_options[] = {
 	{ "input",				required_argument, NULL, 'I' },
 	{ "input-rtp",			no_argument,       NULL, 'R' },
 	{ "input-ignore-disc",	no_argument,       NULL, 'z' },
+	{ "service",			required_argument, NULL, 'M' },
 
 	{ "output",				required_argument, NULL, 'O' },
 	{ "output-intf",		required_argument, NULL, 'o' },
@@ -118,6 +119,7 @@ static void show_help(struct ts *ts) {
 	printf("                            .    -I -              (read from stdin) (default)\n");
 	printf(" -R --input-rtp             | Enable RTP input\n");
 	printf(" -z --input-ignore-disc     | Do not report discontinuty errors in input.\n");
+	printf(" -M --service <service_id>  | Choose service id when input is MPTS.\n");
 	printf("\n");
 	printf("Output options:\n");
 	printf(" -O --output <dest>         | Where to send output. File or multicast address.\n");
@@ -199,7 +201,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:N:l:L:I:RzO:o:t:pc:C:s:U:P:y:eZ:Ef:X:H:G:KJ:D:hV", long_options, NULL)) != -1 ) {
+	while ( (j = getopt_long(argc, argv, "i:d:N:l:L:I:RzM:O:o:t:pc:C:s:U:P:y:eZ:Ef:X:H:G:KJ:D:hV", long_options, NULL)) != -1 ) {
 		char *p = NULL;
 		switch (j) {
 			case 'i':
@@ -239,6 +241,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 'z':
 				ts->ts_discont = !ts->ts_discont;
 				break;
+			case 'M':
+				ts->forced_service_id = strtoul(optarg, NULL, 0) & 0xffff;
+				break;
 
 			case 'O':
 				output_addr_err = parse_io_param(&ts->output, optarg,
@@ -404,6 +409,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	} else if (ts->input.type == FILE_IO) {
 		ts_LOGf("Input file : %s\n", ts->input.fd == 0 ? "STDIN" : ts->input.fname);
 	}
+	if (ts->forced_service_id)
+		ts_LOGf("Service id : 0x%04x (%d)\n",
+			ts->forced_service_id, ts->forced_service_id);
 	if (ts->req_CA_sys == CA_IRDETO)
 		ts_LOGf("Irdeto ECM : %d\n", ts->irdeto_ecm);