dvb/si: Add support for descriptor 0x6c (Cell list descriptor).

README

@@ -145,6 +145,7 @@ Supported DVB descriptors
  * Descriptor 0x69: PDC descriptor
  * Descriptor 0x6a: AC-3 descriptor
  * Descriptor 0x6b: Ancillary data descriptor
+ * Descriptor 0x6c: Cell list descriptor
  * Descriptor 0x7a: Enhanced AC-3 descriptor
  * Descriptor 0x7b: DTS descriptor
  * Descriptor 0x7c: AAC descriptor

TODO

@@ -5,7 +5,6 @@ so if you like something just do it and send a patch.
   - Descriptor 0x29 IPMP_descriptor (defined in ISO/IEC 13818-11, MPEG-2 IPMP)
 
 - Add support (parser, generator, example) for these DVB descriptors:
-  - Descriptor 0x6c: cell_list_descriptor
   - Descriptor 0x6d: cell_frequency_link_descriptor
   - Descriptor 0x6e: announcement_support_descriptor
   - Descriptor 0x6f: application_signalling_descriptor

dvb/si/descs_list.h

@@ -78,6 +78,7 @@
 #include <bitstream/dvb/si/desc_69.h>
 #include <bitstream/dvb/si/desc_6a.h>
 #include <bitstream/dvb/si/desc_6b.h>
+#include <bitstream/dvb/si/desc_6c.h>
 #include <bitstream/dvb/si/desc_7a.h>
 #include <bitstream/dvb/si/desc_7b.h>
 #include <bitstream/dvb/si/desc_7c.h>

examples/dvb_gen_si.c

@@ -1464,7 +1464,84 @@ static void build_desc6b(uint8_t *desc) {
     desc6b_set_rds_via_uecp_flag                (desc, true);
 }
 
-/* ---  Descriptor 0x6c: cell_list_descriptor */
+/* DVB  Descriptor 0x6c: Cell list descriptor */
+static void build_desc6c(uint8_t *desc) {
+    uint8_t n = 0, k;
+    uint8_t *cell_n, *subcell_k;
+
+    desc6c_init(desc);
+    desc_set_length(desc, 255);
+
+    cell_n = desc6c_get_cell(desc, n++);
+    desc6cn_set_cell_id(cell_n, 1234);
+    desc6cn_set_cell_latitude(cell_n, 4567);
+    desc6cn_set_cell_longtitude(cell_n, 5678);
+    desc6cn_set_cell_extend_of_latitude(cell_n, 123);
+    desc6cn_set_cell_extend_of_longtitude(cell_n, 345);
+    desc6cn_set_subcell_info_loop_length(cell_n, 0);
+
+    cell_n = desc6c_get_cell(desc, n++);
+    desc6cn_set_cell_id(cell_n, 4456);
+    desc6cn_set_cell_latitude(cell_n, 5567);
+    desc6cn_set_cell_longtitude(cell_n, 6678);
+    desc6cn_set_cell_extend_of_latitude(cell_n, 1234);
+    desc6cn_set_cell_extend_of_longtitude(cell_n, 1234);
+    desc6cn_set_subcell_info_loop_length(cell_n, 0);
+    {
+        k = 0;
+        desc6cn_set_subcell_info_loop_length(cell_n, 255);
+
+        subcell_k = desc6cn_get_subcell(cell_n, k++);
+        desc6ck_set_cell_id_extension(subcell_k, 0);
+        desc6ck_set_subcell_latitude(subcell_k, 0x1122);
+        desc6ck_set_subcell_longtitude(subcell_k, 0x3344);
+        desc6ck_set_subcell_extend_of_latitude(subcell_k, 0xf567);
+        desc6ck_set_subcell_extend_of_longtitude(subcell_k, 0xf89a);
+
+        subcell_k = desc6cn_get_subcell(cell_n, k++);
+        desc6ck_set_cell_id_extension(subcell_k, 1);
+        desc6ck_set_subcell_latitude(subcell_k, 0x2233);
+        desc6ck_set_subcell_longtitude(subcell_k, 0x4455);
+        desc6ck_set_subcell_extend_of_latitude(subcell_k, 0xf678);
+        desc6ck_set_subcell_extend_of_longtitude(subcell_k, 0xf9ab);
+
+        subcell_k = desc6cn_get_subcell(cell_n, k++);
+        desc6ck_set_cell_id_extension(subcell_k, 2);
+        desc6ck_set_subcell_latitude(subcell_k, 0x2233);
+        desc6ck_set_subcell_longtitude(subcell_k, 0x4455);
+        desc6ck_set_subcell_extend_of_latitude(subcell_k, 0xf678);
+        desc6ck_set_subcell_extend_of_longtitude(subcell_k, 0xf9ab);
+
+        subcell_k = desc6cn_get_subcell(cell_n, k);
+        desc6cn_set_subcell_info_loop_length(cell_n, subcell_k - cell_n - DESC6C_DATA_SIZE);
+    }
+
+    cell_n = desc6c_get_cell(desc, n++);
+    desc6cn_set_cell_id(cell_n, 0xffff);
+    desc6cn_set_cell_latitude(cell_n, 0xeeee);
+    desc6cn_set_cell_longtitude(cell_n, 0xdddd);
+    desc6cn_set_cell_extend_of_latitude(cell_n, 0xf789);
+    desc6cn_set_cell_extend_of_longtitude(cell_n, 0xfabc);
+    desc6cn_set_subcell_info_loop_length(cell_n, 0);
+    {
+        k = 0;
+        desc6cn_set_subcell_info_loop_length(cell_n, 255);
+
+        subcell_k = desc6cn_get_subcell(cell_n, k++);
+        desc6ck_set_cell_id_extension(subcell_k, 0x00);
+        desc6ck_set_subcell_latitude(subcell_k, 0x1122);
+        desc6ck_set_subcell_longtitude(subcell_k, 0x3344);
+        desc6ck_set_subcell_extend_of_latitude(subcell_k, 0xf567);
+        desc6ck_set_subcell_extend_of_longtitude(subcell_k, 0xf89a);
+
+        subcell_k = desc6cn_get_subcell(cell_n, k);
+        desc6cn_set_subcell_info_loop_length(cell_n, subcell_k - cell_n - DESC6C_DATA_SIZE);
+    }
+
+    cell_n = desc6c_get_cell(desc, n);
+    desc_set_length(desc, cell_n - desc - DESC_HEADER_SIZE);
+}
+
 /* ---  Descriptor 0x6d: cell_frequency_link_descriptor */
 /* ---  Descriptor 0x6e: announcement_support_descriptor */
 /* ---  Descriptor 0x6f: application_signalling_descriptor */
@@ -1777,6 +1854,9 @@ static void generate_nit(void) {
         desc = descs_get_desc(desc_loop, desc_counter++);
         build_desc62(desc);
 
+        desc = descs_get_desc(desc_loop, desc_counter++);
+        build_desc6c(desc);
+
         // Finish descriptor generation
         desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos
         nit_set_desclength(nit, desc - desc_loop - DESCS_HEADER_SIZE);

examples/dvb_print_si.output.txt

@@ -40,6 +40,13 @@ new NIT actual networkid=40000 version=1
     - desc 62 frequency_list coding_type=2 coding_type_txt=cable frequency=3240000
     - desc 62 frequency_list coding_type=2 coding_type_txt=cable frequency=3300000
     - desc 62 frequency_list coding_type=2 coding_type_txt=cable frequency=3360000
+    - desc 6c cell_list cell_id=1234 cell_latitude=4567 cell_longtitude=5678 cell_extend_of_latitude=123 cell_extend_of_longtitude=345
+    - desc 6c cell_list cell_id=4456 cell_latitude=5567 cell_longtitude=6678 cell_extend_of_latitude=1234 cell_extend_of_longtitude=1234
+        - cell_list_subcell_info cell_id_extension=0 subcell_latitude=4386 subcell_longtitude=13124 subcell_extend_of_latitude=1383 subcell_extend_of_longtitude=2202
+        - cell_list_subcell_info cell_id_extension=1 subcell_latitude=8755 subcell_longtitude=17493 subcell_extend_of_latitude=1656 subcell_extend_of_longtitude=2475
+        - cell_list_subcell_info cell_id_extension=2 subcell_latitude=8755 subcell_longtitude=17493 subcell_extend_of_latitude=1656 subcell_extend_of_longtitude=2475
+    - desc 6c cell_list cell_id=65535 cell_latitude=61166 cell_longtitude=56797 cell_extend_of_latitude=1929 cell_extend_of_longtitude=2748
+        - cell_list_subcell_info cell_id_extension=0 subcell_latitude=4386 subcell_longtitude=13124 subcell_extend_of_latitude=1383 subcell_extend_of_longtitude=2202
   * ts tsid=10000 onid=40000
     - desc 41 service_list sid=20000 type=0x01
     - desc 41 service_list sid=20100 type=0x02

examples/dvb_print_si.output.xml

@@ -66,6 +66,18 @@
 <FREQUENCY_LIST_DESC coding_type="2" coding_type_txt="cable" frequency="3300000"/>
 <FREQUENCY_LIST_DESC coding_type="2" coding_type_txt="cable" frequency="3360000"/>
 </DESC>
+<DESC id="0x6c" length="62" value="04d211d7162e07b15900116815bf1a164d24d218001122334456789a01223344556789ab02223344556789abffffeeeedddd789abc08001122334456789a">
+<CELL_LIST_DESC cell_id="1234" cell_latitude="4567" cell_longtitude="5678" cell_extend_of_latitude="123" cell_extend_of_longtitude="345">
+</CELL_LIST_DESC>
+<CELL_LIST_DESC cell_id="4456" cell_latitude="5567" cell_longtitude="6678" cell_extend_of_latitude="1234" cell_extend_of_longtitude="1234">
+<CELL_LIST_SUBCELL_INFO cell_id_extension="0" subcell_latitude="4386" subcell_longtitude="13124" subcell_extend_of_latitude="1383" subcell_extend_of_longtitude="2202"/>
+<CELL_LIST_SUBCELL_INFO cell_id_extension="1" subcell_latitude="8755" subcell_longtitude="17493" subcell_extend_of_latitude="1656" subcell_extend_of_longtitude="2475"/>
+<CELL_LIST_SUBCELL_INFO cell_id_extension="2" subcell_latitude="8755" subcell_longtitude="17493" subcell_extend_of_latitude="1656" subcell_extend_of_longtitude="2475"/>
+</CELL_LIST_DESC>
+<CELL_LIST_DESC cell_id="65535" cell_latitude="61166" cell_longtitude="56797" cell_extend_of_latitude="1929" cell_extend_of_longtitude="2748">
+<CELL_LIST_SUBCELL_INFO cell_id_extension="0" subcell_latitude="4386" subcell_longtitude="13124" subcell_extend_of_latitude="1383" subcell_extend_of_longtitude="2202"/>
+</CELL_LIST_DESC>
+</DESC>
 <TS tsid="10000" onid="40000">
 <DESC id="0x41" length="12" value="4e20014e84024ee8014f4c02">
 <SERVICE_LIST_DESC sid="20000" type="0x01" />

mpeg/psi/descs_print.h

@@ -177,6 +177,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(69)
         CASE_DESC(6a)
         CASE_DESC(6b)
+        CASE_DESC(6c)
         CASE_DESC(7a)
         CASE_DESC(7b)
         CASE_DESC(7c)