Add support for LCN descriptor.

descs.c

@@ -438,6 +438,17 @@ void ts_descriptor_dump(uint8_t *desc_data, int desc_data_len) {
 				}
 				break;
 			}
+			case 0x5f: { // Private NorDig descriptor
+				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, Private Nordig descriptor:\n", pad, tag, tag, this_length);
+				for (i=0; i<this_length; i+=4) {
+					uint8_t u1 = data[i + 0] ;
+					uint8_t u2 = data[i + 1] ;
+					uint8_t u3 = data[i + 2] ;
+					uint8_t u4 = data[i + 3] ;
+					ts_LOGf("%s  Data1: 0x%02x Data2: %02x Data3: %02x Data4: %02x\n", pad, u1, u2, u3 ,u4);
+				}
+				break;
+			}
 			case 0x62: { // frequency_list_descriptor
 				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, Frequency_list_descriptor\n", pad, tag, tag, this_length);
 				uint8_t reserved    = data[0] >> 2;		// 111111xx
@@ -469,23 +480,26 @@ void ts_descriptor_dump(uint8_t *desc_data, int desc_data_len) {
 				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, AC-3 descriptor\n", pad, tag, tag, this_length);
 				break;
 			}
-/*
-			case 0x87: { // Private descriptor! LCN Logical channel descriptor
+
+			case 0x83: { // Private descriptor! LCN Logical channel descriptor
 				ts_LOGf("%sTag 0x%02x (%02d), sz: %d, Logical channel descriptor\n", pad, tag, tag, this_length);
-				for (i=0; i<= this_length; i+=4) {
-					uint16_t service_id = (data[0+i] << 8) | data[1+i];	// xxxxxxxx xxxxxxxx
-					uint8_t  visible    = (data[2+i] >> 7);				// x1111111
-//					uint8_t  reserved1  = (data[2+i] &~ 0x80) >> 2;		// 1xxxxx11
-					uint16_t lcn        = (data[2+i] &~ 0x3f);			// 111111xx
-					         lcn       |=  data[3+i];					// xxxxxxxx
+				for (i=0; i<this_length; i+=4) {
+					uint16_t service_id;
+					uint8_t visible;
+//					uint8_t reserved1;
+					uint16_t lcn;
+					service_id   = data[i + 0] << 8;
+					service_id  |= data[i + 1];
+					visible      = data[i+2] >> 7;			// x1111111
+//					reserved1    = data[i+2] &~ 0x80 >> 6;		// 1x111111
+					lcn          = data[i+2] &~ 0xc0 << 8;		// 11xxxxxx
+					lcn         |= data[i+3];			// xxxxxxxx
 					ts_LOGf("%s  Service_ID: 0x%04x (%4d) LCN: %3d Visible: %d\n",
-						pad,
-						service_id, service_id,
-						lcn, visible);
+						pad, service_id, service_id, lcn, visible);
 				}
 				break;
 			}
-*/
+
 			default: {
 				char *dump = ts_hex_dump(data, this_length, 0);
 				ts_LOGf("%s*** Unknown Tag 0x%02x (%02d), sz: %d, data: %s\n", pad, tag, tag, this_length, dump);

nit_desc.c

@@ -186,3 +186,112 @@ int ts_nit_add_service_list_descriptor(struct ts_nit *nit, uint16_t ts_id, uint1
 	}
 	return ts_nit_add_stream(nit, ts_id, org_net_id, desc, desc_size);
 }
+
+int ts_nit_add_nordig_specifier_descriptor(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id) {
+	int desc_size = 2 + 4;		// 2 for header desc header, 3 for each service
+	uint8_t *desc = calloc(1, desc_size);
+	int dpos = 0;
+	desc[dpos + 0] = 0x5f;				// service_list_descriptor
+	desc[dpos + 1] = desc_size - 2;		// -2 Because of two byte header
+	desc[dpos + 2] = 0x00;				// -2 Because of two byte header
+	desc[dpos + 3] = 0x00;				// -2 Because of two byte header
+	desc[dpos + 4] = 0x00;				// -2 Because of two byte header
+	desc[dpos + 5] = 0x29;				// -2 Because of two byte header
+	dpos += 6;
+
+	return ts_nit_add_stream(nit, ts_id, org_net_id, desc, desc_size);
+}
+
+int ts_nit_add_lcn_descriptor(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id, uint32_t *services, uint8_t num_services) {
+	uint8_t i;
+	if (!num_services || num_services > 85) 		// 85 * 3 == 255
+		return 0;
+	int desc_size = 2 + num_services * 4;			// 2 for header desc header, 4 for each service
+	uint8_t *desc = calloc(1, desc_size);
+	int dpos = 0;
+	desc[dpos + 0] = 0x83;					// service_lcn_descriptor
+	desc[dpos + 1] = desc_size - 2;				// -2 Because of two byte header
+	dpos += 2;
+	for(i=0;i<num_services;i++) {
+		uint32_t srv = services[i];
+		desc[dpos + 0] = (srv &~ 0x00ffffff) >> 24;	// service_id (16 bits)
+		desc[dpos + 1] = (srv &~ 0xff00ffff) >> 16;	// service_id
+		desc[dpos + 2] = (srv &~ 0xffff00ff) >>  8;	// visible (1 bit), private (1 bit), first (6 bits) from lcn_number 
+		desc[dpos + 3] = (srv &~ 0xffffff00);		// second (8 bits) lcn_number
+		dpos += 4;
+	}
+	return ts_nit_add_stream(nit, ts_id, org_net_id, desc, desc_size);
+}
+
+
+int ts_nit_add_stream_descriptors(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id, uint32_t freq, uint8_t modulation, uint32_t symbol_rate, uint32_t *lcn_services, uint32_t *svc_services, uint8_t num_services) {
+	
+	int desc_size = 13 + 6 + 2 + 2 + num_services * 4 + num_services * 3;		// 2 for header desc header, + ....
+	
+	uint8_t *desc = calloc(1, desc_size);
+
+	desc[ 0] = 0x44;							// cable_delivey_system_descriptor
+	desc[ 1] = 11;								// -2 Because of two byte header
+	desc[ 2] = ((freq &~ 0x00ffffff) >> 24);	// 32 bits, frequency
+	desc[ 3] = ((freq &~ 0xff00ffff) >> 16);
+	desc[ 4] = ((freq &~ 0xffff00ff) >>  8);
+	desc[ 5] =  (freq &~ 0xffffff00);
+	desc[ 6] = 0xff;								// 8 bits reserved
+	desc[ 7] = 0xf0;								// 4 bits reserved, 4 bits FEC_outer (0 == not defined)
+	desc[ 8] = modulation;							// 8 bits reserved
+	desc[ 9] = (symbol_rate >> 20) &~ 0xffffff00;	// 28 bits, symbol_rate
+	desc[10] = (symbol_rate >> 12) &~ 0xffffff00;
+	desc[11] = (symbol_rate >> 4 ) &~ 0xffffff00;
+	desc[12] = (symbol_rate &~ 0xfffffff0) << 4;	// 4 bits
+	desc[12] |= 0;									// 4 bits FEC_inner (0 == not defined)
+
+	uint8_t i;
+	if (!num_services || num_services > 85) // 85 * 3 == 255
+		return 0;
+	
+	int desc_svc_size = 2 + num_services * 3;		// 2 for header desc header, 3 for each service
+	
+
+	int dpos = 13;
+
+	desc[dpos + 0] = 0x41;				// service_list_descriptor
+	desc[dpos + 1] = desc_svc_size - 2;		// -2 Because of two byte header
+	dpos += 2;
+	for(i=0;i<num_services;i++) {
+		uint32_t srv = svc_services[i];
+		desc[dpos + 0] = (srv &~ 0xff00ffff) >> 16;	// service_id (16 bits)
+		desc[dpos + 1] = (srv &~ 0xffff00ff) >>  8;
+		desc[dpos + 2] = (srv &~ 0xffffff00);		// service_type (8 bits)
+		dpos += 3;
+	}
+
+	int desc_prv_size = 2 + 4;		// 2 for header desc header, 3 for each service
+
+	desc[dpos + 0] = 0x5f;				// service_list_descriptor
+	desc[dpos + 1] = desc_prv_size - 2;		// -2 Because of two byte header
+	desc[dpos + 2] = 0x00;				// -2 Because of two byte header
+	desc[dpos + 3] = 0x00;				// -2 Because of two byte header
+	desc[dpos + 4] = 0x00;				// -2 Because of two byte header
+	desc[dpos + 5] = 0x29;				// -2 Because of two byte header
+	dpos += 6;
+
+	if (!num_services || num_services > 85) 		// 85 * 3 == 255
+		return 0;
+	int desc_lcn_size = 2 + num_services * 4;			// 2 for header desc header, 4 for each service
+
+	desc[dpos + 0] = 0x83;					// service_lcn_descriptor
+	desc[dpos + 1] = desc_lcn_size - 2;				// -2 Because of two byte header
+	dpos += 2;
+	for(i=0;i<(num_services);i++) {
+		uint32_t srv = lcn_services[i];
+		desc[dpos + 0] = (srv &~ 0x00ffffff) >> 24;	// service_id (16 bits)
+		desc[dpos + 1] = (srv &~ 0xff00ffff) >> 16;	// service_id
+		desc[dpos + 2] = (srv &~ 0xffff00ff) >>  8;	// visible (1 bit), private (1 bit), first (6 bits) from lcn_number 
+		desc[dpos + 3] = (srv &~ 0xffffff00);		// second (8 bits) lcn_number
+		dpos += 4;
+	}
+
+
+	return ts_nit_add_stream(nit, ts_id, org_net_id, desc, desc_size);
+}
+

sections.c

@@ -127,6 +127,7 @@ void ts_section_header_dump(struct ts_section_header *t) {
 		t->table_id == 0x40         ? "network_information_section - actual_network" :
 		t->table_id == 0x41         ? "network_information_section - other_network" :
 		t->table_id == 0x42         ? "service_description_section - actual_transport_stream" :
+		t->table_id == 0x83         ? "lcn_description_section - other" :
 		IN(t->table_id, 0x43, 0x45) ? "reserved for future use" :
 		t->table_id == 0x46         ? "service_description_section - other_transport_stream" :
 		IN(t->table_id, 0x47, 0x49) ? "reserved for future use" :

tsfuncs.h

@@ -205,6 +205,10 @@ int				ts_nit_add_network_name_descriptor			(struct ts_nit *nit, char *network_n
 int				ts_nit_add_frequency_list_descriptor_cable	(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id, uint32_t *freqs, uint8_t num_freqs);
 int				ts_nit_add_cable_delivery_descriptor		(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id, uint32_t freq, uint8_t modulation, uint32_t symbol_rate);
 int				ts_nit_add_service_list_descriptor			(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id, uint32_t *services, uint8_t num_services);
+int				ts_nit_add_nordig_specifier_descriptor		(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id);
+int				ts_nit_add_lcn_descriptor					(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id, uint32_t *services, uint8_t num_services);
+int 			ts_nit_add_stream_descriptors				(struct ts_nit *nit, uint16_t ts_id, uint16_t org_net_id, uint32_t freq, uint8_t modulation, uint32_t symbol_rate, uint32_t *lcn_services, uint32_t *svc_services, uint8_t num_services);
+
 
 struct ts_nit *	ts_nit_copy			(struct ts_nit *nit);
 int				ts_nit_is_same		(struct ts_nit *nit1, struct ts_nit *nit2);