dvb/si: Complete support for TOT (Time offset table).

dvb/si/tot.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
@@ -60,6 +61,12 @@ static inline void tot_init(uint8_t *p_tot)
     p_tot[8] = 0xf0;
 }
 
+static inline void tot_set_length(uint8_t *p_tot, uint16_t i_tot_length)
+{
+    psi_set_length(p_tot, TOT_HEADER_SIZE + PSI_CRC_SIZE - PSI_HEADER_SIZE
+                    + i_tot_length);
+}
+
 static inline void tot_set_desclength(uint8_t *p_tot, uint16_t i_length)
 {
     p_tot[8] &= ~0xf;
@@ -72,6 +79,11 @@ static inline uint16_t tot_get_desclength(const uint8_t *p_tot)
     return ((p_tot[8] & 0xf) << 8) | p_tot[9];
 }
 
+static inline uint8_t *tot_get_descs(uint8_t *p_tot)
+{
+    return &p_tot[8];
+}
+
 static inline bool tot_validate(const uint8_t *p_tot)
 {
     uint16_t i_section_size = psi_get_length(p_tot) + PSI_HEADER_SIZE;

dvb/si/tot_print.h

+/*****************************************************************************
+ * tot_print.h: ETSI EN 300 468 Time Offset Table (TOT) (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_TOT_PRINT_H__
+#define __BITSTREAM_DVB_TOT_PRINT_H__
+
+#include <bitstream/common.h>
+#include <bitstream/mpeg/psi/descs_print.h>
+#include <bitstream/dvb/si/datetime.h>
+#include <bitstream/dvb/si/tot.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*****************************************************************************
+ * Time Offset Table
+ *****************************************************************************/
+static inline void tot_print(uint8_t *p_tot,
+                             f_print pf_print, void *print_opaque,
+                             f_iconv pf_iconv, void *iconv_opaque,
+                             print_type_t i_print_type)
+{
+    time_t ts;
+    char ts_str[24];
+
+    ts = dvb_time_format_UTC(tot_get_utc(p_tot), NULL, ts_str);
+
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(print_opaque, "<TOT time=\"%ld\" time_dec=\"%s\">",
+                 ts, ts_str);
+        break;
+    default:
+        pf_print(print_opaque, "new TOT time=%ld time_dec=\"%s\"",
+                 ts, ts_str);
+    }
+
+    descs_print(tot_get_descs(p_tot), pf_print, print_opaque,
+                pf_iconv, iconv_opaque, i_print_type);
+
+    switch (i_print_type) {
+    case PRINT_XML:
+        pf_print(print_opaque, "</TOT>");
+        break;
+    default:
+        pf_print(print_opaque, "end TOT");
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

dvb/si_print.h

@@ -33,5 +33,6 @@
 #include <bitstream/dvb/si/sdt_print.h>
 #include <bitstream/dvb/si/eit_print.h>
 #include <bitstream/dvb/si/tdt_print.h>
+#include <bitstream/dvb/si/tot_print.h>
 
 #endif

examples/dvb_print_si.c

@@ -570,6 +570,29 @@ static void handle_tdt_section(uint16_t i_pid, uint8_t *p_tdt)
     free(p_tdt);
 }
 
+/*****************************************************************************
+ * handle_tot
+ *****************************************************************************/
+static void handle_tot_section(uint16_t i_pid, uint8_t *p_tot)
+{
+    if (i_pid != TOT_PID || !tot_validate(p_tot)) {
+        switch (i_print_type) {
+        case PRINT_XML:
+            printf("<ERROR type=\"invalid_tot_section\" pid=\"%hu\"/>\n",
+                   i_pid);
+            break;
+        default:
+            printf("invalid TOT section received on PID %hu\n", i_pid);
+        }
+        free(p_tot);
+        return;
+    }
+
+    tot_print(p_tot, print_wrapper, NULL, iconv_wrapper, NULL, i_print_type);
+
+    free(p_tot);
+}
+
 /*****************************************************************************
  * handle_section
  *****************************************************************************/
@@ -614,6 +637,10 @@ static void handle_section(uint16_t i_pid, uint8_t *p_section)
         handle_tdt_section(i_pid, p_section);
         break;
 
+    case TOT_TABLE_ID:
+        handle_tot_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 &&