Add section_data_len to struct ts_section_header

tsdata.h

@@ -55,6 +55,7 @@ struct ts_section_header {
 	int			section_pos;					// Up to this pos the section data has come
 	int			initialized;					// Set to 1 when whole sectino is initialized
 
+	int			section_data_len;				// Full section length (3 + section_length)
 	uint8_t		*section_data;					// The whole section data
 	uint8_t		*packet_data;					// TS packet(s) that were used to transfer the table.
 

tsfuncs_crc.c

@@ -40,13 +40,11 @@ uint32_t ts_crc32(uint8_t *data, int data_size) {
 }
 
 u_int32_t ts_crc32_section(struct ts_section_header *section_header) {
-	// +3 to include the first 3 bytes before section_length field
-	return ts_crc32(section_header->section_data, section_header->section_length + 3);
+	return ts_crc32(section_header->section_data, section_header->section_data_len);
 }
 
 int ts_crc32_section_check(struct ts_section_header *section_header, char *table) {
-	// +3 to include the first 3 bytes before section_length field
-	uint32_t check_crc = ts_crc32(section_header->section_data, section_header->section_length + 3);
+	uint32_t check_crc = ts_crc32(section_header->section_data, section_header->section_data_len);
 
 	if (check_crc != 0) {
 		ts_LOGf("!!! Wrong %s table CRC! It should be 0 but it is 0x%08x (CRC in data is 0x%08x)\n",

tsfuncs_section_data.c

@@ -110,14 +110,14 @@ void ts_section_add_packet(struct ts_section_header *sec, struct ts_header *ts_h
 		return;
 
 	if (sec->section_pos + to_copy >= 4092) {
-		to_copy = (sec->section_length + 3) - sec->section_pos;
+		to_copy = sec->section_data_len - sec->section_pos;
 	}
 
 	memcpy(sec->section_data + sec->section_pos, ts_packet + payload_offset, to_copy);
 	memcpy(sec->packet_data + (sec->num_packets * TS_PACKET_SIZE), ts_packet, TS_PACKET_SIZE);
 	sec->section_pos += to_copy;
 	sec->num_packets++;
-	sec->initialized = (sec->section_pos+1) >= sec->section_length + 3;
+	sec->initialized = (sec->section_pos+1) >= sec->section_data_len;
 	if (sec->initialized) {
 		// CRC is after sec->data[sec->data_len]
 		sec->CRC = (sec->CRC << 8) | sec->data[sec->data_len + 3];

tsfuncs_sections.c

@@ -49,6 +49,9 @@ uint8_t *ts_section_header_parse(uint8_t *ts_packet, struct ts_header *ts_header
 		ts_section_header->data     = ts_section_header->section_data + 3; // Skip header
 		ts_section_header->data_len = ts_section_header->section_length;
 	}
+
+	ts_section_header->section_data_len = ts_section_header->section_length + 3;	// 3 for section header
+
 	return data;
 }