dvb/si: Add support for descriptor 0x62 (Frequency list descriptor).

README

@@ -131,6 +131,7 @@ Supported DVB descriptors
  * Descriptor 0x5f: Private data specifier descriptor
  * Descriptor 0x60: Service move descriptor
  * Descriptor 0x61: Short smoothing buffer descriptor
+ * Descriptor 0x62: Frequency list descriptor
  * Descriptor 0x6a: AC-3 descriptor [p]
 
 Legend:

TODO

@@ -14,7 +14,6 @@ so if you like something just do it and send a patch.
   - Descriptor 0x6a: AC-3 descriptor
 
 - Add support (parser, generator, example) for these DVB descriptors:
-  - Descriptor 0x62: frequency_list_descriptor
   - Descriptor 0x63: partial_transport_stream_descriptor
   - Descriptor 0x64: data_broadcast_descriptor
   - Descriptor 0x65: scrambling_descriptor

dvb/si/desc_62.h

+/*****************************************************************************
+ * desc_62.h: ETSI EN 300 468 Descriptor 0x62: Frequency list descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *          Georgi Chorbadzhiyski <georgi@unixsol.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject
+ * to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+/*
+ * Normative references:
+ *  - ETSI EN 300 468 V1.11.1 (2010-04) (SI in DVB systems)
+ */
+
+#ifndef __BITSTREAM_DVB_DESC_62_H__
+#define __BITSTREAM_DVB_DESC_62_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x62: Frequency list descriptor
+ *****************************************************************************/
+#define DESC62_HEADER_SIZE      (DESC_HEADER_SIZE + 1)
+#define DESC62_FREQ_SIZE        4
+
+static inline void desc62_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x62);
+    desc_set_length(p_desc, DESC62_HEADER_SIZE - DESC_HEADER_SIZE);
+    p_desc[2] = 0xfc;
+}
+
+static inline uint8_t desc62_get_coding_type(const uint8_t *p_desc)
+{
+    return p_desc[2] & 0x03;
+}
+
+static inline void desc62_set_coding_type(uint8_t *p_desc, uint8_t b_coding_type)
+{
+    p_desc[2] = (p_desc[2] & 0xfc) | (b_coding_type & 0x03);
+}
+
+static inline const char *desc62_get_coding_type_txt(uint8_t i_coding_type)
+{
+    return i_coding_type == 0 ? "not_defined" :
+           i_coding_type == 1 ? "satellite" :
+           i_coding_type == 2 ? "cable" :
+           i_coding_type == 3 ? "terrestrial" : "reserved";
+}
+
+static inline uint32_t desc62n_get_freq(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[0] << 24) | (p_desc_n[1] << 16) | (p_desc_n[2] << 8) | p_desc_n[3];
+}
+
+static inline void desc62n_set_freq(uint8_t *p_desc_n, uint32_t i_freq)
+{
+    p_desc_n[0] = (i_freq >> 24) & 0xff;
+    p_desc_n[1] = (i_freq >> 16) & 0xff;
+    p_desc_n[2] = (i_freq >>  8) & 0xff;
+    p_desc_n[3] =  i_freq        & 0xff;
+}
+
+static inline uint8_t *desc62_get_frequency(uint8_t *p_desc, uint8_t n)
+{
+    uint8_t *p_desc_n = p_desc + DESC62_HEADER_SIZE + n * DESC62_FREQ_SIZE;
+    if (p_desc_n + DESC62_FREQ_SIZE - p_desc
+         > desc_get_length(p_desc) + DESC62_HEADER_SIZE)
+        return NULL;
+    return p_desc_n;
+}
+
+static inline bool desc62_validate(const uint8_t *p_desc)
+{
+    return ((desc_get_length(p_desc) - 1) % DESC62_FREQ_SIZE) == 0;
+}
+
+static inline void desc62_print(uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    uint8_t j = 0;
+    uint8_t *p_desc_n;
+
+    while ((p_desc_n = desc62_get_frequency(p_desc, j)) != NULL) {
+        j++;
+        switch (i_print_type) {
+        case PRINT_XML:
+            pf_print(opaque,
+                "<FREQUENCY_LIST_DESC coding_type=\"%u\" coding_type_txt=\"%s\" frequency=\"%x\"/>",
+                desc62_get_coding_type(p_desc),
+                desc62_get_coding_type_txt(desc62_get_coding_type(p_desc)),
+                desc62n_get_freq(p_desc_n)
+            );
+            break;
+        default:
+            pf_print(opaque,
+                "    - desc 62 frequency_list coding_type=%u coding_type_txt=%s frequency=%x",
+                desc62_get_coding_type(p_desc),
+                desc62_get_coding_type_txt(desc62_get_coding_type(p_desc)),
+                desc62n_get_freq(p_desc_n)
+            );
+        }
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/descs_list.h

@@ -68,6 +68,7 @@
 #include <bitstream/dvb/si/desc_5f.h>
 #include <bitstream/dvb/si/desc_60.h>
 #include <bitstream/dvb/si/desc_61.h>
+#include <bitstream/dvb/si/desc_62.h>
 #include <bitstream/dvb/si/desc_6a.h>
 #include <bitstream/dvb/si/desc_83p28.h>
 #include <bitstream/dvb/si/desc_88p28.h>

examples/dvb_gen_si.c

@@ -1015,7 +1015,34 @@ static void build_desc61(uint8_t *desc) {
     desc61_set_sb_leak_rate(desc, 10); // 0.5 Mbit/s
 }
 
-/* ---  Descriptor 0x62: frequency_list_descriptor */
+/* DVB  Descriptor 0x62: Frequency list descriptor */
+static void build_desc62(uint8_t *desc) {
+    uint8_t k = 0;
+    uint8_t *freq_n;
+
+    desc62_init(desc);
+    desc62_set_coding_type(desc, 2); // Cable
+    desc_set_length(desc, 255);
+
+    freq_n = desc62_get_frequency(desc, k++);
+    desc62n_set_freq(freq_n, 0x3120000); // 312,0000 Mhz
+
+    freq_n = desc62_get_frequency(desc, k++);
+    desc62n_set_freq(freq_n, 0x3180000); // 318,0000 Mhz
+
+    freq_n = desc62_get_frequency(desc, k++);
+    desc62n_set_freq(freq_n, 0x3240000); // 324,0000 Mhz
+
+    freq_n = desc62_get_frequency(desc, k++);
+    desc62n_set_freq(freq_n, 0x3300000); // 330,0000 Mhz
+
+    freq_n = desc62_get_frequency(desc, k++);
+    desc62n_set_freq(freq_n, 0x3360000); // 336,0000 Mhz
+
+    freq_n = desc62_get_frequency(desc, k);
+    desc_set_length(desc, freq_n - desc - DESC_HEADER_SIZE);
+}
+
 /* ---  Descriptor 0x63: partial_transport_stream_descriptor */
 /* ---  Descriptor 0x64: data_broadcast_descriptor */
 /* ---  Descriptor 0x65: scrambling_descriptor */
@@ -1281,6 +1308,9 @@ static void generate_nit(void) {
         desc = descs_get_desc(desc_loop, desc_counter++);
         build_desc5b(desc);
 
+        desc = descs_get_desc(desc_loop, desc_counter++);
+        build_desc62(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

@@ -33,6 +33,11 @@ new NIT actual networkid=40000 version=1
     - desc 5b multilingual_network_name code="eng" networkname="M Network"
     - desc 5b multilingual_network_name code="fre" networkname="M Network"
     - desc 5b multilingual_network_name code="bul" networkname="M Network"
+    - desc 62 frequency_list coding_type=2 coding_type_txt=cable frequency=3120000
+    - desc 62 frequency_list coding_type=2 coding_type_txt=cable frequency=3180000
+    - 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
   * 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

@@ -53,6 +53,13 @@
 <MULTILINGUAL_NETWORK_NAME_DESC code="fre" networkname="M Network"/>
 <MULTILINGUAL_NETWORK_NAME_DESC code="bul" networkname="M Network"/>
 </DESC>
+<DESC id="0x62" length="21" value="fe0312000003180000032400000330000003360000">
+<FREQUENCY_LIST_DESC coding_type="2" coding_type_txt="cable" frequency="3120000"/>
+<FREQUENCY_LIST_DESC coding_type="2" coding_type_txt="cable" frequency="3180000"/>
+<FREQUENCY_LIST_DESC coding_type="2" coding_type_txt="cable" frequency="3240000"/>
+<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>
 <TS tsid="10000" onid="40000">
 <DESC id="0x41" length="12" value="4e20014e84024ee8014f4c02">
 <SERVICE_LIST_DESC sid="20000" type="0x01" />

mpeg/psi/descs_print.h

@@ -162,6 +162,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC_ICONV(5e)
         CASE_DESC(60)
         CASE_DESC(61)
+        CASE_DESC(62)
         CASE_DESC(6a)
 
 #undef CASE_DESC