dvb/si: Move each descriptor to dvb/si/desc_XX.h and add dvb/psi/desc_list.h

dvb/si/desc_40.h

@@ -0,0 +1,104 @@
+/*****************************************************************************
+ * desc_40.h: ETSI EN 300 468 Descriptor 0x40: Network name descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_40_H__
+#define __BITSTREAM_DVB_DESC_40_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/strings.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x40: Network name descriptor
+ *****************************************************************************/
+#define DESC40_HEADER_SIZE      DESC_HEADER_SIZE
+
+static inline void desc40_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x40);
+}
+
+static inline void desc40_set_networkname(uint8_t *p_desc,
+                                          const uint8_t *p_network_name,
+                                          uint8_t i_length)
+{
+    desc_set_length(p_desc, i_length);
+    memcpy(p_desc + 2, p_network_name, i_length);
+}
+
+static inline const uint8_t *desc40_get_networkname(const uint8_t *p_desc,
+                                                    uint8_t *pi_length)
+{
+    *pi_length = desc_get_length(p_desc);
+    return p_desc + 2;
+}
+
+static inline bool desc40_validate(const uint8_t *p_desc)
+{
+    return true;
+}
+
+static inline void desc40_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_network_name_length;
+    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,
+                                            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, "<NETWORK_NAME_DESC networkname=\"%s\"/>",
+                 psz_network_name);
+        break;
+    default:
+        pf_print(print_opaque, "    - desc 40 network_name networkname=\"%s\"",
+                 psz_network_name);
+    }
+    free(psz_network_name);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_41.h

@@ -0,0 +1,100 @@
+/*****************************************************************************
+ * desc_41.h: ETSI EN 300 468 Descriptor 0x41: Service list descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_41_H__
+#define __BITSTREAM_DVB_DESC_41_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x41: Service list descriptor
+ *****************************************************************************/
+#define DESC41_HEADER_SIZE      DESC_HEADER_SIZE
+#define DESC41_SERVICE_SIZE     3
+
+static inline uint8_t *desc41_get_service(uint8_t *p_desc, uint8_t n)
+{
+    uint8_t *p_desc_n = p_desc + DESC41_HEADER_SIZE + n * DESC41_SERVICE_SIZE;
+    if (p_desc_n + DESC41_SERVICE_SIZE - p_desc
+         > desc_get_length(p_desc) + DESC41_HEADER_SIZE)
+        return NULL;
+    return p_desc_n;
+}
+
+static inline uint16_t desc41n_get_sid(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[0] << 8) | p_desc_n[1];
+}
+
+static inline uint8_t desc41n_get_type(const uint8_t *p_desc_n)
+{
+    return p_desc_n[2];
+}
+
+static inline bool desc41_validate(const uint8_t *p_desc)
+{
+    return !(desc_get_length(p_desc) % DESC41_SERVICE_SIZE);
+}
+
+static inline void desc41_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 = desc41_get_service(p_desc, j)) != NULL) {
+        j++;
+        switch (i_print_type) {
+        case PRINT_XML:
+            pf_print(opaque,
+            "<SERVICE_LIST_DESC sid=\"%hu\" type=\"%hhu\" />",
+            desc41n_get_sid(p_desc_n), desc41n_get_type(p_desc_n));
+            break;
+        default:
+            pf_print(opaque,
+            "    - desc 41 service_list sid=%hu type=%hhu",
+            desc41n_get_sid(p_desc_n), desc41n_get_type(p_desc_n));
+        }
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_43.h

@@ -0,0 +1,187 @@
+/*****************************************************************************
+ * desc_43.h: ETSI EN 300 468 Descriptor 0x43: Satellite delivery system
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_43_H__
+#define __BITSTREAM_DVB_DESC_43_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/numbers.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x43: Satellite delivery system descriptor
+ *****************************************************************************/
+#define DESC43_HEADER_SIZE      (DESC_HEADER_SIZE + 11)
+
+static inline uint32_t desc43_get_frequency(const uint8_t *p_desc)
+{
+    return dvb_bcd_get(p_desc + 2, 32) * 10; /* kHz */
+}
+
+static inline unsigned int desc43_get_position(const uint8_t *p_desc)
+{
+    return dvb_bcd_get(p_desc + 6, 16); /* 10th degree */
+}
+
+static inline bool desc43_get_east(const uint8_t *p_desc)
+{
+    return !!(p_desc[8] & 0x80);
+}
+
+static inline uint8_t desc43_get_polarization(const uint8_t *p_desc)
+{
+    return (p_desc[8] & 0x60) >> 5;
+}
+
+static inline uint8_t desc43_get_rolloff(const uint8_t *p_desc)
+{
+    return (p_desc[8] & 0x18) >> 3;
+}
+
+static inline bool desc43_get_dvbs2(const uint8_t *p_desc)
+{
+    return !!(p_desc[8] & 0x4);
+}
+
+static inline bool desc43_get_modulation(const uint8_t *p_desc)
+{
+    return p_desc[8] & 0x3;
+}
+
+static inline unsigned int desc43_get_symbolrate(const uint8_t *p_desc)
+{
+    return dvb_bcd_get(p_desc + 9, 28) * 100; /* sy/s */
+}
+
+static inline uint8_t desc43_get_fecinner(const uint8_t *p_desc)
+{
+    return p_desc[12] & 0xf;
+}
+
+static inline const char *dvb_delivery_get_fec(uint8_t i_fec)
+{
+    switch (i_fec) {
+        case 0x0: return "undefined";
+        case 0x1: return "1/2";
+        case 0x2: return "2/3";
+        case 0x3: return "3/4";
+        case 0x4: return "5/6";
+        case 0x5: return "7/8";
+        case 0x6: return "8/9";
+        case 0x7: return "3/5";
+        case 0x8: return "4/5";
+        case 0x9: return "9/10";
+        case 0xf: return "none";
+        default: return "reserved";
+    }
+}
+
+static inline bool desc43_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC43_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc43_print(const uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    unsigned int i_pos = desc43_get_position(p_desc);
+    uint8_t i_polarization = desc43_get_polarization(p_desc);
+    const char *psz_polarization = "";;
+    uint8_t i_rolloff = desc43_get_rolloff(p_desc);
+    uint8_t i_modulation = desc43_get_modulation(p_desc);
+    const char *psz_modulation = "";
+
+    switch (i_polarization) {
+        case 0x0: psz_polarization = "H"; break;
+        case 0x1: psz_polarization = "V"; break;
+        case 0x2: psz_polarization = "L"; break;
+        case 0x3: psz_polarization = "R"; break;
+    }
+
+    switch (i_rolloff) {
+        case 0x0: i_rolloff = 35; break;
+        case 0x1: i_rolloff = 25; break;
+        case 0x2: i_rolloff = 20; break;
+    }
+
+    switch (i_modulation) {
+        case 0x0: psz_modulation = "auto"; break;
+        case 0x1: psz_modulation = "qpsk"; break;
+        case 0x2: psz_modulation = "8psk"; break;
+        case 0x3: psz_modulation = "16-qam"; break;
+    }
+
+    switch (i_print_type) {
+    case PRINT_XML:
+        if (desc43_get_dvbs2(p_desc))
+            pf_print(opaque,
+             "<SATELLITE_DESC s2=\"1\" frequency=\"%u%s\" pos=\"%u.%u%c\" rolloff=\"0.%hhu\" modulation=\"%s\" symbolrate=\"%u\" fecinner=\"%s\"/>",
+             desc43_get_frequency(p_desc), psz_polarization,
+             i_pos / 10, i_pos % 10, desc43_get_east(p_desc) ? 'E' : 'W',
+             i_rolloff, psz_modulation, desc43_get_symbolrate(p_desc),
+             dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));
+        else
+            pf_print(opaque,
+             "<SATELLITE_DESC s2=\"0\" frequency=\"%u%s\" pos=\"%u.%u%c\" modulation=\"%s\" symbolrate=\"%u\" fecinner=\"%s\"/>",
+             desc43_get_frequency(p_desc), psz_polarization,
+             i_pos / 10, i_pos % 10, desc43_get_east(p_desc) ? 'E' : 'W',
+             psz_modulation, desc43_get_symbolrate(p_desc),
+             dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));
+        break;
+    default:
+        if (desc43_get_dvbs2(p_desc))
+            pf_print(opaque,
+             "    - desc 43 dvb-s2 frequency=%u%s pos=%u.%u%c rolloff=0.%hhu modulation=%s symbolrate=%u fecinner=%s",
+             desc43_get_frequency(p_desc), psz_polarization,
+             i_pos / 10, i_pos % 10, desc43_get_east(p_desc) ? 'E' : 'W',
+             i_rolloff, psz_modulation, desc43_get_symbolrate(p_desc),
+             dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));
+        else
+            pf_print(opaque,
+             "    - desc 43 dvb-s frequency=%u%s pos=%u.%u%c modulation=%s symbolrate=%u fecinner=%s",
+             desc43_get_frequency(p_desc), psz_polarization,
+             i_pos / 10, i_pos % 10, desc43_get_east(p_desc) ? 'E' : 'W',
+             psz_modulation, desc43_get_symbolrate(p_desc),
+             dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_44.h

@@ -0,0 +1,119 @@
+/*****************************************************************************
+ * desc_44.h: ETSI EN 300 468 Descriptor 0x44: Cable delivery system
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_44_H__
+#define __BITSTREAM_DVB_DESC_44_H__
+
+#include <inttypes.h> /* PRIu64 */
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/desc_43.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x44: Cable delivery system descriptor
+ *****************************************************************************/
+#define DESC44_HEADER_SIZE      (DESC_HEADER_SIZE + 11)
+
+static inline uint64_t desc44_get_frequency(const uint8_t *p_desc)
+{
+    return (uint64_t)dvb_bcd_get(p_desc + 2, 32) * 100; /* Hz */
+}
+
+static inline uint8_t desc44_get_fecouter(const uint8_t *p_desc)
+{
+    return p_desc[7] & 0xf;
+}
+
+static inline uint8_t desc44_get_modulation(const uint8_t *p_desc)
+{
+    return p_desc[8];
+}
+
+#define desc44_get_symbolrate desc43_get_symbolrate
+#define desc44_get_fecinner desc43_get_fecinner
+
+static inline bool desc44_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC44_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc44_print(const uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    uint8_t i_fecouter = desc44_get_fecouter(p_desc);
+    const char *psz_fecouter = "reserved";
+    uint8_t i_modulation = desc44_get_modulation(p_desc);
+    const char *psz_modulation = "reserved";
+
+    switch (i_fecouter) {
+        case 0x0: psz_fecouter = "undefined"; break;
+        case 0x1: psz_fecouter = "none"; break;
+        case 0x2: psz_fecouter = "rs(204/188)"; break;
+    }
+
+    switch (i_modulation) {
+        case 0x0: psz_modulation = "undefined"; break;
+        case 0x1: psz_modulation = "16-qam"; break;
+        case 0x2: psz_modulation = "32-qam"; break;
+        case 0x3: psz_modulation = "64-qam"; break;
+        case 0x4: psz_modulation = "128-qam"; break;
+        case 0x5: psz_modulation = "256-qam"; break;
+    }
+
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(opaque,
+             "<CABLE_DESC frequency=\"%"PRIu64"\" fecouter=\"0x%s\" modulation=\"0x%s\" symbolrate=\"%u\" fecinner=\"%s\"/>",
+             desc44_get_frequency(p_desc), psz_fecouter, psz_modulation,
+             desc44_get_symbolrate(p_desc),
+             dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));
+        break;
+    default:
+        pf_print(opaque,
+             "    - desc 44 dvb-c frequency=%"PRIu64" Hz fecouter=0x%s modulation=0x%s symbolrate=%u fecinner=%s",
+             desc44_get_frequency(p_desc), psz_fecouter, psz_modulation,
+             desc44_get_symbolrate(p_desc),
+             dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_46.h

@@ -0,0 +1,139 @@
+/*****************************************************************************
+ * desc_46.h: ETSI EN 300 468 Descriptor 0x46: VBI teletext descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_46_H__
+#define __BITSTREAM_DVB_DESC_46_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/mpeg/psi/desc_0a.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x46: VBI teletext descriptor
+ *****************************************************************************/
+#define DESC46_HEADER_SIZE      DESC_HEADER_SIZE
+#define DESC46_LANGUAGE_SIZE    5
+
+static inline void desc46_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x46);
+}
+
+static inline uint8_t *desc46_get_language(uint8_t *p_desc, uint8_t n)
+{
+    uint8_t *p_desc_n = p_desc + DESC46_HEADER_SIZE + n * DESC46_LANGUAGE_SIZE;
+    if (p_desc_n + DESC46_LANGUAGE_SIZE - p_desc
+         > desc_get_length(p_desc) + DESC46_HEADER_SIZE)
+        return NULL;
+    return p_desc_n;
+}
+
+#define desc46n_set_code desc0an_set_code
+#define desc46n_get_code desc0an_get_code
+
+static inline void desc46n_set_teletexttype(uint8_t *p_desc_n, uint8_t i_type)
+{
+    p_desc_n[3] &= ~0xfc;
+    p_desc_n[3] |= (i_type << 3) & 0xfc;
+}
+
+static inline uint8_t desc46n_get_teletexttype(const uint8_t *p_desc_n)
+{
+    return p_desc_n[3] >> 3;
+}
+
+static inline void desc46n_set_teletextmagazine(uint8_t *p_desc_n,
+                                                uint8_t i_magazine)
+{
+    p_desc_n[3] &= ~0x3;
+    p_desc_n[3] |= (i_magazine & 0x3);
+}
+
+static inline uint8_t desc46n_get_teletextmagazine(const uint8_t *p_desc_n)
+{
+    return p_desc_n[3] & 0x3;
+}
+
+static inline void desc46n_set_teletextpage(uint8_t *p_desc_n, uint8_t i_page)
+{
+    p_desc_n[4] = i_page;
+}
+
+static inline uint8_t desc46n_get_teletextpage(const uint8_t *p_desc_n)
+{
+    return p_desc_n[4];
+}
+
+static inline bool desc46_validate(const uint8_t *p_desc)
+{
+    return !(desc_get_length(p_desc) % DESC46_LANGUAGE_SIZE);
+}
+
+static inline void desc46_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 = desc46_get_language(p_desc, j)) != NULL) {
+        j++;
+        switch (i_print_type) {
+        case PRINT_XML:
+            pf_print(opaque,
+                 "<%s language=\"%3.3s\" type=\"0x%hhx\" mag=\"%hhu\" page=\"0x%hhx\"/>",
+                 desc_get_tag(p_desc) == 0x46 ? "VBI_TELX_DESC" : "TELX_DESC",
+                 (const char *)desc46n_get_code(p_desc_n),
+                 desc46n_get_teletexttype(p_desc_n),
+                 desc46n_get_teletextmagazine(p_desc_n),
+                 desc46n_get_teletextpage(p_desc_n));
+            break;
+        default:
+            pf_print(opaque,
+                 "    - desc %x telx language=%3.3s type=0x%hhx mag=%hhu page=0x%hhx",
+                 desc_get_tag(p_desc), (const char *)desc46n_get_code(p_desc_n),
+                 desc46n_get_teletexttype(p_desc_n),
+                 desc46n_get_teletextmagazine(p_desc_n),
+                 desc46n_get_teletextpage(p_desc_n));
+        }
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_48.h

@@ -0,0 +1,149 @@
+/*****************************************************************************
+ * desc_48.h: ETSI EN 300 468 Descriptor 0x48: Service descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_48_H__
+#define __BITSTREAM_DVB_DESC_48_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/strings.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x48: Service descriptor
+ *****************************************************************************/
+#define DESC48_HEADER_SIZE      (DESC_HEADER_SIZE + 1)
+
+static inline void desc48_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x48);
+}
+
+static inline void desc48_set_type(uint8_t *p_desc, uint8_t i_type)
+{
+    p_desc[2] = i_type;
+}
+
+static inline uint8_t desc48_get_type(const uint8_t *p_desc)
+{
+    return p_desc[2];
+}
+
+static inline void desc48_set_provider(uint8_t *p_desc,
+                                       const uint8_t *p_provider,
+                                       uint8_t i_length)
+{
+    uint8_t *p = p_desc + DESC48_HEADER_SIZE;
+    p[0] = i_length;
+    memcpy(p + 1, p_provider, i_length);
+}
+
+static inline const uint8_t *desc48_get_provider(const uint8_t *p_desc,
+                                                 uint8_t *pi_length)
+{
+    const uint8_t *p = p_desc + DESC48_HEADER_SIZE;
+    *pi_length = p[0];
+    return p + 1;
+}
+
+static inline void desc48_set_service(uint8_t *p_desc,
+                                      const uint8_t *p_service,
+                                      uint8_t i_length)
+{
+    uint8_t *p = p_desc + DESC48_HEADER_SIZE + 1 + p_desc[3];
+    p[0] = i_length;
+    memcpy(p + 1, p_service, i_length);
+}
+
+static inline uint8_t *desc48_get_service(const uint8_t *p_desc,
+                                          uint8_t *pi_length)
+{
+    uint8_t *p = (uint8_t *)p_desc + DESC48_HEADER_SIZE + 1 + p_desc[3];
+    *pi_length = p[0];
+    return p + 1;
+}
+
+static inline bool desc48_validate(const uint8_t *p_desc)
+{
+    uint8_t i_length = desc_get_length(p_desc);
+    const uint8_t *p = p_desc + DESC48_HEADER_SIZE;
+
+    p += *p + 1;
+    if (DESC48_HEADER_SIZE + 2 > i_length + DESC_HEADER_SIZE ||
+        p + 1 - p_desc > i_length + DESC_HEADER_SIZE)
+        return false;
+
+    p += *p + 1;
+    if (p - p_desc > i_length + DESC_HEADER_SIZE)
+        return false;
+
+    return true;
+}
+
+static inline void desc48_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_provider_length, i_service_length;
+    const uint8_t *p_provider = desc48_get_provider(p_desc, &i_provider_length);
+    const uint8_t *p_service = desc48_get_service(p_desc, &i_service_length);
+    char *psz_provider = dvb_string_get(p_provider, i_provider_length,
+                                        pf_iconv, iconv_opaque);
+    char *psz_service = dvb_string_get(p_service, i_service_length,
+                                       pf_iconv, iconv_opaque);
+    switch (i_print_type) {
+    case PRINT_XML:
+        psz_provider = dvb_string_xml_escape(psz_provider);
+        psz_service = dvb_string_xml_escape(psz_service);
+        pf_print(print_opaque,
+                 "<SERVICE_DESC type=\"0x%hhx\" provider=\"%s\" service=\"%s\"/>",
+                 desc48_get_type(p_desc), psz_provider, psz_service);
+        break;
+    default:
+        pf_print(print_opaque,
+                 "    - desc 48 service type=0x%hhx provider=\"%s\" service=\"%s\"",
+                 desc48_get_type(p_desc), psz_provider, psz_service);
+    }
+    free(psz_provider);
+    free(psz_service);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_4a.h

@@ -0,0 +1,96 @@
+/*****************************************************************************
+ * desc_4a.h: ETSI EN 300 468 Descriptor 0x4a: Linkage descriptor (partially implemented)
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_4A_H__
+#define __BITSTREAM_DVB_DESC_4A_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x4a: Linkage descriptor (partially implemented)
+ *****************************************************************************/
+#define DESC4A_HEADER_SIZE      (DESC_HEADER_SIZE + 7)
+
+static inline uint16_t desc4a_get_tsid(const uint8_t *p_desc)
+{
+    return (p_desc[2] << 8) | p_desc[3];
+}
+
+static inline uint16_t desc4a_get_onid(const uint8_t *p_desc)
+{
+    return (p_desc[4] << 8) | p_desc[5];
+}
+
+static inline uint16_t desc4a_get_sid(const uint8_t *p_desc)
+{
+    return (p_desc[6] << 8) | p_desc[7];
+}
+
+static inline uint8_t desc4a_get_linkage(const uint8_t *p_desc)
+{
+    return p_desc[8];
+}
+
+static inline bool desc4a_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC4A_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc4a_print(const uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(opaque,
+             "<LINKAGE_DESC tsid=\"%hu\" onid=\"%hu\" sid=\"%hu\" linkage=\"%hhu\" />",
+             desc4a_get_tsid(p_desc), desc4a_get_onid(p_desc),
+             desc4a_get_sid(p_desc), desc4a_get_linkage(p_desc));
+        break;
+    default:
+        pf_print(opaque,
+             "    - desc 4a linkage tsid=%hu onid=%hu sid=%hu linkage=%hhu",
+             desc4a_get_tsid(p_desc), desc4a_get_onid(p_desc),
+             desc4a_get_sid(p_desc), desc4a_get_linkage(p_desc));
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_56.h

@@ -0,0 +1,72 @@
+/*****************************************************************************
+ * desc_56.h: ETSI EN 300 468 Descriptor 0x56: Teletext descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_56_H__
+#define __BITSTREAM_DVB_DESC_56_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/desc_46.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x56: Teletext descriptor
+ *****************************************************************************/
+#define DESC56_HEADER_SIZE      DESC46_HEADER_SIZE
+#define DESC56_LANGUAGE_SIZE    DESC46_LANGUAGE_SIZE
+
+static inline void desc56_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x56);
+}
+
+#define desc56_get_language desc46_get_language
+#define desc56n_set_code desc46n_set_code
+#define desc56n_get_code desc46n_get_code
+#define desc56n_set_teletexttype desc46n_set_teletexttype
+#define desc56n_get_teletexttype desc46n_get_teletexttype
+#define desc56n_set_teletextmagazine desc46n_set_teletextmagazine
+#define desc56n_get_teletextmagazine desc46n_get_teletextmagazine
+#define desc56n_set_teletextpage desc46n_set_teletextpage
+#define desc56n_get_teletextpage desc46n_get_teletextpage
+#define desc56_validate desc46_validate
+#define desc56_print desc46_print
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_59.h

@@ -0,0 +1,138 @@
+/*****************************************************************************
+ * desc_59.h: ETSI EN 300 468 Descriptor 0x59: Subtitling descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_59_H__
+#define __BITSTREAM_DVB_DESC_59_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/mpeg/psi/desc_0a.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x59: Subtitling descriptor
+ *****************************************************************************/
+#define DESC59_HEADER_SIZE      DESC_HEADER_SIZE
+#define DESC59_LANGUAGE_SIZE    8
+
+static inline void desc59_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x59);
+}
+
+static inline uint8_t *desc59_get_language(uint8_t *p_desc, uint8_t n)
+{
+    uint8_t *p_desc_n = p_desc + DESC59_HEADER_SIZE + n * DESC59_LANGUAGE_SIZE;
+    if (p_desc_n + DESC59_LANGUAGE_SIZE - p_desc
+         > desc_get_length(p_desc) + DESC59_HEADER_SIZE)
+        return NULL;
+    return p_desc_n;
+}
+
+#define desc59n_set_code desc0an_set_code
+#define desc59n_get_code desc0an_get_code
+
+static inline void desc59n_set_subtitlingtype(uint8_t *p_desc_n, uint8_t i_type)
+{
+    p_desc_n[3] = i_type;
+}
+
+static inline uint8_t desc59n_get_subtitlingtype(const uint8_t *p_desc_n)
+{
+    return p_desc_n[3];
+}
+
+static inline void desc59n_set_compositionpage(uint8_t *p_desc_n,
+                                               uint16_t i_page)
+{
+    p_desc_n[4] = i_page >> 8;
+    p_desc_n[5] = i_page & 0xff;
+}
+
+static inline uint16_t desc59n_get_compositionpage(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[4] << 8) | p_desc_n[5];
+}
+
+static inline void desc59n_set_ancillarypage(uint8_t *p_desc_n, uint16_t i_page)
+{
+    p_desc_n[6] = i_page >> 8;
+    p_desc_n[7] = i_page & 0xff;
+}
+
+static inline uint16_t desc59n_get_ancillarypage(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[6] << 8) | p_desc_n[7];
+}
+
+static inline bool desc59_validate(const uint8_t *p_desc)
+{
+    return !(desc_get_length(p_desc) % DESC59_LANGUAGE_SIZE);
+}
+
+static inline void desc59_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 = desc59_get_language(p_desc, j)) != NULL) {
+        j++;
+        switch (i_print_type) {
+        case PRINT_XML:
+            pf_print(opaque,
+            "<SUBTITLING_DESC language=\"%3.3s\" type=\"0x%hhx\" composition=\"%hu\" ancillary=\"%hu\"/>",
+            (const char *)desc59n_get_code(p_desc_n),
+            desc59n_get_subtitlingtype(p_desc_n),
+            desc59n_get_compositionpage(p_desc_n),
+            desc59n_get_ancillarypage(p_desc_n));
+            break;
+        default:
+            pf_print(opaque,
+            "    - desc 59 subtitling language=%3.3s type=0x%hhx composition=%hu ancillary=%hu",
+            (const char *)desc59n_get_code(p_desc_n),
+            desc59n_get_subtitlingtype(p_desc_n),
+            desc59n_get_compositionpage(p_desc_n),
+            desc59n_get_ancillarypage(p_desc_n));
+        }
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_5a.h

@@ -0,0 +1,206 @@
+/*****************************************************************************
+ * desc_5a.h: ETSI EN 300 468 Descriptor 0x5a: Terrestrial delivery system
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_5A_H__
+#define __BITSTREAM_DVB_DESC_5A_H__
+
+#include <inttypes.h> /* PRIu64 */
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/desc_43.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x5a: Terrestrial delivery system descriptor
+ *****************************************************************************/
+#define DESC5A_HEADER_SIZE      (DESC_HEADER_SIZE + 11)
+
+static inline uint64_t desc5a_get_frequency(const uint8_t *p_desc)
+{
+    return (((uint64_t)p_desc[2] << 24) | (p_desc[3] << 16) | (p_desc[4] << 8)
+             | p_desc[5]) * 10; /* Hz */
+}
+
+static inline uint8_t desc5a_get_bandwidth(const uint8_t *p_desc)
+{
+    return p_desc[6] >> 5;
+}
+
+static inline bool desc5a_get_priority(const uint8_t *p_desc)
+{
+    return !!((p_desc[6] >> 4) & 0x1);
+}
+
+/* ! inverted logic ! */
+static inline bool desc5a_get_timeslicing(const uint8_t *p_desc)
+{
+    return !((p_desc[6] >> 3) & 0x1);
+}
+
+/* ! inverted logic ! */
+static inline bool desc5a_get_mpefec(const uint8_t *p_desc)
+{
+    return !((p_desc[6] >> 2) & 0x1);
+}
+
+static inline uint8_t desc5a_get_constellation(const uint8_t *p_desc)
+{
+    return p_desc[7] >> 6;
+}
+
+static inline uint8_t desc5a_get_hierarchy(const uint8_t *p_desc)
+{
+    return (p_desc[7] >> 3) & 0x7;
+}
+
+static inline uint8_t desc5a_get_coderatehp(const uint8_t *p_desc)
+{
+    return p_desc[7] & 0x7;
+}
+
+static inline uint8_t desc5a_get_coderatelp(const uint8_t *p_desc)
+{
+    return p_desc[8] >> 5;
+}
+
+static inline uint8_t desc5a_get_guard(const uint8_t *p_desc)
+{
+    return (p_desc[8] >> 3) & 0x3;
+}
+
+static inline uint8_t desc5a_get_transmission(const uint8_t *p_desc)
+{
+    return (p_desc[8] >> 1) & 0x3;
+}
+
+static inline bool desc5a_get_otherfrequency(const uint8_t *p_desc)
+{
+    return !!(p_desc[8] & 0x1);
+}
+
+static inline bool desc5a_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC5A_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc5a_print(const uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    uint8_t i_bandwidth = desc5a_get_bandwidth(p_desc);
+    uint8_t i_constellation = desc5a_get_constellation(p_desc);
+    const char *psz_constellation = "reserved";
+    uint8_t i_hierarchy = desc5a_get_hierarchy(p_desc);
+    const char *psz_hierarchy = "";
+    bool b_hierarchy = !!(i_hierarchy & 0x3);
+    uint8_t i_guard = desc5a_get_guard(p_desc);
+    const char *psz_guard = "";
+    uint8_t i_transmission = desc5a_get_transmission(p_desc);
+    const char *psz_transmission = "reserved";
+
+    switch (i_bandwidth) {
+        case 0x0: i_bandwidth = 8; break;
+        case 0x1: i_bandwidth = 7; break;
+        case 0x2: i_bandwidth = 6; break;
+        case 0x3: i_bandwidth = 5; break;
+        default: i_bandwidth = 0; break;
+    }
+
+    switch (i_constellation) {
+        case 0x0: psz_constellation = "QPSK"; break;
+        case 0x1: psz_constellation = "16-qam"; break;
+        case 0x2: psz_constellation = "64-qam"; break;
+    }
+
+    switch (i_hierarchy) {
+        case 0x0: psz_hierarchy = "none"; break;
+        case 0x1: psz_hierarchy = "1"; break;
+        case 0x2: psz_hierarchy = "2"; break;
+        case 0x3: psz_hierarchy = "4"; break;
+        case 0x4: psz_hierarchy = "none+in-depth"; break;
+        case 0x5: psz_hierarchy = "1+in-depth"; break;
+        case 0x6: psz_hierarchy = "2+in-depth"; break;
+        case 0x7: psz_hierarchy = "4+in-depth"; break;
+    }
+
+    switch (i_guard) {
+        case 0x0: psz_guard = "1/32"; break;
+        case 0x1: psz_guard = "1/16"; break;
+        case 0x2: psz_guard = "1/8"; break;
+        case 0x3: psz_guard = "1/4"; break;
+    }
+
+    switch (i_transmission) {
+        case 0x0: psz_transmission = "2k"; break;
+        case 0x1: psz_transmission = "8k"; break;
+        case 0x2: psz_transmission = "4k"; break;
+    }
+
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(opaque,
+             "<TERRESTRIAL_DESC frequency=\"%"PRIu64"\" bandwidth=\"%u\" priority=\"%s\" timeslicing=\"%d\" mpefec=\"%d\" constellation=\"%s\" hierarchy=\"%s\" coderatehp=\"%s\" coderatelp=\"%s\" guard=\"%s\" transmission=\"%s\" otherfrequency=\"%d\"/>",
+             desc5a_get_frequency(p_desc), i_bandwidth,
+             desc5a_get_priority(p_desc) ? "HP" : "LP",
+             desc5a_get_timeslicing(p_desc) ? 1 : 0,
+             desc5a_get_mpefec(p_desc) ? 1 : 0, psz_constellation,
+             psz_hierarchy,
+             dvb_delivery_get_fec(desc5a_get_coderatehp(p_desc)),
+             b_hierarchy ? dvb_delivery_get_fec(desc5a_get_coderatehp(p_desc)) : "not_applicable",
+             psz_guard, psz_transmission,
+             desc5a_get_otherfrequency(p_desc) ? 1 : 0);
+        break;
+    default:
+        pf_print(opaque,
+             "    - desc 5a dvb-t frequency=%"PRIu64" Hz bandwidth=%u MHz priority=%s%s%s constellation=%s hierarchy=%s coderatehp=%s%s%s guard=%s transmission=%s%s",
+             desc5a_get_frequency(p_desc), i_bandwidth,
+             desc5a_get_priority(p_desc) ? "HP" : "LP",
+             desc5a_get_timeslicing(p_desc) ? " timeslicing" : "",
+             desc5a_get_mpefec(p_desc) ? " mpefec" : "", psz_constellation,
+             psz_hierarchy,
+             dvb_delivery_get_fec(desc5a_get_coderatehp(p_desc)),
+             b_hierarchy ? "coderatelp=" : "",
+             b_hierarchy ? dvb_delivery_get_fec(desc5a_get_coderatehp(p_desc)) : "",
+             psz_guard, psz_transmission,
+             desc5a_get_otherfrequency(p_desc) ? " otherfrequency" : "");
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_5f.h

@@ -0,0 +1,83 @@
+/*****************************************************************************
+ * desc_5f.h: ETSI EN 300 468 Descriptor 0x5f: Private data specifier
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_5F_H__
+#define __BITSTREAM_DVB_DESC_5F_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x5f: Private data specifier descriptor
+ *****************************************************************************/
+#define DESC5F_HEADER_SIZE      (DESC_HEADER_SIZE + 4)
+
+static inline void desc5f_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x5f);
+}
+
+static inline uint32_t desc5f_get_specifier(const uint8_t *p_desc)
+{
+    return (p_desc[2] << 24) | (p_desc[3] << 16) |
+           (p_desc[4] << 8) | p_desc[5];
+}
+
+static inline bool desc5f_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC5F_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc5f_print(const uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(opaque, "<PRIVATE_DATA_SPECIFIER_DESC specifier=\"%u\" />",
+                 desc5f_get_specifier(p_desc));
+        break;
+    default:
+        pf_print(opaque, "    - desc 5f private data specifier=%u",
+                 desc5f_get_specifier(p_desc));
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_6a.h

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * desc_6a.h: ETSI EN 300 468 Descriptor 0x6a: AC-3 descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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_6A_H__
+#define __BITSTREAM_DVB_DESC_6A_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x6a: AC-3 descriptor
+ *****************************************************************************/
+#define DESC6A_HEADER_SIZE      (DESC_HEADER_SIZE + 1)
+
+static inline void desc6a_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x6a);
+}
+
+static inline void desc6a_clear_flags(uint8_t *p_desc)
+{
+    p_desc[2] = 0;
+}
+
+static inline bool desc6a_validate(const uint8_t *p_desc)
+{
+    return desc_get_length(p_desc) >= DESC6A_HEADER_SIZE - DESC_HEADER_SIZE;
+}
+
+static inline void desc6a_print(const uint8_t *p_desc, f_print pf_print,
+                                void *opaque, print_type_t i_print_type)
+{
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(opaque, "<AC3_DESC />");
+        break;
+    default:
+        pf_print(opaque, "    - desc 6a ac3");
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_83p28.h

@@ -0,0 +1,118 @@
+/*****************************************************************************
+ * desc_83p28.h: ETSI EN 300 468 Descriptor 0x83: Logical channel descriptor
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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)
+ *  - IEC/CENELEC 62 216
+ */
+
+#ifndef __BITSTREAM_DVB_DESC_83P28_H__
+#define __BITSTREAM_DVB_DESC_83P28_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x83: Logical channel descriptor (IEC/CENELEC 62 216)
+ * Only valid if a private data specifier descriptor 28 is present before.
+ *****************************************************************************/
+#define DESC83P28_HEADER_SIZE      DESC_HEADER_SIZE
+#define DESC83P28_SERVICE_SIZE     4
+
+static inline void desc83p28_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x83);
+}
+
+static inline uint8_t *desc83p28_get_service(uint8_t *p_desc, uint8_t n)
+{
+    uint8_t *p_desc_n = p_desc + DESC83P28_HEADER_SIZE
+                         + n * DESC83P28_SERVICE_SIZE;
+    if (p_desc_n + DESC83P28_SERVICE_SIZE - p_desc
+         > desc_get_length(p_desc) + DESC83P28_HEADER_SIZE)
+        return NULL;
+    return p_desc_n;
+}
+
+static inline uint16_t desc83p28n_get_sid(const uint8_t *p_desc_n)
+{
+    return (p_desc_n[0] << 8) | p_desc_n[1];
+}
+
+static inline bool desc83p28n_get_visible(const uint8_t *p_desc_n)
+{
+    return !!(p_desc_n[2] & 0x80);
+}
+
+static inline uint16_t desc83p28n_get_lcn(const uint8_t *p_desc_n)
+{
+    return ((p_desc_n[2] & 0x3) << 8) | p_desc_n[3];
+}
+
+static inline bool desc83p28_validate(const uint8_t *p_desc)
+{
+    return !(desc_get_length(p_desc) % DESC83P28_SERVICE_SIZE);
+}
+
+static inline void desc83p28_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 = desc83p28_get_service(p_desc, j)) != NULL) {
+        j++;
+        switch (i_print_type) {
+        case PRINT_XML:
+            pf_print(opaque,
+            "<%s sid=\"%hu\" visible=\"%d\" lcn=\"%hu\" />",
+            desc_get_tag(p_desc) == 0x88 ? "HD_SIMULCAST_LCN_DESC" : "LCN_DESC",
+            desc83p28n_get_sid(p_desc_n),
+            desc83p28n_get_visible(p_desc_n) ? 1 : 0,
+            desc83p28n_get_lcn(p_desc_n));
+            break;
+        default:
+            pf_print(opaque,
+            "    - desc %hhu lcn sid=%hu%s lcn=%hu", desc_get_tag(p_desc),
+            desc83p28n_get_sid(p_desc_n),
+            desc83p28n_get_visible(p_desc_n) ? " visible" : "",
+            desc83p28n_get_lcn(p_desc_n));
+        }
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/desc_88p28.h

@@ -0,0 +1,69 @@
+/*****************************************************************************
+ * desc_88p28.h: ETSI EN 300 468 Descriptor 0x88: HD simulcast logical channel
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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)
+ *  - IEC/CENELEC 62 216
+ */
+
+#ifndef __BITSTREAM_DVB_DESC_88P28_H__
+#define __BITSTREAM_DVB_DESC_88P28_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descriptors.h>
+#include <bitstream/dvb/si/desc_83p28.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Descriptor 0x88: HD simulcast logical channel descriptor (IEC/CENELEC 62 216)
+ * Only valid if a private data specifier descriptor 28 is present before.
+ *****************************************************************************/
+#define DESC88P28_HEADER_SIZE      DESC83P28_HEADER_SIZE
+#define DESC88P28_SERVICE_SIZE     DESC83P28_SERVICE_SIZE
+
+static inline void desc88p28_init(uint8_t *p_desc)
+{
+    desc_set_tag(p_desc, 0x88);
+}
+
+#define desc88p28_get_service desc83p28_get_service
+#define desc88p28_get_sid desc83p28_get_sid
+#define desc88p28_get_visible desc83p28_get_visible
+#define desc88p28_get_lcn desc83p28_get_lcn
+#define desc88p28_validate desc83p28_validate
+#define desc88p28_print desc83p28_print
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/descs_list.h

@@ -0,0 +1,52 @@
+/*****************************************************************************
+ * descs_list.h: All supported ETSI EN 300 468 descriptors
+ *****************************************************************************
+ * Copyright (C) 2009-2010 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *
+ * 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.
+ *****************************************************************************/
+
+#ifndef __BITSTREAM_DVB_DESCS_LIST_H__
+#define __BITSTREAM_DVB_DESCS_LIST_H__
+
+/*
+ * 1. Keep the list ordered.
+ * 2. When you are adding new descriptor here, make sure you also add
+ *    the needed code in bitstream/mpeg/psi/descs_print.h
+ */
+
+#include <bitstream/dvb/si/desc_40.h>
+#include <bitstream/dvb/si/desc_41.h>
+#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_48.h>
+#include <bitstream/dvb/si/desc_4a.h>
+#include <bitstream/dvb/si/desc_56.h>
+#include <bitstream/dvb/si/desc_59.h>
+#include <bitstream/dvb/si/desc_5a.h>
+#include <bitstream/dvb/si/desc_5f.h>
+#include <bitstream/dvb/si/desc_6a.h>
+#include <bitstream/dvb/si/desc_83p28.h>
+#include <bitstream/dvb/si/desc_88p28.h>
+
+#endif