Add --input-buffer (-T) option.

ChangeLog

@@ -1,5 +1,7 @@
 now : Version next
- * Add --log-file option.
+ * Add --input-buffer (-T) option. This option allows uninterrupted
+   decryption even if OSCAM returns code words too late.
+ * Add --log-file (-F) option.
  * Fixed newcamd protocol issues when OSCAM disappeared.
 
 2012-02-24 : Version 6.0

README

@@ -34,6 +34,7 @@ Input options:
  -R --input-rtp             | Enable RTP input
  -z --input-ignore-disc     | Do not report discontinuty errors in input.
  -M --input-service <srvid> | Choose service id when input is MPTS.
+ -T --input-buffer <ms>     | Set input buffer time in ms. Default: 0
  -W --input-dump <filename> | Save input stream in file.
 
 Output options:

data.c

@@ -103,6 +103,8 @@ void data_init(struct ts *ts) {
 
 	ts->decode_buf  = cbuf_init((7 * dvbcsa_bs_batch_size() * 188) * 16, "decode"); // ~658Kb
 	ts->write_buf   = cbuf_init((7 * dvbcsa_bs_batch_size() * 188) *  8, "write");  // ~324Kb
+
+	ts->input_buffer= list_new("input");
 }
 
 void data_free(struct ts *ts) {
@@ -133,4 +135,6 @@ void data_free(struct ts *ts) {
 
 	FREE(ts->input.fname);
 	FREE(ts->output.fname);
+
+	list_free(&ts->input_buffer, free, NULL);
 }

data.h

@@ -173,6 +173,11 @@ struct io {
 	struct in_addr		intf;
 };
 
+struct packet_buf {
+	int64_t		time;
+	uint8_t		data[188];
+};
+
 #define MAX_PIDS 8192
 
 struct ts {
@@ -273,6 +278,9 @@ struct ts {
 
 	struct notify		*notify;
 	char				*notify_program;
+
+	unsigned int		input_buffer_time;
+	LIST				*input_buffer;
 };
 
 void data_init(struct ts *ts);

process.c

@@ -297,6 +297,8 @@ static void detect_discontinuity(struct ts *ts, uint8_t *ts_packet) {
 
 void process_packets(struct ts *ts, uint8_t *data, ssize_t data_len) {
 	ssize_t i;
+	int64_t now = get_time();
+
 	for (i=0; i<data_len; i += 188) {
 		uint8_t *ts_packet = data + i;
 		uint16_t pid = ts_packet_get_pid(ts_packet);
@@ -333,10 +335,35 @@ void process_packets(struct ts *ts, uint8_t *data, ssize_t data_len) {
 
 		if (ts->threaded) {
 			// Add to decode buffer. The decoder thread will handle it
-			if (cbuf_fill(ts->decode_buf, ts_packet, 188) != 0) {
-				ts_LOGf("Decode buffer is full, waiting...\n");
-				cbuf_dump(ts->decode_buf);
-				usleep(10000);
+			if (ts->input_buffer_time == 0) {
+				// No input buffer, move packets to decoding buffer
+				if (cbuf_fill(ts->decode_buf, ts_packet, 188) != 0) {
+					ts_LOGf("Decode buffer is full, waiting...\n");
+					cbuf_dump(ts->decode_buf);
+					usleep(10000);
+				}
+			} else {
+				// Handle input buffer
+				struct packet_buf *p = malloc(sizeof(struct packet_buf));
+				p->time = now + (ts->input_buffer_time * 1000); //buffer time is in ms, p->time is in us
+				memcpy(p->data, ts_packet, 188);
+				list_add(ts->input_buffer, p);
+				// Move packets to decrypt buffer
+				LNODE *lc, *lctmp;
+				list_for_each(ts->input_buffer, lc, lctmp) {
+					p = lc->data;
+					if (p->time <= now) {
+						if (cbuf_fill(ts->decode_buf, p->data, 188) != 0) {
+							ts_LOGf("Decode buffer is full, waiting...\n");
+							cbuf_dump(ts->decode_buf);
+							usleep(10000);
+						}
+						list_del(ts->input_buffer, &lc);
+						free(p);
+					} else {
+						break;
+					}
+				}
 			}
 		} else {
 			decode_packet(ts, ts_packet);

tsdecrypt.1

@@ -86,6 +86,14 @@ in order to select the correct service (program). If the input is MPTS
 and \fB\-\-input\-service\fR is not used, tsdecrypt chooses the last service
 listed in PAT.
 .TP
+\fB\-T\fR, \fB\-\-input\-buffer\fR <miliseconds>
+Using this option delays the decoding for given amount of milliseconds. This
+allows tsdecrypt to decode services even if OSCAM returns code word too late.
+For example SkyUK sends code words ~700 ms before it starts using them. This
+means that if OSCAM is unable to return code word in less than 700 ms the
+decryption will fail for a small amount of time. Setting --input-buffer 1000
+will solve the problem in this case.
+.TP
 \fB\-W\fR, \fB\-\-input\-dump\fR <filename>
 Save input stream in <filename>. If the input is RTP, the file will contain
 the data without RTP headers (pure mpeg transport stream). Easiest way to

tsdecrypt.c

@@ -113,9 +113,9 @@ void run_benchmark(void) {
 	puts("* Done *");
 }
 
-static const char short_options[] = "i:d:N:Sl:L:F:I:RzM:W:O:o:t:rk:g:pwxyc:C:A:s:U:P:B:eZ:Ef:X:H:G:KJ:D:jbhV";
+static const char short_options[] = "i:d:N:Sl:L:F:I:RzM:T:W:O:o:t:rk:g:pwxyc:C:A:s:U:P:B:eZ:Ef:X:H:G:KJ:D:jbhV";
 
-// Unused short options: QTYamnquv0123456789
+// Unused short options: QYamnquv0123456789
 static const struct option long_options[] = {
 	{ "ident",				required_argument, NULL, 'i' },
 	{ "daemon",				required_argument, NULL, 'd' },
@@ -129,6 +129,7 @@ static const struct option long_options[] = {
 	{ "input-rtp",			no_argument,       NULL, 'R' },
 	{ "input-ignore-disc",	no_argument,       NULL, 'z' },
 	{ "input-service",		required_argument, NULL, 'M' },
+	{ "input-buffer",		required_argument, NULL, 'T' },
 	{ "input-dump",			required_argument, NULL, 'W' },
 
 	{ "output",				required_argument, NULL, 'O' },
@@ -191,6 +192,7 @@ static void show_help(struct ts *ts) {
 	printf(" -R --input-rtp             | Enable RTP input\n");
 	printf(" -z --input-ignore-disc     | Do not report discontinuty errors in input.\n");
 	printf(" -M --input-service <srvid> | Choose service id when input is MPTS.\n");
+	printf(" -T --input-buffer <ms>     | Set input buffer time in ms. Default: %u\n", ts->input_buffer_time);
 	printf(" -W --input-dump <filename> | Save input stream in file.\n");
 	printf("\n");
 	printf("Output options:\n");
@@ -330,6 +332,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 'M':
 				ts->forced_service_id = strtoul(optarg, NULL, 0) & 0xffff;
 				break;
+			case 'T':
+				ts->input_buffer_time = strtoul(optarg, NULL, 0);
+				break;
 			case 'W':
 				ts->input_dump_filename = optarg;
 				break;
@@ -549,6 +554,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 		ts_LOGf("Input addr : %s://%s:%u/\n",
 			ts->rtp_input ? "rtp" : "udp",
 			inet_ntoa(ts->input.addr), ts->input.port);
+		if (ts->input_buffer_time) {
+			ts_LOGf("Input buff : %u ms\n", ts->input_buffer_time);
+		}
 	} else if (ts->input.type == FILE_IO) {
 		ts_LOGf("Input file : %s\n", ts->input.fd == 0 ? "STDIN" : ts->input.fname);
 	}