dvb/si: Add support for descriptor 0x64 (Data broadcast descriptor).

README

@@ -133,6 +133,7 @@ Supported DVB descriptors
  * Descriptor 0x61: Short smoothing buffer descriptor
  * Descriptor 0x62: Frequency list descriptor
  * Descriptor 0x63: Partial transport stream descriptor
+ * Descriptor 0x64: Data broadcast 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 0x64: data_broadcast_descriptor
   - Descriptor 0x65: scrambling_descriptor
   - Descriptor 0x66: data_broadcast_id_descriptor
   - Descriptor 0x67: transport_stream_descriptor

dvb/si/desc_64.h

+/*****************************************************************************
+ * desc_64.h: ETSI EN 300 468 Descriptor 0x64: Data broadcast descriptor
+ *****************************************************************************
+ * Copyright (C) 2011 Unix Solutions Ltd.
+ *
+ * Authors: 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_64_H__
+#define __BITSTREAM_DVB_DESC_64_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/strings.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x64: Data broadcast descriptor
+ *****************************************************************************/
+#define DESC64_HEADER_SIZE      (DESC_HEADER_SIZE + 8)
+
+static inline void desc64_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x64);
+    desc_set_length(p_desc, DESC64_HEADER_SIZE - DESC_HEADER_SIZE);
+}
+
+static inline uint16_t desc64_get_broadcast_id(const uint8_t *p_desc)
+{
+    return (p_desc[2] << 8) | p_desc[3];
+}
+
+static inline void desc64_set_broadcast_id(uint8_t *p_desc, uint16_t i_broadcast_id)
+{
+    p_desc[2] = (i_broadcast_id >> 8) & 0xff;
+    p_desc[3] =  i_broadcast_id       & 0xff;
+}
+
+static inline uint8_t desc64_get_component_tag(const uint8_t *p_desc)
+{
+    return p_desc[4];
+}
+
+static inline void desc64_set_component_tag(uint8_t *p_desc, uint8_t i_component_tag)
+{
+    p_desc[4] = i_component_tag;
+}
+
+static inline uint8_t desc64_get_selector_byte_length(const uint8_t *p_desc)
+{
+    return p_desc[5];
+}
+
+static inline const uint8_t *desc64_get_selector_byte(const uint8_t *p_desc, uint8_t *pi_length)
+{
+    *pi_length = desc64_get_selector_byte_length(p_desc);
+    return p_desc + 6;
+}
+
+static inline void desc64_set_selector_byte(uint8_t *p_desc, const uint8_t *p_selector_byte, uint8_t i_length)
+{
+    p_desc[5] = i_length;
+    memcpy(p_desc + 6, p_selector_byte, i_length);
+}
+
+static inline const uint8_t *desc64_get_lang(const uint8_t *p_desc)
+{
+    return p_desc + 6 + desc64_get_selector_byte_length(p_desc);
+}
+
+static inline void desc64_set_lang(uint8_t *p_desc, const uint8_t p_lang[3])
+{
+    uint8_t *p = p_desc + 6 + desc64_get_selector_byte_length(p_desc);
+    p[0] = p_lang[0];
+    p[1] = p_lang[1];
+    p[2] = p_lang[2];
+}
+
+static inline uint8_t desc64_get_text_length(const uint8_t *p_desc)
+{
+    return p_desc[6 + desc64_get_selector_byte_length(p_desc) + 3];
+}
+
+static inline const uint8_t *desc64_get_text(const uint8_t *p_desc, uint8_t *pi_length)
+{
+    *pi_length = desc64_get_text_length(p_desc);
+    return p_desc + 6 + desc64_get_selector_byte_length(p_desc) + 3 + 1;
+}
+
+static inline void desc64_set_text(uint8_t *p_desc, const uint8_t *p_text, uint8_t i_length)
+{
+    uint8_t *p = p_desc + 6 + desc64_get_selector_byte_length(p_desc) + 3;
+    p[0] = i_length;
+    memcpy(p + 1, p_text, i_length);
+}
+
+static inline void desc64_set_length(uint8_t *p_desc)
+{
+    desc_set_length(p_desc, DESC64_HEADER_SIZE - DESC_HEADER_SIZE
+                            + desc64_get_selector_byte_length(p_desc)
+                            + desc64_get_text_length(p_desc));
+}
+
+static inline bool desc64_validate(const uint8_t *p_desc)
+{
+    int i_length = desc_get_length(p_desc) - (DESC64_HEADER_SIZE - DESC_HEADER_SIZE);
+    i_length -= desc64_get_selector_byte_length(p_desc);
+    i_length -= desc64_get_text_length(p_desc);
+    return i_length == 0;
+}
+
+static inline void desc64_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)
+{
+    uint8_t i_selector_byte_length, i_text_length, i;
+    const uint8_t *p_selector_byte = desc64_get_selector_byte(p_desc, &i_selector_byte_length);
+
+    const uint8_t *p_text = desc64_get_text(p_desc, &i_text_length);
+    char *psz_text = dvb_string_get(p_text, i_text_length, pf_iconv, iconv_opaque);
+
+    char psz_selector_byte[2 * 255 + 1];
+    char psz_selector_byte_txt[255 + 1];
+
+    for (i = 0; i < i_selector_byte_length; i++) {
+        sprintf(psz_selector_byte + 2 * i, "%02x", p_selector_byte[i]);
+        if (p_selector_byte[i] >= 32 && p_selector_byte[i] <= 127 && p_selector_byte[i] != '"')
+            psz_selector_byte_txt[i] = p_selector_byte[i];
+        else
+            psz_selector_byte_txt[i] = '.';
+    }
+    psz_selector_byte[2 * i] = '\0';
+    psz_selector_byte_txt[i] = '\0';
+
+    switch (i_print_type) {
+    case PRINT_XML:
+        psz_text = dvb_string_xml_escape(psz_text);
+        pf_print(print_opaque,
+                 "<DATA_BROADCAST_DESC broadcast_id=\"0x%04x\" component_tag=\"%u\""
+                 " selector_byte=\"%s\" selector_byte_txt=\"%s\" lang=\"%3.3s\""
+                 " text=\"%s\"/>",
+                 desc64_get_broadcast_id(p_desc),
+                 desc64_get_component_tag(p_desc),
+                 psz_selector_byte,
+                 psz_selector_byte_txt,
+                 (char *)desc64_get_lang(p_desc),
+                 psz_text);
+        break;
+    default:
+        pf_print(print_opaque,
+                 "    - desc 64 data_broadcast broadcast_id=0x%04x component_tag=%u"
+                 " selector_byte=\"%s\" selector_byte_txt=\"%s\" lang=%3.3s"
+                 " text=\"%s\"",
+                 desc64_get_broadcast_id(p_desc),
+                 desc64_get_component_tag(p_desc),
+                 psz_selector_byte,
+                 psz_selector_byte_txt,
+                 (char *)desc64_get_lang(p_desc),
+                 psz_text);
+    }
+    free(psz_text);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/descs_list.h

@@ -70,6 +70,7 @@
 #include <bitstream/dvb/si/desc_61.h>
 #include <bitstream/dvb/si/desc_62.h>
 #include <bitstream/dvb/si/desc_63.h>
+#include <bitstream/dvb/si/desc_64.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

@@ -1051,7 +1051,19 @@ static void build_desc63(uint8_t *desc) {
     desc63_set_max_overall_smoothing_buffer(desc, 1000);
 }
 
-/* ---  Descriptor 0x64: data_broadcast_descriptor */
+/* DVB  Descriptor 0x64: Data broadcast descriptor */
+static void build_desc64(uint8_t *desc) {
+    char *selector_byte = "BY\"TE";
+    char *text = "Some text";
+    desc64_init(desc);
+    desc64_set_broadcast_id(desc, 0x1122);
+    desc64_set_component_tag(desc, 78);
+    desc64_set_selector_byte(desc, (uint8_t *)selector_byte, strlen(selector_byte));
+    desc64_set_lang(desc, (uint8_t *)"eng");
+    desc64_set_text(desc, (uint8_t *)text, strlen(text));
+    desc64_set_length(desc);
+}
+
 /* ---  Descriptor 0x65: scrambling_descriptor */
 /* ---  Descriptor 0x66: data_broadcast_id_descriptor */
 /* ---  Descriptor 0x67: transport_stream_descriptor */
@@ -1629,6 +1641,9 @@ static void generate_sdt(void) {
             desc = descs_get_desc(desc_loop, desc_counter++);
             build_desc5f(desc);
 
+            desc = descs_get_desc(desc_loop, desc_counter++);
+            build_desc64(desc);
+
             // Finish descriptor generation
             desc = descs_get_desc(desc_loop, desc_counter); // Get next descriptor pos
             descs_set_length(desc_loop, desc - desc_loop - DESCS_HEADER_SIZE);

examples/dvb_print_si.output.txt

@@ -107,6 +107,7 @@ new SDT actual tsid=10000 version=1 onid=40000
     - desc 48 service type=0x1 provider="Test Provider Name" service="Test Service Name"
     - desc 4c time_shifted_service reference_sid=21000
     - desc 5f private_data specifier=0xaabbccdd
+    - desc 64 data_broadcast broadcast_id=0x1122 component_tag=78 selector_byte="4259225445" selector_byte_txt="BY.TE" lang=eng text="Some text"
   * service sid=20300 eit_schedule eit_pf running=2 scrambled
     - desc 48 service type=0x1 provider="Test Provider Name" service="Test Service Name"
     - desc 4b nvod_reference tsid=10000 onid=40000 sid=20000

examples/dvb_print_si.output.xml

@@ -179,6 +179,9 @@
 <DESC id="0x5f" length="4" value="aabbccdd">
 <PRIVATE_DATA_SPECIFIER_DESC specifier="0xaabbccdd" />
 </DESC>
+<DESC id="0x64" length="22" value="11224e054259225445656e6709536f6d652074657874">
+<DATA_BROADCAST_DESC broadcast_id="0x1122" component_tag="78" selector_byte="4259225445" selector_byte_txt="BY.TE" lang="eng" text="Some text"/>
+</DESC>
 </SERVICE>
 <SERVICE sid="20300" eit_schedule="1" eit_pf="1" running="2" free_CA="1">
 <DESC id="0x48" length="38" value="0112546573742050726f7669646572204e616d6511546573742053657276696365204e616d65">

mpeg/psi/descs_print.h

@@ -164,6 +164,7 @@ static inline void descl_print(uint8_t *p_descl, uint16_t i_length,
         CASE_DESC(61)
         CASE_DESC(62)
         CASE_DESC(63)
+        CASE_DESC_ICONV(64)
         CASE_DESC(6a)
 
 #undef CASE_DESC