From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Sun, 17 Nov 2013 23:20:36 +0000 (-0200)
Subject: libdvbv5: add support for ATSC VCT table parsing
X-Git-Tag: v4l-utils-1.2.0~337
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea6c66cc406c12ae5808b66187b38b1a8428e8fc;p=platform%2Fupstream%2Fv4l-utils.git

libdvbv5: add support for ATSC VCT table parsing

On ATSC, the VCT table is used to describe the channels,
and SDT is generally not implemented.

Implement a function to fill the channel data from it, if
available. Otherwise, fall back to SDT parsing.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/lib/include/descriptors/vct.h b/lib/include/descriptors/vct.h
index b42285d..6272b43 100644
--- a/lib/include/descriptors/vct.h
+++ b/lib/include/descriptors/vct.h
@@ -105,8 +105,8 @@ union dvb_table_vct_descriptor_length {
 	};
 };
 
-#define dvb_vct_channel_foreach(_service, _vct) \
-	for( struct dvb_table_vct_channel *_channel = _vct->channel; _channel; _channel = _channel->next ) \
+#define dvb_vct_channel_foreach(_channel, _vct) \
+	for (struct dvb_table_vct_channel *_channel = _vct->channel; _channel; _channel = _channel->next) \
 
 struct dvb_v5_fe_parms;
 
diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c
index 2c86977..c23d5cb 100644
--- a/lib/libdvbv5/dvb-file.c
+++ b/lib/libdvbv5/dvb-file.c
@@ -981,7 +981,9 @@ static void get_pmt_descriptors(struct dvb_entry *entry,
 static int get_program_and_store(struct dvb_v5_fe_parms *parms,
 				 struct dvb_file *dvb_file,
 				 struct dvb_v5_descriptors *dvb_scan_handler,
-				 uint16_t service_id, char *channel,
+				 const uint16_t service_id,
+				 char *channel,
+				 char *vchannel,
 				 int get_detected, int get_nit)
 {
 	struct dvb_entry *entry;
@@ -1026,7 +1028,7 @@ static int get_program_and_store(struct dvb_v5_fe_parms *parms,
 	/* Initialize data */
 	entry->channel = channel;
 	entry->service_id = service_id;
-	entry->vchannel = dvb_vchannel(dvb_scan_handler->nit, service_id);
+	entry->vchannel = vchannel;
 	entry->sat_number = parms->sat_number;
 	entry->freq_bpf = parms->freq_bpf;
 	entry->diseqc_wait = parms->diseqc_wait;
@@ -1072,12 +1074,38 @@ int store_dvb_channel(struct dvb_file **dvb_file,
 		}
 	}
 
+	if (dvb_scan_handler->vct) {
+		dvb_vct_channel_foreach(d, dvb_scan_handler->vct) {
+			char *channel = NULL;
+			char *vchannel = NULL;
+
+			channel = calloc(1, strlen(d->short_name) + 1);
+			strcpy(channel, d->short_name);
+
+			asprintf(&vchannel, "%d.%d",
+				d->major_channel_number,
+				d->minor_channel_number);
+
+			dvb_log("Found channel %s, name = %s",
+				vchannel, channel);
+
+			rc = get_program_and_store(parms, *dvb_file, dvb_scan_handler,
+						d->program_number,
+						channel, vchannel,
+						get_detected, get_nit);
+			if (rc < 0)
+				return rc;
+		}
+	}
+
+
 	if (!dvb_scan_handler->sdt) {
 		dvb_logerr("no SDT table - can't store channels");
 		return -1;
 	}
 	dvb_sdt_service_foreach(service, dvb_scan_handler->sdt) {
 		char *channel = NULL;
+		char *vchannel = NULL;
 
 		dvb_desc_find(struct dvb_desc_service, desc, service, service_descriptor) {
 			if (desc->name) {
@@ -1092,9 +1120,12 @@ int store_dvb_channel(struct dvb_file **dvb_file,
 		if (!channel)
 			asprintf(&channel, "#%d", service->service_id);
 
+		vchannel = dvb_vchannel(dvb_scan_handler->nit, service->service_id);
+
 		rc = get_program_and_store(parms, *dvb_file, dvb_scan_handler,
 					   service->service_id,
-					   channel, get_detected, get_nit);
+					   channel, vchannel,
+					   get_detected, get_nit);
 		if (rc < 0)
 			return rc;
 	}