From 86724a2a8cbd31ede16e1e5711afc1ef0ddfa6f5 Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Mon, 10 Oct 2011 15:24:02 +0300
Subject: [PATCH] mpeg/psi: Complete support for CAT (Conditional Access
 Table).

- Set reserved bits to 1 in cat_init().
- Add cat_set_desclength()
- Add support for CAT in examples/dvb_print_si.
---
 examples/dvb_print_si.c | 66 +++++++++++++++++++++++++++++++++++++++++
 mpeg/psi/cat.h          |  6 ++++
 2 files changed, 72 insertions(+)

diff --git a/examples/dvb_print_si.c b/examples/dvb_print_si.c
index ab5b3d5..c3c11bf 100644
--- a/examples/dvb_print_si.c
+++ b/examples/dvb_print_si.c
@@ -67,6 +67,8 @@ static int i_nb_sids = 0;
 
 static PSI_TABLE_DECLARE(pp_current_pat_sections);
 static PSI_TABLE_DECLARE(pp_next_pat_sections);
+static PSI_TABLE_DECLARE(pp_current_cat_sections);
+static PSI_TABLE_DECLARE(pp_next_cat_sections);
 static PSI_TABLE_DECLARE(pp_current_nit_sections);
 static PSI_TABLE_DECLARE(pp_next_nit_sections);
 static PSI_TABLE_DECLARE(pp_current_sdt_sections);
@@ -280,6 +282,65 @@ static void handle_pat_section(uint16_t i_pid, uint8_t *p_section)
     handle_pat();
 }
 
+/*****************************************************************************
+ * handle_cat
+ *****************************************************************************/
+static void handle_cat(void)
+{
+    PSI_TABLE_DECLARE(pp_old_cat_sections);
+
+    if (psi_table_validate(pp_current_cat_sections) &&
+        psi_table_compare(pp_current_cat_sections, pp_next_cat_sections)) {
+        /* Identical CAT. Shortcut. */
+        psi_table_free(pp_next_cat_sections);
+        psi_table_init(pp_next_cat_sections);
+        return;
+    }
+
+    if (!cat_table_validate(pp_next_cat_sections)) {
+        switch (i_print_type) {
+        case PRINT_XML:
+            printf("<ERROR type=\"invalid_cat\"/>\n");
+            break;
+        default:
+            printf("invalid CAT received\n");
+        }
+        psi_table_free(pp_next_cat_sections);
+        psi_table_init(pp_next_cat_sections);
+        return;
+    }
+
+    /* Switch tables. */
+    psi_table_copy(pp_old_cat_sections, pp_current_cat_sections);
+    psi_table_copy(pp_current_cat_sections, pp_next_cat_sections);
+    psi_table_init(pp_next_cat_sections);
+
+    if (psi_table_validate(pp_old_cat_sections))
+        psi_table_free(pp_old_cat_sections);
+
+    cat_table_print(pp_current_cat_sections, print_wrapper, NULL, i_print_type);
+}
+
+static void handle_cat_section(uint16_t i_pid, uint8_t *p_section)
+{
+    if (i_pid != CAT_PID || !cat_validate(p_section)) {
+        switch (i_print_type) {
+        case PRINT_XML:
+            printf("<ERROR type=\"invalid_cat_section\"/>\n");
+            break;
+        default:
+            printf("invalid CAT section received on PID %hu\n", i_pid);
+        }
+        free(p_section);
+        return;
+    }
+
+    if (!psi_table_section(pp_next_cat_sections, p_section))
+        return;
+
+    handle_cat();
+}
+
 /*****************************************************************************
  * handle_pmt
  *****************************************************************************/
@@ -508,6 +569,10 @@ static void handle_section(uint16_t i_pid, uint8_t *p_section)
         handle_pat_section(i_pid, p_section);
         break;
 
+    case CAT_TABLE_ID:
+        handle_cat_section(i_pid, p_section);
+        break;
+
     case PMT_TABLE_ID:
         handle_pmt(i_pid, p_section);
         break;
@@ -614,6 +679,7 @@ int main(int i_argc, char **ppsz_argv)
     }
 
     p_pids[PAT_PID].i_psi_refcount++;
+    p_pids[CAT_PID].i_psi_refcount++;
     p_pids[NIT_PID].i_psi_refcount++;
     p_pids[SDT_PID].i_psi_refcount++;
     p_pids[EIT_PID].i_psi_refcount++;
diff --git a/mpeg/psi/cat.h b/mpeg/psi/cat.h
index 18020e1..50c59e8 100644
--- a/mpeg/psi/cat.h
+++ b/mpeg/psi/cat.h
@@ -54,6 +54,7 @@ static inline void cat_init(uint8_t *p_cat)
     psi_init(p_cat, true);
     psi_set_tableid(p_cat, CAT_TABLE_ID);
     p_cat[1] &= ~0x40;
+    psi_set_tableidext(p_cat, 0xffff);
     psi_set_section(p_cat, 0);
     psi_set_lastsection(p_cat, 0);
 }
@@ -69,6 +70,11 @@ static inline uint16_t cat_get_desclength(const uint8_t *p_cat)
     return psi_get_length(p_cat) - (CAT_HEADER_SIZE + PSI_CRC_SIZE - PSI_HEADER_SIZE);
 }
 
+static inline void cat_set_desclength(uint8_t *p_cat, uint16_t i_desc_len)
+{
+    cat_set_length(p_cat, i_desc_len);
+}
+
 static inline uint8_t *cat_get_descl(uint8_t *p_cat)
 {
     return p_cat + CAT_HEADER_SIZE;