add support for parsing ETT (Extended Text Table)

Signed-off-by: Adam Charrett <adam@dvbstreamer.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>

src/Makefile.am

@@ -19,6 +19,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
 		     tables/bat.h \
 		     tables/atsc_vct.h tables/atsc_stt.h \
 		     tables/atsc_eit.h tables/atsc_mgt.h \
+		     tables/atsc_ett.h \
                      descriptors/dr_02.h \
                      descriptors/dr_03.h \
                      descriptors/dr_04.h \
@@ -108,5 +109,6 @@ tables_src = tables/pat.c tables/pat_private.h \
 	     tables/atsc_vct.c tables/atsc_vct.h \
 	     tables/atsc_stt.c tables/atsc_stt.h \
 	     tables/atsc_eit.c tables/atsc_eit.h \
+	     tables/atsc_ett.c tables/atsc_ett.h \
 	     tables/atsc_mgt.c tables/atsc_mgt.h
 

src/tables/atsc_ett.c

+/*
+Copyright (C) 2006  Adam Charrett
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+atsc_ett.c
+
+Decode PSIP Extended Text Table.
+
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "dvbpsi.h"
+#include "psi.h"
+#include "descriptor.h"
+#include "atsc_ett.h"
+
+/*****************************************************************************
+ * dvbpsi_atsc_ett_etm_id_s
+ *****************************************************************************
+ * ETM Version information.
+ *****************************************************************************/
+
+typedef struct dvbpsi_atsc_ett_etm_version_s
+{
+    uint32_t i_etm_id;
+    uint8_t  i_version;
+    struct dvbpsi_atsc_ett_etm_version_s *p_next;
+}dvbpsi_atsc_ett_etm_version_t;
+
+/*****************************************************************************
+ * dvbpsi_atsc_ett_decoder_s
+ *****************************************************************************
+ * ETT decoder.
+ *****************************************************************************/
+typedef struct dvbpsi_atsc_ett_decoder_s
+{
+  dvbpsi_atsc_ett_callback      pf_callback;
+  void *                        p_cb_data;
+  dvbpsi_atsc_ett_etm_version_t * p_etm_versions;
+} dvbpsi_atsc_ett_decoder_t;
+
+/*****************************************************************************
+ * dvbpsi_atsc_GatherETTSections
+ *****************************************************************************
+ * Callback for the PSI decoder.
+ *****************************************************************************/
+void dvbpsi_atsc_GatherETTSections(dvbpsi_decoder_t* p_decoder,
+                              dvbpsi_psi_section_t* p_section);
+/*****************************************************************************
+ * dvbpsi_atsc_DecodeETTSection
+ *****************************************************************************
+ * TDT decoder.
+ *****************************************************************************/
+void dvbpsi_atsc_DecodeETTSection(dvbpsi_atsc_ett_t* p_ett,
+                             dvbpsi_psi_section_t* p_section);
+
+/*****************************************************************************
+ * dvbpsi_atsc_AttachETT
+ *****************************************************************************
+ * Initialize a ETT decoder and return a handle on it.
+ *****************************************************************************/
+dvbpsi_handle dvbpsi_atsc_AttachETT(dvbpsi_atsc_ett_callback pf_callback, void* p_cb_data)
+{
+  dvbpsi_handle h_dvbpsi = (dvbpsi_decoder_t*)malloc(sizeof(dvbpsi_decoder_t));
+  dvbpsi_atsc_ett_decoder_t* p_ett_decoder;
+
+  if(h_dvbpsi == NULL)
+    return NULL;
+
+  p_ett_decoder = (dvbpsi_atsc_ett_decoder_t*)malloc(sizeof(dvbpsi_atsc_ett_decoder_t));
+
+  if(p_ett_decoder == NULL)
+  {
+    free(h_dvbpsi);
+    return NULL;
+  }
+
+  /* PSI decoder configuration */
+  h_dvbpsi->pf_callback = &dvbpsi_atsc_GatherETTSections;
+  h_dvbpsi->p_private_decoder = p_ett_decoder;
+  h_dvbpsi->i_section_max_size = 4096;
+  /* PSI decoder initial state */
+  h_dvbpsi->i_continuity_counter = 31;
+  h_dvbpsi->b_discontinuity = 1;
+  h_dvbpsi->p_current_section = NULL;
+
+  /* ETT decoder information */
+  p_ett_decoder->pf_callback = pf_callback;
+  p_ett_decoder->p_cb_data = p_cb_data;
+  p_ett_decoder->p_etm_versions = NULL;
+
+  return h_dvbpsi;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_DetachETT
+ *****************************************************************************
+ * Close a ETT decoder. The handle isn't valid any more.
+ *****************************************************************************/
+void dvbpsi_atsc_DetachETT(dvbpsi_handle h_dvbpsi)
+{
+  dvbpsi_atsc_ett_decoder_t* p_ett_decoder
+                    = (dvbpsi_atsc_ett_decoder_t*)h_dvbpsi->p_private_decoder;
+  dvbpsi_atsc_ett_etm_version_t *p_etm_version, *p_next;
+  for (p_etm_version = p_ett_decoder->p_etm_versions; p_etm_version; p_etm_version = p_next)
+  {
+    p_next = p_etm_version->p_next;
+    free(p_etm_version);
+  }
+
+  free(h_dvbpsi->p_private_decoder);
+  if(h_dvbpsi->p_current_section)
+    dvbpsi_DeletePSISections(h_dvbpsi->p_current_section);
+  free(h_dvbpsi);
+}
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_InitETT
+ *****************************************************************************
+ * Initialize a pre-allocated dvbpsi_ett_t structure.
+ *****************************************************************************/
+void dvbpsi_atsc_InitETT(dvbpsi_atsc_ett_t *p_ett,
+                            uint8_t i_version,
+                            int b_current_next,
+                            uint8_t i_protocol,
+                            uint16_t i_ett_table_id,
+                            uint32_t i_etm_id)
+{
+    p_ett->i_version = i_version;
+    p_ett->b_current_next = b_current_next;
+    p_ett->i_protocol = i_protocol;
+    p_ett->i_ett_table_id = i_ett_table_id;
+    p_ett->i_etm_id = i_etm_id;
+}
+
+/*****************************************************************************
+ * dvbpsi_atsc_EmptyETT
+ *****************************************************************************
+ * Clean a dvbpsi_atsc_ett_t structure.
+ *****************************************************************************/
+void dvbpsi_atsc_EmptyETT(dvbpsi_atsc_ett_t *p_ett)
+{
+    if (p_ett->p_etm)
+    {
+        free(p_ett->p_etm);
+        p_ett->p_etm = NULL;
+        p_ett->i_etm_length = 0;
+    }
+}
+
+#ifndef TRUE
+#define TRUE (1 == 1)
+#endif /* TRUE */
+#ifndef FALSE
+#define FALSE (0 == 1)
+#endif /* FALSE */
+
+/*****************************************************************************
+ * dvbpsi_atsc_GatherETTSections
+ *****************************************************************************
+ * Callback for the PSI decoder.
+ *****************************************************************************/
+void dvbpsi_atsc_GatherETTSections(dvbpsi_decoder_t* p_decoder,
+                              dvbpsi_psi_section_t* p_section)
+{
+  dvbpsi_atsc_ett_decoder_t* p_ett_decoder
+                        = (dvbpsi_atsc_ett_decoder_t*)p_decoder->p_private_decoder;
+
+  if(p_section->i_table_id == 0xCC)
+  {
+    dvbpsi_atsc_ett_t* p_ett;
+    dvbpsi_atsc_ett_etm_version_t *p_etm_version;
+    int b_found = FALSE;
+    uint32_t i_etm_id = ((uint32_t)p_section->p_payload_start[1] << 24) |
+                        ((uint32_t)p_section->p_payload_start[2] << 16) |
+                        ((uint32_t)p_section->p_payload_start[3] << 8)  |
+                        ((uint32_t)p_section->p_payload_start[4] << 0);
+
+    for (p_etm_version = p_ett_decoder->p_etm_versions; p_etm_version; p_etm_version=p_etm_version->p_next)
+    {
+        if (p_etm_version->i_etm_id == i_etm_id)
+        {
+            b_found = TRUE;
+            break;
+        }
+    }
+    if (!b_found || (p_etm_version->i_version != p_section->i_version))
+    {
+        dvbpsi_atsc_NewETT(p_ett, p_section->i_version,
+                         p_section->b_current_next,
+                         p_section->p_payload_start[0],
+                         p_section->i_extension,
+                         i_etm_id
+                         );
+        dvbpsi_atsc_DecodeETTSection(p_ett, p_section);
+        p_ett_decoder->pf_callback(p_ett_decoder->p_cb_data, p_ett);
+    }
+    if (!b_found)
+    {
+        p_etm_version = malloc(sizeof(dvbpsi_atsc_ett_etm_version_t));
+        p_etm_version->i_etm_id = i_etm_id;
+        p_etm_version->p_next = p_ett_decoder->p_etm_versions;
+        p_ett_decoder->p_etm_versions = p_etm_version;
+    }
+    p_etm_version->i_version = p_section->i_version;
+  }
+
+  dvbpsi_DeletePSISections(p_section);
+}
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_DecodeETTSection
+ *****************************************************************************
+ * ETT decoder.
+ *****************************************************************************/
+void dvbpsi_atsc_DecodeETTSection(dvbpsi_atsc_ett_t* p_ett,
+                             dvbpsi_psi_section_t* p_section)
+{
+    uint16_t i_etm_length = p_section->i_length - 14;
+    uint8_t *p_etm = malloc(i_etm_length);
+    if (p_etm)
+    {
+        memcpy(p_etm, p_section->p_payload_start + 5, i_etm_length);
+        p_ett->p_etm = p_etm;
+        p_ett->i_etm_length = i_etm_length;
+    }
+}

src/tables/atsc_ett.h

+/*
+Copyright (C) 2006  Adam Charrett
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+ett.h
+
+Decode PSIP Extended Text Table.
+
+*/
+#ifndef _ATSC_ETT_H
+#define _ATSC_ETT_H 
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_ett_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_atsc_ett_s
+ * \brief ETT structure.
+ *
+ * This structure is used to store a decoded ETT.
+ */
+/*!
+ * \typedef struct dvbpsi_atsc_ett_s dvbpsi_atsc_ett_t
+ * \brief dvbpsi_atsc_ett_t type definition.
+ */
+typedef struct dvbpsi_atsc_ett_s
+{
+    uint8_t                 i_version;          /*!< version_number */
+    int                     b_current_next;     /*!< current_next_indicator */
+    uint8_t                 i_protocol;         /*!< PSIP Protocol version */
+    uint16_t                i_ett_table_id;     /*!< ETT Table ID extension, normally 0x0000 */
+    uint32_t                i_etm_id;           /*!< ETM Identifier, made up of source id and event id (or 0 for channel ETT) */
+    uint16_t                i_etm_length;
+    uint8_t*                p_etm;
+} dvbpsi_atsc_ett_t;
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_ett_callback
+ *****************************************************************************/
+/*!
+ * \typedef void (* dvbpsi_atsc_ett_callback)(void* p_cb_data,
+                                         dvbpsi_atsc_ett_t* p_new_ett)
+ * \brief Callback type definition.
+ */
+typedef void (* dvbpsi_atsc_ett_callback)(void* p_cb_data, dvbpsi_atsc_ett_t* p_new_ett);
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_AttachETT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_atsc_AttachETT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
+            dvbpsi_atsc_ett_callback pf_callback, void* p_cb_data)
+ *
+ * \brief Creation and initialization of a ETT decoder.
+ * \param pf_callback function to call back on new ETT.
+ * \param p_cb_data private data given in argument to the callback.
+ * \return 0 if everything went ok.
+ */
+dvbpsi_handle dvbpsi_atsc_AttachETT(dvbpsi_atsc_ett_callback pf_callback, void* p_cb_data);
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_DetachETT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_atsc_DetachETT(dvbpsi_demux_t * p_demux, uint8_t i_table_id)
+ *
+ * \brief Destroy a ETT decoder.
+ * \param p_demux Subtable demultiplexor to which the decoder is attached.
+ * \param i_table_id Table ID, 0xCD.
+ * \param i_extension Table extension, ignored as this should always be 0.
+ *                    (Required to match prototype for demux)
+ * \return nothing.
+ */
+void dvbpsi_atsc_DetachETT(dvbpsi_handle h_dvbpsi);
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_InitETT/dvbpsi_atsc_NewETT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_atsc_InitETT(dvbpsi_atsc_ett_t* p_ett, uint8_t i_version, 
+        int b_current_next, uint8_t i_protocol)
+ * \brief Initialize a user-allocated dvbpsi_atsc_ett_t structure.
+ * \param p_ett pointer to the ETT structure
+ * \param i_version version
+ * \param b_current_next current next indicator
+ * \param i_protocol PSIP Protocol version.
+ * \param i_ett_table_id Table ID (Normally 0x0000)
+ * \param i_etm_id ETM Identifier.
+ * \return nothing.
+ */
+void dvbpsi_atsc_InitETT(dvbpsi_atsc_ett_t *p_ett, uint8_t i_version, int b_current_next, uint8_t i_protocol, uint16_t i_ett_table_id, uint32_t i_etm_id);
+
+/*!
+ * \def dvbpsi_NewETT(p_ett, i_network_id, i_version, b_current_next)
+ * \brief Allocate and initialize a new dvbpsi_atsc_ett_t structure. Use ObjectRefDec to delete it.
+ * \param p_ett pointer to the ETT structure
+ * \param i_protocol PSIP Protocol version.
+ * \param i_ett_table_id Table ID (Normally 0x0000)
+ * \param i_etm_id ETM Identifier.
+ * \return nothing.
+ */
+#define dvbpsi_atsc_NewETT(p_ett, i_version, b_current_next, i_protocol, i_ett_table_id, i_etm_id)  \
+do {                                                                     \
+  p_ett = (dvbpsi_atsc_ett_t*)malloc(sizeof(dvbpsi_atsc_ett_t));         \
+  if(p_ett != NULL)                                                      \
+    dvbpsi_atsc_InitETT(p_ett, i_version, b_current_next, i_protocol, i_ett_table_id, i_etm_id);   \
+} while(0);
+
+
+/*****************************************************************************
+ * dvbpsi_atsc_EmptyETT/dvbpsi_atsc_DeleteETT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_atsc_EmptyETT(dvbpsi_atsc_ett_t* p_ett)
+ * \brief Clean a dvbpsi_atsc_ett_t structure.
+ * \param p_ett pointer to the ETT structure
+ * \return nothing.
+ */
+void dvbpsi_atsc_EmptyETT(dvbpsi_atsc_ett_t *p_ett);
+
+/*!
+ * \def dvbpsi_atsc_DeleteETT(p_ett)
+ * \brief Clean and free a dvbpsi_atsc_ett_t structure.
+ * \param p_ett pointer to the ETT structure
+ * \return nothing.
+ */
+#define dvbpsi_atsc_DeleteETT(p_ett)					\
+  do {									\
+    dvbpsi_atsc_EmptyETT(p_ett);					\
+    free(p_ett);							\
+  } while(0);
+
+#endif