dvb/si: Add support for descriptor 0x5b (Multilingual network name).

README

@@ -124,6 +124,7 @@ Supported DVB descriptors
  * Descriptor 0x58: Local time offset descriptor
  * Descriptor 0x59: Subtitling descriptor
  * Descriptor 0x5a: Terrestrial delivery system descriptor
+ * Descriptor 0x5b: Multilingual network name descriptor
  * Descriptor 0x5f: Private data specifier descriptor
  * Descriptor 0x6a: AC-3 descriptor [p]
 

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 0x5b: multilingual_network_name_descriptor
   - Descriptor 0x5c: multilingual_bouquet_name_descriptor
   - Descriptor 0x5d: multilingual_service_name_descriptor
   - Descriptor 0x5e: multilingual_component_descriptor

dvb/si/desc_5b.h

+/*****************************************************************************
+ * desc_5b.h: ETSI EN 300 468 Descriptor 0x5b: Multilingual network name
+ *****************************************************************************
+ * 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_5B_H__
+#define __BITSTREAM_DVB_DESC_5B_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/mpeg/psi/desc_0a.h>
+#include <bitstream/dvb/si/strings.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x5b: Multilingual network name
+ *****************************************************************************/
+#define DESC5B_HEADER_SIZE      DESC_HEADER_SIZE
+#define DESC5B_DATA_SIZE        4
+
+static inline void desc5b_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x5b);
+}
+
+#define desc5bn_set_code desc0an_set_code
+#define desc5bn_get_code desc0an_get_code
+
+static inline uint8_t desc5bn_get_networkname_length(const uint8_t *p_desc_n)
+{
+    return p_desc_n[3];
+}
+
+static inline const uint8_t *desc5bn_get_networkname(const uint8_t *p_desc_n, uint8_t *pi_length)
+{
+    *pi_length = desc5bn_get_networkname_length(p_desc_n);
+    return p_desc_n + 4;
+}
+
+static inline void desc5bn_set_networkname(uint8_t *p_desc_n, const uint8_t *p_network_name, uint8_t i_length)
+{
+    p_desc_n[3] = i_length;
+    memcpy(p_desc_n + 4, p_network_name, i_length);
+}
+
+static inline uint8_t *desc5b_get_data(const uint8_t *p_desc, uint8_t n)
+{
+    const uint8_t *p_desc_n = p_desc + DESC5B_HEADER_SIZE;
+    uint8_t i_desc_size = desc_get_length(p_desc);
+
+    while (n) {
+        if (p_desc_n + DESC5B_DATA_SIZE - p_desc > i_desc_size)
+            return NULL;
+        p_desc_n += DESC5B_DATA_SIZE + desc5bn_get_networkname_length(p_desc_n);
+        n--;
+    }
+    if (p_desc_n - p_desc > i_desc_size)
+        return NULL;
+    return (uint8_t *)p_desc_n;
+}
+
+static inline bool desc5b_validate(const uint8_t *p_desc)
+{
+    const uint8_t *p_desc_n = p_desc + DESC5B_HEADER_SIZE;
+    int i_desc_size = desc_get_length(p_desc);
+    while (i_desc_size > 0)
+    {
+        uint8_t i_data_sz = DESC5B_DATA_SIZE + desc5bn_get_networkname_length(p_desc_n);
+        i_desc_size -= i_data_sz;
+        p_desc_n    += i_data_sz;
+    }
+    return i_desc_size == 0;
+}
+
+static inline void desc5b_print(const uint8_t *p_desc,
+                                f_print pf_print, void *print_opaque,
+                                f_iconv pf_iconv, void *iconv_opaque,
+                                print_type_t i_print_type)
+{
+    const uint8_t *p_desc_n;
+    uint8_t j = 0;
+
+    while ((p_desc_n = desc5b_get_data(p_desc, j++)) != NULL) {
+        uint8_t i_network_name_length;
+        const uint8_t *p_network_name = desc5bn_get_networkname(p_desc_n, &i_network_name_length);
+        char *psz_network_name = dvb_string_get(p_network_name, i_network_name_length, pf_iconv, iconv_opaque);
+        switch (i_print_type) {
+        case PRINT_XML:
+            psz_network_name = dvb_string_xml_escape(psz_network_name);
+            pf_print(print_opaque,
+                     "<MULTILINGUAL_NETWORK_NAME_DESC code=\"%3.3s\" networkname=\"%s\"/>",
+                     desc5bn_get_code(p_desc_n),
+                     psz_network_name
+                    );
+            break;
+        default:
+            pf_print(print_opaque,
+                     "    - desc 5b multilingual_network_name code=\"%3.3s\" networkname=\"%s\"",
+                     desc5bn_get_code(p_desc_n),
+                     psz_network_name
+                    );
+        }
+        free(psz_network_name);
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/descs_list.h

@@ -61,6 +61,7 @@
 #include <bitstream/dvb/si/desc_58.h>
 #include <bitstream/dvb/si/desc_59.h>
 #include <bitstream/dvb/si/desc_5a.h>
+#include <bitstream/dvb/si/desc_5b.h>
 #include <bitstream/dvb/si/desc_5f.h>
 #include <bitstream/dvb/si/desc_6a.h>
 #include <bitstream/dvb/si/desc_83p28.h>

examples/dvb_gen_si.c

@@ -887,7 +887,31 @@ static void build_desc5a(uint8_t *desc) {
     desc5a_set_otherfrequency (desc, true);
 }
 
-/* ---  Descriptor 0x5b: multilingual_network_name_descriptor */
+/* DVB  Descriptor 0x5b: multilingual_network_name_descriptor */
+static void build_desc5b(uint8_t *desc) {
+    char *network_name = "M Network";
+    uint8_t k = 0;
+    uint8_t *data_n;
+
+    desc5b_init(desc);
+    desc_set_length(desc, 255);
+
+    data_n = desc5b_get_data(desc, k++);
+    desc5bn_set_code(data_n, (uint8_t *)"eng");
+    desc5bn_set_networkname(data_n, (uint8_t *)network_name, strlen(network_name));
+
+    data_n = desc5b_get_data(desc, k++);
+    desc5bn_set_code(data_n, (uint8_t *)"fre");
+    desc5bn_set_networkname(data_n, (uint8_t *)network_name, strlen(network_name));
+
+    data_n = desc5b_get_data(desc, k++);
+    desc5bn_set_code(data_n, (uint8_t *)"bul");
+    desc5bn_set_networkname(data_n, (uint8_t *)network_name, strlen(network_name));
+
+    data_n = desc5b_get_data(desc, k);
+    desc_set_length(desc, data_n - desc - DESC_HEADER_SIZE);
+}
+
 /* ---  Descriptor 0x5c: multilingual_bouquet_name_descriptor */
 /* ---  Descriptor 0x5d: multilingual_service_name_descriptor */
 /* ---  Descriptor 0x5e: multilingual_component_descriptor */
@@ -1162,6 +1186,9 @@ static void generate_nit(void) {
         desc = descs_get_desc(desc_loop, desc_counter++);
         build_desc5a(desc);
 
+        desc = descs_get_desc(desc_loop, desc_counter++);
+        build_desc5b(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

@@ -30,6 +30,9 @@ new NIT actual networkid=40000 version=1
     - desc 43 dvb-s frequency=11757250V pos=19.2E modulation=qpsk symbolrate=27450000 fecinner=7/8
     - desc 44 dvb-c frequency=312000000 Hz fecouter=undefined modulation=64-qam symbolrate=27450000 fecinner=8/9
     - desc 5a dvb-t frequency=12345678900 Hz bandwidth=6 MHz priority=LP timeslicing=1 mpefec=1 constellation=64-qam hierarchy=2+in-depth coderatehp=3/4 coderatelp=5/6 guard=1/16 transmission=4k otherfrequency=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"
   * 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

@@ -48,6 +48,11 @@
 <DESC id="0x5a" length="11" value="499602d243b26dffffffff">
 <TERRESTRIAL_DESC frequency="12345678900" bandwidth="6" priority="LP" timeslicing="1" mpefec="1" constellation="64-qam" hierarchy="2+in-depth" coderatehp="3/4" coderatelp="5/6" guard="1/16" transmission="4k" otherfrequency="1"/>
 </DESC>
+<DESC id="0x5b" length="39" value="656e67094d204e6574776f726b667265094d204e6574776f726b62756c094d204e6574776f726b">
+<MULTILINGUAL_NETWORK_NAME_DESC code="eng" networkname="M Network"/>
+<MULTILINGUAL_NETWORK_NAME_DESC code="fre" networkname="M Network"/>
+<MULTILINGUAL_NETWORK_NAME_DESC code="bul" networkname="M Network"/>
+</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

@@ -156,6 +156,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(58)
         CASE_DESC(59)
         CASE_DESC(5a)
+        CASE_DESC_ICONV(5b)
         CASE_DESC(6a)
 
 #undef CASE_DESC