dvb/si: Add support for DIT (Discontinuity Information Table).

dvb/si.h

@@ -48,5 +48,6 @@
 #include <bitstream/dvb/si/tot.h>
 #include <bitstream/dvb/si/rst.h>
 #include <bitstream/dvb/si/st.h>
+#include <bitstream/dvb/si/dit.h>
 
 #endif

dvb/si/dit.h

+/*****************************************************************************
+ * dit.h: ETSI EN 300 468 Discontinuity Information Table (DIT)
+ *****************************************************************************
+ * 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_DIT_H__
+#define __BITSTREAM_DVB_DIT_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/psi.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Discontinuity Information Table
+ *****************************************************************************/
+#define DIT_PID                 0x1E
+#define DIT_TABLE_ID            0x7E
+#define DIT_HEADER_SIZE         PSI_HEADER_SIZE
+
+static inline void dit_init(uint8_t *p_dit)
+{
+    psi_init(p_dit, false);
+    psi_set_tableid(p_dit, DIT_TABLE_ID);
+    psi_set_length(p_dit, 1);
+}
+
+static inline void dit_set_transition_flag(uint8_t *p_dit, bool b_transition_flag)
+{
+    p_dit[3] = b_transition_flag ? 0xff : 0x7f;
+}
+
+static inline bool dit_get_transition_flag(const uint8_t *p_dit)
+{
+    return p_dit[3] >> 7;
+}
+
+static inline bool dit_validate(const uint8_t *p_dit)
+{
+    uint16_t i_section_size = psi_get_length(p_dit) + PSI_HEADER_SIZE;
+    uint8_t i_tid = psi_get_tableid(p_dit);
+
+    if (psi_get_syntax(p_dit) || i_tid != DIT_TABLE_ID
+         || i_section_size < DIT_HEADER_SIZE)
+        return false;
+
+    return true;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si/dit_print.h

+/*****************************************************************************
+ * dit_print.h: ETSI EN 300 468 Discontinuity Information Table (DIT) (printing)
+ *****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+#ifndef __BITSTREAM_DVB_DIT_PRINT_H__
+#define __BITSTREAM_DVB_DIT_PRINT_H__
+
+#include <bitstream/common.h>
+#include <bitstream/dvb/si/dit.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Discontinuity Information Table
+ *****************************************************************************/
+static inline void dit_print(uint8_t *p_dit,
+                             f_print pf_print, void *print_opaque,
+                             f_iconv pf_iconv, void *iconv_opaque,
+                             print_type_t i_print_type)
+{
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(print_opaque, "<DIT transition_flag=\"%u\"/>",
+                 dit_get_transition_flag(p_dit));
+        break;
+    default:
+        pf_print(print_opaque, "new DIT transition_flag=%u",
+                 dit_get_transition_flag(p_dit));
+        pf_print(print_opaque, "end DIT");
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si_print.h

@@ -36,5 +36,6 @@
 #include <bitstream/dvb/si/tdt_print.h>
 #include <bitstream/dvb/si/tot_print.h>
 #include <bitstream/dvb/si/rst_print.h>
+#include <bitstream/dvb/si/dit_print.h>
 
 #endif

examples/dvb_print_si.c

@@ -651,6 +651,29 @@ static void handle_tot_section(uint16_t i_pid, uint8_t *p_tot)
     free(p_tot);
 }
 
+/*****************************************************************************
+ * handle_dit
+ *****************************************************************************/
+static void handle_dit_section(uint16_t i_pid, uint8_t *p_dit)
+{
+    if (i_pid != DIT_PID || !dit_validate(p_dit)) {
+        switch (i_print_type) {
+        case PRINT_XML:
+            printf("<ERROR type=\"invalid_dit_section\" pid=\"%hu\"/>\n",
+                   i_pid);
+            break;
+        default:
+            printf("invalid DIT section received on PID %hu\n", i_pid);
+        }
+        free(p_dit);
+        return;
+    }
+
+    dit_print(p_dit, print_wrapper, NULL, iconv_wrapper, NULL, i_print_type);
+
+    free(p_dit);
+}
+
 /*****************************************************************************
  * handle_rst
  *****************************************************************************/
@@ -730,6 +753,10 @@ static void handle_section(uint16_t i_pid, uint8_t *p_section)
         handle_rst_section(i_pid, p_section);
         break;
 
+    case DIT_TABLE_ID:
+        handle_dit_section(i_pid, p_section);
+        break;
+
     default:
         if (i_table_id == EIT_TABLE_ID_PF_ACTUAL ||
            (i_table_id >= EIT_TABLE_ID_SCHED_ACTUAL_FIRST &&
@@ -831,6 +858,7 @@ int main(int i_argc, char **ppsz_argv)
     p_pids[EIT_PID].i_psi_refcount++;
     p_pids[TDT_PID].i_psi_refcount++;
     p_pids[RST_PID].i_psi_refcount++;
+    p_pids[DIT_PID].i_psi_refcount++;
 
     switch (i_print_type) {
     case PRINT_XML: