Automatically detect multiple ECM streams event when --caid is used

tables.c

@@ -126,8 +126,8 @@ void process_cat(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	}
 }
 
-// Copied from libtsfuncs with added logic to return more than one PID
-static int find_CA_descriptor(uint8_t *data, int data_len, enum CA_system req_CA_type, uint16_t *CA_id, uint16_t *CA_pid, uint16_t *CA_pids, unsigned int *n_pids) {
+// Copied from libtsfuncs with added logic to return more than one PID and to handle both req_CA_type && forced_caid
+static int find_CA_descriptor(uint8_t *data, int data_len, enum CA_system req_CA_type, uint16_t forced_caid, uint16_t *CA_id, uint16_t *CA_pid, uint16_t *CA_pids, unsigned int *n_pids) {
 	while (data_len >= 2) {
 		uint8_t tag         = data[0];
 		uint8_t this_length = data[1];
@@ -136,7 +136,13 @@ static int find_CA_descriptor(uint8_t *data, int data_len, enum CA_system req_CA
 		if (tag == 9 && this_length >= 4) {
 			uint16_t CA_ID = (data[0] << 8) | data[1];
 			uint16_t CA_PID = ((data[2] & 0x1F) << 8) | data[3];
-			if (ts_get_CA_sys(CA_ID) == req_CA_type) {
+			bool ca_match = 0;
+			if (forced_caid) {
+				ca_match = forced_caid == CA_ID;
+			} else {
+				ca_match = ts_get_CA_sys(CA_ID) == req_CA_type;
+			}
+			if (ca_match) {
 				*CA_id = CA_ID;
 				*CA_pid = CA_PID;
 				if (*n_pids < MAX_ECM_PIDS) {
@@ -160,13 +166,13 @@ static int find_CA_descriptor(uint8_t *data, int data_len, enum CA_system req_CA
 }
 
 // Copied from libtsfuncs with added logic to return more than one PID
-int __ts_get_ecm_info(struct ts_pmt *pmt, enum CA_system req_CA_type, uint16_t *CA_id, uint16_t *CA_pid, uint16_t *CA_pids, unsigned int *n_pids) {
-	int i, result = find_CA_descriptor(pmt->program_info, pmt->program_info_size, req_CA_type, CA_id, CA_pid, CA_pids, n_pids);
+int __ts_get_ecm_info(struct ts_pmt *pmt, enum CA_system req_CA_type, uint16_t forced_caid, uint16_t *CA_id, uint16_t *CA_pid, uint16_t *CA_pids, unsigned int *n_pids) {
+	int i, result = find_CA_descriptor(pmt->program_info, pmt->program_info_size, forced_caid, req_CA_type, CA_id, CA_pid, CA_pids, n_pids);
 	if (!result) {
 		for(i=0;i<pmt->streams_num;i++) {
 			struct ts_pmt_stream *stream = pmt->streams[i];
 			if (stream->ES_info) {
-				result = find_CA_descriptor(stream->ES_info, stream->ES_info_size, req_CA_type, CA_id, CA_pid, CA_pids, n_pids);
+				result = find_CA_descriptor(stream->ES_info, stream->ES_info_size, req_CA_type, forced_caid, CA_id, CA_pid, CA_pids, n_pids);
 				if (result)
 					break;
 			}
@@ -206,14 +212,7 @@ void process_pmt(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 		return;
 
 	ts->n_ecm_pids = 0;
-	if (ts->forced_caid) {
-		ts->ecm_caid = ts->forced_caid;
-		ts_get_ecm_info_by_caid(ts->pmt, ts->ecm_caid, &ts->ecm_pid);
-		ts->n_ecm_pids = 1; // TODO/FIXME: We should get the list of PIDS similar to how __ts_get_ecm_info does it
-		ts->ecm_pids[0] = ts->ecm_pid;
-	} else {
-		__ts_get_ecm_info(ts->pmt, ts->req_CA_sys, &ts->ecm_caid, &ts->ecm_pid, &ts->ecm_pids[0], &ts->n_ecm_pids);
-	}
+	__ts_get_ecm_info(ts->pmt, ts->req_CA_sys, ts->forced_caid, &ts->ecm_caid, &ts->ecm_pid, &ts->ecm_pids[0], &ts->n_ecm_pids);
 
 	if (ts->forced_ecm_pid)
 		ts_get_ecm_info_by_pid(ts->pmt, &ts->ecm_caid, ts->forced_ecm_pid);