Change csa_decrypt_single_packet() API.

csa.c

@@ -65,9 +65,14 @@ inline void csa_set_odd_cw(csakey_t *csakey, uint8_t *odd_cw) {
 	dvbcsa_bs_key_set(odd_cw, key->bs_csakey[1]);
 }
 
-inline void csa_decrypt_single_packet(csakey_t *csakey, uint8_t *payload_start, unsigned int payload_len, unsigned int key_idx) {
+inline void csa_decrypt_single_packet(csakey_t *csakey, uint8_t *ts_packet) {
 	struct csakey *key = (struct csakey *)csakey;
-	dvbcsa_decrypt(key->s_csakey[key_idx], payload_start, payload_len);
+	if (use_dvbcsa) {
+		unsigned int key_idx = ts_packet_get_scrambled(ts_packet) - 2;
+		unsigned int payload_offset = ts_packet_get_payload_offset(ts_packet);
+		ts_packet_set_not_scrambled(ts_packet);
+		dvbcsa_decrypt(key->s_csakey[key_idx], ts_packet + payload_offset, 188 - payload_offset);
+	}
 }
 
 inline void csa_decrypt_multiple_even(csakey_t *csakey, struct csa_batch *batch) {

csa.h

@@ -58,9 +58,7 @@ unsigned int	csa_get_batch_size	(void);
 void			csa_set_even_cw		(csakey_t *csakey, uint8_t *even_cw);
 void			csa_set_odd_cw		(csakey_t *csakey, uint8_t *odd_cw);
 
-// key_idx 0 == even key
-// key_idx 1 == odd key
-void			csa_decrypt_single_packet	(csakey_t *csakey, uint8_t *payload, unsigned int payload_len, unsigned int key_idx);
+void			csa_decrypt_single_packet	(csakey_t *csakey, uint8_t *ts_packet);
 void			csa_decrypt_multiple_even	(csakey_t *csakey, struct csa_batch *batch);
 void			csa_decrypt_multiple_odd	(csakey_t *csakey, struct csa_batch *batch);
 

process.c

@@ -104,11 +104,7 @@ static void decode_packet(struct ts *ts, uint8_t *ts_packet) {
 	int scramble_idx = ts_packet_get_scrambled(ts_packet);
 	if (scramble_idx > 1) {
 		if (ts->key.is_valid_cw) {
-			// scramble_idx 2 == even key
-			// scramble_idx 3 == odd key
-			ts_packet_set_not_scrambled(ts_packet);
-			uint8_t payload_ofs = ts_packet_get_payload_offset(ts_packet);
-			csa_decrypt_single_packet(ts->key.csakey, ts_packet + payload_ofs, 188 - payload_ofs, scramble_idx - 2);
+			csa_decrypt_single_packet(ts->key.csakey, ts_packet);
 		} else {
 			// Can't decrypt the packet just make it NULL packet
 			if (ts->pid_filter)