dvb/si: Add support for descriptor 0x47 (Bouquet name).

dvb/si/desc_40.h

@@ -4,6 +4,7 @@
  * 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
@@ -78,6 +79,7 @@ static inline void desc40_print(const uint8_t *p_desc,
                                 print_type_t i_print_type)
 {
     uint8_t i_network_name_length;
+    bool b_bouquet_name = desc_get_tag(p_desc) == 0x47;
     const uint8_t *p_network_name = desc40_get_networkname(p_desc,
                                                      &i_network_name_length);
     char *psz_network_name = dvb_string_get(p_network_name,
@@ -87,12 +89,20 @@ static inline void desc40_print(const uint8_t *p_desc,
     switch (i_print_type) {
     case PRINT_XML:
         psz_network_name = dvb_string_xml_escape(psz_network_name);
-        pf_print(print_opaque, "<NETWORK_NAME_DESC networkname=\"%s\"/>",
-                 psz_network_name);
+        if ( !b_bouquet_name )
+            pf_print(print_opaque, "<NETWORK_NAME_DESC networkname=\"%s\"/>",
+                     psz_network_name);
+        else
+            pf_print(print_opaque, "<BOUQUET_NAME_DESC bouquetname=\"%s\"/>",
+                     psz_network_name);
         break;
     default:
-        pf_print(print_opaque, "    - desc 40 network_name networkname=\"%s\"",
-                 psz_network_name);
+        if ( !b_bouquet_name )
+            pf_print(print_opaque, "    - desc 40 networkname=\"%s\"",
+                     psz_network_name);
+        else
+            pf_print(print_opaque, "    - desc 47 bouquetname=\"%s\"",
+                     psz_network_name);
     }
     free(psz_network_name);
 }

dvb/si/desc_47.h

+/*****************************************************************************
+ * desc_47.h: ETSI EN 300 468 Descriptor 0x47: Bouquet name 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_47_H__
+#define __BITSTREAM_DVB_DESC_47_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/desc_40.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x47: Bouquet name descriptor
+ *****************************************************************************/
+#define DESC47_HEADER_SIZE      DESC_HEADER_SIZE
+
+static inline void desc47_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x47);
+}
+
+#define desc47_set_bouquetname  desc40_set_networkname
+#define desc47_get_bouquetname  desc40_get_networkname
+#define desc47_validate         desc40_validate
+#define desc47_print            desc40_print
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/descs_list.h

@@ -39,6 +39,7 @@
 #include <bitstream/dvb/si/desc_43.h>
 #include <bitstream/dvb/si/desc_44.h>
 #include <bitstream/dvb/si/desc_46.h>
+#include <bitstream/dvb/si/desc_47.h>
 #include <bitstream/dvb/si/desc_48.h>
 #include <bitstream/dvb/si/desc_4a.h>
 #include <bitstream/dvb/si/desc_56.h>

mpeg/psi/descs_print.h

@@ -122,6 +122,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(43)
         CASE_DESC(44)
         CASE_DESC(46)
+        CASE_DESC_ICONV(47)
         CASE_DESC_ICONV(48)
         CASE_DESC(4a)
         CASE_DESC(56)