* src/demux.*: DVB PSI tables demux, required since one PID channel

    may contain different tables.
  * src/tables/sdt*: SDT decoder (no generator yet)
  * examples/decode_sdt.c: added SDT decoder example

examples/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
-noinst_PROGRAMS = decode_pat decode_pmt
+noinst_PROGRAMS = decode_pat decode_pmt decode_sdt
 
 decode_pat_SOURCES = decode_pat.c
 decode_pat_LDFLAGS = -L../src -ldvbpsi
@@ -8,3 +8,6 @@ decode_pat_LDFLAGS = -L../src -ldvbpsi
 decode_pmt_SOURCES = decode_pmt.c
 decode_pmt_LDFLAGS = -L../src -ldvbpsi
 
+decode_sdt_SOURCES = decode_sdt.c
+decode_sdt_LDFLAGS = -L../src -ldvbpsi
+

examples/decode_sdt.c

+/*****************************************************************************
+ * decode_sdt.c: SDT decoder example
+ *----------------------------------------------------------------------------
+ * (c)2001-2002 VideoLAN
+ * $Id: decode_sdt.c,v 1.1 2002/12/11 13:04:56 jobi Exp $
+ *
+ * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
+ *          Johan Bilien <jobi@via.ecp.fr>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *----------------------------------------------------------------------------
+ *
+ *****************************************************************************/
+
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
+/* The libdvbpsi distribution defines DVBPSI_DIST */
+#ifdef DVBPSI_DIST
+#include "../src/dvbpsi.h"
+#include "../src/psi.h"
+#include "../src/demux.h"
+#include "../src/descriptor.h"
+#include "../src/tables/sdt.h"
+#else
+#include <dvbpsi/dvbpsi.h>
+#include <dvbpsi/psi.h>
+#include <dvbpsi/demux.h>
+#include <dvbpsi/descriptor.h>
+#include <dvbpsi/sdt.h>
+#endif
+
+
+/*****************************************************************************
+ * ReadPacket
+ *****************************************************************************/
+int ReadPacket(int i_fd, uint8_t* p_dst)
+{
+  int i = 187;
+  int i_rc = 1;
+
+  p_dst[0] = 0;
+
+  while((p_dst[0] != 0x47) && (i_rc > 0))
+  {
+    i_rc = read(i_fd, p_dst, 1);
+  }
+
+  while((i != 0) && (i_rc > 0))
+  {
+    i_rc = read(i_fd, p_dst + 188 - i, i);
+    if(i_rc >= 0)
+      i -= i_rc;
+  }
+
+  return (i == 0) ? 1 : 0;
+}
+
+
+/*****************************************************************************
+ * DumpDescriptors
+ *****************************************************************************/
+void DumpDescriptors(const char* str, dvbpsi_descriptor_t* p_descriptor)
+{
+  while(p_descriptor)
+  {
+    int i;
+    printf("%s 0x%02x : \"", str, p_descriptor->i_tag);
+    for(i = 0; i < p_descriptor->i_length; i++)
+      printf("%c", p_descriptor->p_data[i]);
+    printf("\"\n");
+    p_descriptor = p_descriptor->p_next;
+  }
+};
+
+
+/*****************************************************************************
+ * DumpSDT
+ *****************************************************************************/
+void DumpSDT(void* p_zero, dvbpsi_sdt_t* p_sdt)
+{
+  dvbpsi_sdt_service_t* p_service = p_sdt->p_first_service;
+  printf(  "\n");
+  printf(  "New active SDT\n");
+  printf(  "  ts_id : %d\n",
+         p_sdt->i_ts_id);
+  printf(  "  version_number : %d\n",
+         p_sdt->i_version);
+  printf(  "  network_id        : %d\n",
+         p_sdt->i_network_id);
+  printf(  "    | service_id \n");
+  while(p_service)
+  {
+    printf("    | 0x%02x \n",
+           p_service->i_service_id);
+    DumpDescriptors("    |  ]", p_service->p_first_descriptor);
+    p_service = p_service->p_next;
+  }
+  dvbpsi_DeleteSDT(p_sdt);
+}
+
+/*****************************************************************************
+ * NewSubtable
+ *****************************************************************************/
+void NewSubtable(void * p_zero, dvbpsi_handle h_dvbpsi,
+                 uint8_t i_table_id, uint16_t i_extension)
+{
+  if(i_table_id == 0x42)
+  {
+    dvbpsi_AttachSDT(h_dvbpsi, i_table_id, i_extension, DumpSDT, NULL);
+  }
+}
+
+/*****************************************************************************
+ * main
+ *****************************************************************************/
+int main(int i_argc, char* pa_argv[])
+{
+  int i_fd;
+  uint8_t data[188];
+  dvbpsi_handle h_dvbpsi;
+  int b_ok;
+
+  if(i_argc != 2)
+    return 1;
+
+  i_fd = open(pa_argv[1], 0);
+
+  h_dvbpsi = dvbpsi_AttachDemux(NewSubtable, NULL);
+
+  b_ok = ReadPacket(i_fd, data);
+
+  while(b_ok)
+  {
+    uint16_t i_pid = ((uint16_t)(data[1] & 0x1f) << 8) + data[2];
+    if(i_pid == 0x11)
+      dvbpsi_PushPacket(h_dvbpsi, data);
+    b_ok = ReadPacket(i_fd, data);
+  }
+
+  dvbpsi_DetachDemux(h_dvbpsi);
+
+  return 0;
+}
+

src/Makefile.am

@@ -6,13 +6,14 @@ lib_LTLIBRARIES = libdvbpsi.la
 
 libdvbpsi_la_SOURCES = dvbpsi.c dvbpsi_private.h \
                        psi.c \
+		       demux.c \
                        descriptor.c \
                        $(tables_src) \
                        $(descriptors_src)
 
 libdvbpsi_la_LDFLAGS = -version-info 1:1:0
 
-pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h tables/pat.h tables/pmt.h \
+pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h tables/pat.h tables/pmt.h tables/sdt.h \
                      descriptors/dr_02.h \
                      descriptors/dr_03.h \
                      descriptors/dr_04.h \
@@ -45,5 +46,6 @@ descriptors_src = descriptors/dr_02.c \
                   descriptors/dr_0f.c
 
 tables_src = tables/pat.c tables/pat_private.h \
-             tables/pmt.c tables/pmt_private.h
+             tables/pmt.c tables/pmt_private.h \
+	     tables/sdt.c tables/sdt_private.h
 

src/demux.c

+/*****************************************************************************
+ * demux.c: DVB subtables demux functions.
+ *----------------------------------------------------------------------------
+ * (c)2001-2002 VideoLAN
+ * $Id: demux.c,v 1.1 2002/12/11 13:04:56 jobi Exp $
+ *
+ * Authors: Johan Bilien <jobi@via.ecp.fr>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *----------------------------------------------------------------------------
+ *
+ *****************************************************************************/
+
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
+#include "dvbpsi.h"
+#include "dvbpsi_private.h"
+#include "psi.h"
+#include "demux.h"
+
+/*****************************************************************************
+ * dvbpsi_AttachDemux
+ *****************************************************************************
+ * Creation of the demux structure
+ *****************************************************************************/
+dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,
+                                   void *                p_new_cb_data)
+{
+  dvbpsi_handle h_dvbpsi = (dvbpsi_decoder_t*)malloc(sizeof(dvbpsi_decoder_t));
+  dvbpsi_demux_t * p_demux;
+
+  if(h_dvbpsi == NULL)
+    return NULL;
+
+  p_demux = (dvbpsi_demux_t*)malloc(sizeof(dvbpsi_demux_t));
+
+  if(p_demux == NULL)
+  {
+    free(h_dvbpsi);
+    return NULL;
+  }
+
+  /* PSI decoder configuration */
+  h_dvbpsi->pf_callback = &dvbpsi_Demux;
+  h_dvbpsi->p_private_decoder = p_demux;
+  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;
+
+  /* Sutables demux configuration */
+  p_demux->p_decoder = h_dvbpsi;
+  p_demux->p_first_subdec = NULL;
+  p_demux->pf_new_callback = pf_new_cb;
+  p_demux->p_new_cb_data = p_new_cb_data;
+
+  return h_dvbpsi;
+}
+
+/*****************************************************************************
+ * dvbpsi_demuxGetSubDec
+ *****************************************************************************
+ * Finds a subtable decoder given the table id and extension
+ *****************************************************************************/
+dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,
+                                              uint8_t i_table_id,
+                                              uint16_t i_extension)
+{
+  uint32_t i_id = (uint32_t)i_table_id << 16 |(uint32_t)i_extension;
+  dvbpsi_demux_subdec_t * p_subdec = p_demux->p_first_subdec;
+
+  while(p_subdec)
+  {
+    if(p_subdec->i_id == i_id)
+      break;
+
+    p_subdec = p_subdec->p_next;
+  }
+
+  return p_subdec;
+}
+
+/*****************************************************************************
+ * dvbpsi_Demux
+ *****************************************************************************
+ * Sends a PSI section to the right subtable decoder
+ *****************************************************************************/
+void dvbpsi_Demux(dvbpsi_handle p_decoder, dvbpsi_psi_section_t * p_section)
+{
+  dvbpsi_demux_t * p_demux;
+  dvbpsi_demux_subdec_t * p_subdec;
+
+  p_demux = (dvbpsi_demux_t *)p_decoder->p_private_decoder;
+
+
+  p_subdec = dvbpsi_demuxGetSubDec(p_demux, p_section->i_table_id,
+      p_section->i_extension);
+
+  if(p_subdec == NULL)
+  {
+    /* Tell the application we found a new subtable, so that it may attach a
+     * subtable decoder */
+    p_demux->pf_new_callback(p_demux->p_new_cb_data, p_decoder,
+                 p_section->i_table_id,
+                  p_section->i_extension);
+    /* Check if a new subtable decoder is available */
+    p_subdec = dvbpsi_demuxGetSubDec(p_demux, p_section->i_table_id,
+      p_section->i_extension);
+  }
+
+  if(p_subdec)
+  {
+    p_subdec->pf_callback(p_demux->p_decoder, p_subdec->p_cb_data, p_section);
+  }
+}
+
+/*****************************************************************************
+ * dvbpsi_DetachDemux
+ *****************************************************************************
+ * Destroys a demux structure
+ *****************************************************************************/
+void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi)
+{
+  dvbpsi_demux_t* p_demux
+                  = (dvbpsi_demux_t*)h_dvbpsi->p_private_decoder;
+  dvbpsi_demux_subdec_t* p_subdec
+                  = p_demux->p_first_subdec;
+  dvbpsi_demux_subdec_t* p_subdec_temp;
+
+  while(p_subdec)
+  {
+    p_subdec_temp = p_subdec;
+    p_subdec = p_subdec->p_next;
+    free(p_subdec_temp);
+  }
+
+  free(p_demux);
+  free(h_dvbpsi);
+}

src/demux.h

+/*****************************************************************************
+ * demux.h
+ * (c)2001-2002 VideoLAN
+ * $Id: demux.h,v 1.1 2002/12/11 13:04:56 jobi Exp $
+ *
+ * Authors: Johan Bilien <jobi@via.ecp.fr>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *****************************************************************************/
+
+/*!
+ * \file <demux.h>
+ * \author Johan Bilien <jobi@via.ecp.fr>
+ * \brief Subtable demutiplexor.
+ *
+ * Subtable demultiplexor structure
+ */
+
+#ifndef _DVBPSI_DEMUX_H_
+#define _DVBPSI_DEMUX_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*****************************************************************************
+ * dvbpsi_demux_new_cb_t
+ *****************************************************************************/
+/*!
+ * \typedef void(* dvbpsi_demux_new_cb_t) (void *   p_cb_data,
+                                           dvbpsi_handle h_dvbpsi,
+                                           uint8_t  i_table_id,
+                                           uint16_t i_extension);
+ * \brief Callback used in case of a new subtable detected.
+ */
+typedef void (*dvbpsi_demux_new_cb_t) (void *   p_cb_data,
+                                       dvbpsi_handle h_dvbpsi,
+                                       uint8_t  i_table_id,
+                                       uint16_t i_extension);
+
+/*****************************************************************************
+ * dvbpsi_demux_subdec_cb_t
+ *****************************************************************************/
+/*!
+ * \typedef void (*dvbpsi_demux_subdec_cb_t)
+                    (dvbpsi_decoder_t*     p_psi_decoder,
+                     void*                 p_private_decoder,
+                     dvbpsi_psi_section_t* p_section);
+ * \brief Subtable specific decoder.
+ */
+typedef void (*dvbpsi_demux_subdec_cb_t)
+                     (dvbpsi_decoder_t*     p_psi_decoder,
+                      void*                 p_private_decoder,
+                      dvbpsi_psi_section_t* p_section);
+
+/*****************************************************************************
+ * dvbpsi_demux_subdec_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_demux_subdec_s
+ * \brief Subtable decoder structure
+ *
+ * This structure contains the data specific to the decoding of one
+ * subtable.
+ */
+/*!
+ * \typedef struct dvbpsi_demux_subdec_s dvbpsi_demux_subdec_t
+ * \brief dvbpsi_demux_subdec_t type definition.
+ */
+typedef struct dvbpsi_demux_subdec_s
+{
+  uint32_t                        i_id;
+  dvbpsi_demux_subdec_cb_t        pf_callback;
+  void *                          p_cb_data;
+  struct dvbpsi_demux_subdec_s *    p_next;
+
+} dvbpsi_demux_subdec_t;
+
+/*****************************************************************************
+ * dvbpsi_demux_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_demux_s
+ * \brief subtable demultiplexor structure
+ *
+ * This structure contains the subtables demultiplexor data, such as the
+ * decoders and new subtable callback.
+ */
+/*!
+ * \typedef struct dvbpsi_demux_s dvbpsi_demux_t
+ * \brief dvbpsi_demux_t type definition.
+ */
+typedef struct dvbpsi_demux_s
+{
+  dvbpsi_handle             p_decoder;          /*!< Parent PSI Decoder */
+  dvbpsi_demux_subdec_t *   p_first_subdec;     /*!< First subtable decoder */
+  /* New subtable callback */
+  dvbpsi_demux_new_cb_t     pf_new_callback;    /*!< New subtable callback */
+  void *                    p_new_cb_data;      /*!< Data provided to the
+                                                     previous callback */
+
+} dvbpsi_demux_t;
+
+
+/*****************************************************************************
+ * dvbpsi_AttachDemux
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_handle_t dvbpsi_NewPSISection(dvbpsi_demux_new_cb_t pf_new_cb, void * p_new_cb_data)
+ * \brief Creates a new demux structure.
+ * \param pf_new_cb A callcack called when a new type of subtable is found.
+ * \param p_new_cb_data Data given to the previous callback.
+ * \return a handle to the new demux structure.
+ */
+dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,
+                                 void *                p_new_cb_data);
+
+/*****************************************************************************
+ * dvbpsi_DetachDemux
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi)
+ * \brief Destroys a demux structure.
+ * \param h_dvbpsi The handle of the demux to be destroyed.
+ */
+
+void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi);
+
+/*****************************************************************************
+ * dvbpsi_demuxGetSubDec
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t *, uint8_t, uint16_t)
+ * \brief Looks for a subtable decoder, given the subtable ID.
+ * \param p_demux Pointer to the demux structure.
+ * \param i_table_id Table ID of the wanted subtable.
+ * \param i_extension Table ID extension of the wanted subtable.
+ * \return a pointer to the found subdecoder, or NULL.
+ *
+ */
+dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,
+                                              uint8_t          i_table_id,
+                                              uint16_t         i_extension);
+/*****************************************************************************
+ * dvbpsi_Demux
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,
+                         dvbpsi_psi_section_t * p_section)
+ * \brief Sends the PSI sections to the right subtable decoder according to their table ID and extension.
+ * \param h_dvbpsi PSI decoder handle.
+ * \param p_section PSI section.
+ */
+void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,
+                  dvbpsi_psi_section_t * p_section);
+
+#ifdef __cplusplus
+};
+#endif
+
+#else
+#error "Multiple inclusions of demux.h"
+#endif
+

src/tables/sdt.c

+/*****************************************************************************
+ * sdt.c: SDT decoder/generator
+ *----------------------------------------------------------------------------
+ * (c)2001-2002 VideoLAN
+ * $Id: sdt.c,v 1.1 2002/12/11 13:04:57 jobi Exp $
+ *
+ * Authors: Johan Bilien <jobi@via.ecp.fr>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *----------------------------------------------------------------------------
+ *
+ *****************************************************************************/
+
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+#endif
+
+#include "../dvbpsi.h"
+#include "../dvbpsi_private.h"
+#include "../psi.h"
+#include "../descriptor.h"
+#include "../demux.h"
+#include "sdt.h"
+#include "sdt_private.h"
+
+
+/*****************************************************************************
+ * dvbpsi_AttachSDT
+ *****************************************************************************
+ * Initialize a SDT subtable decoder.
+ *****************************************************************************/
+int dvbpsi_AttachSDT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
+          uint16_t i_extension, dvbpsi_sdt_callback pf_callback,
+                               void* p_cb_data)
+{
+  dvbpsi_demux_t* p_demux = (dvbpsi_demux_t*)p_psi_decoder->p_private_decoder;
+  dvbpsi_demux_subdec_t* p_subdec;
+  dvbpsi_sdt_decoder_t*  p_sdt_decoder;
+  unsigned int i;
+
+  if(dvbpsi_demuxGetSubDec(p_demux, i_table_id, i_extension))
+  {
+    DVBPSI_ERROR_ARG("SDT decoder",
+                     "Already a decoder for (table_id == 0x%02x,"
+                     "extension == 0x%02x)",
+                     i_table_id, i_extension);
+
+    return 1;
+  }
+
+  p_subdec = (dvbpsi_demux_subdec_t*)malloc(sizeof(dvbpsi_demux_subdec_t));
+  if(p_subdec == NULL)
+  {
+    return 1;
+  }
+
+  p_sdt_decoder = (dvbpsi_sdt_decoder_t*)malloc(sizeof(dvbpsi_sdt_decoder_t));
+
+  if(p_sdt_decoder == NULL)
+  {
+    free(p_subdec);
+    return 1;
+  }
+
+  /* subtable decoder configuration */
+  p_subdec->pf_callback = &dvbpsi_GatherSDTSections;
+  p_subdec->p_cb_data = p_sdt_decoder;
+  p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)i_extension;
+
+  /* Attach the subtable decoder to the demux */
+  p_subdec->p_next = p_demux->p_first_subdec;
+  p_demux->p_first_subdec = p_subdec;
+
+  /* SDT decoder information */
+  p_sdt_decoder->pf_callback = pf_callback;
+  p_sdt_decoder->p_cb_data = p_cb_data;
+  /* SDT decoder initial state */
+  p_sdt_decoder->b_current_valid = 0;
+  p_sdt_decoder->p_building_sdt = NULL;
+  for(i = 0; i <= 255; i++)
+    p_sdt_decoder->ap_sections[i] = NULL;
+
+  return 0;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_DetachSDT
+ *****************************************************************************
+ * Close a SDT decoder.
+ *****************************************************************************/
+void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
+          uint16_t i_extension)
+{
+  dvbpsi_demux_subdec_t* p_subdec;
+  dvbpsi_demux_subdec_t* p_next_subdec;
+  dvbpsi_sdt_decoder_t* p_sdt_decoder;
+
+  unsigned int i;
+
+  p_subdec = dvbpsi_demuxGetSubDec(p_demux, i_table_id, i_extension);
+
+  if(p_demux == NULL)
+  {
+    DVBPSI_ERROR_ARG("SDT Decoder",
+                     "No such SDT decoder (table_id == 0x%02x,"
+                     "extension == 0x%02x)",
+                     i_table_id, i_extension);
+    return;
+  }
+
+  p_next_subdec = p_subdec->p_next;
+
+  p_sdt_decoder = (dvbpsi_sdt_decoder_t*)p_subdec->p_cb_data;
+
+  free(p_sdt_decoder->p_building_sdt);
+
+  for(i = 0; i <= 255; i++)
+  {
+    if(p_sdt_decoder->ap_sections[i])
+      free(p_sdt_decoder->ap_sections[i]);
+  }
+
+  free(p_subdec->p_cb_data);
+  free(p_subdec);
+  p_subdec = p_next_subdec;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_InitSDT
+ *****************************************************************************
+ * Initialize a pre-allocated dvbpsi_sdt_t structure.
+ *****************************************************************************/
+void dvbpsi_InitSDT(dvbpsi_sdt_t* p_sdt, uint16_t i_ts_id, uint8_t i_version,
+                    int b_current_next, uint16_t i_network_id)
+{
+  p_sdt->i_ts_id = i_ts_id;
+  p_sdt->i_version = i_version;
+  p_sdt->b_current_next = b_current_next;
+  p_sdt->i_network_id = i_network_id;
+  p_sdt->p_first_service = NULL;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_EmptySDT
+ *****************************************************************************
+ * Clean a dvbpsi_sdt_t structure.
+ *****************************************************************************/
+void dvbpsi_EmptySDT(dvbpsi_sdt_t* p_sdt)
+{
+  dvbpsi_sdt_service_t* p_service = p_sdt->p_first_service;
+
+  while(p_service != NULL)
+  {
+    dvbpsi_sdt_service_t* p_tmp = p_service->p_next;
+    dvbpsi_DeleteDescriptors(p_service->p_first_descriptor);
+    free(p_service);
+    p_service = p_tmp;
+  }
+
+  p_sdt->p_first_service = NULL;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_SDTAddService
+ *****************************************************************************
+ * Add a service description at the end of the SDT.
+ *****************************************************************************/
+dvbpsi_sdt_service_t* dvbpsi_SDTAddService(dvbpsi_sdt_t* p_sdt,
+                                           uint16_t i_service_id,
+                                           int b_eit_schedule,
+                                           int b_eit_present,
+                                           uint8_t i_running_status,
+                                           int b_free_ca)
+{
+  dvbpsi_sdt_service_t* p_service
+                = (dvbpsi_sdt_service_t*)malloc(sizeof(dvbpsi_sdt_service_t));
+
+  if(p_service)
+  {
+    p_service->i_service_id = i_service_id;
+    p_service->b_eit_schedule = b_eit_schedule;
+    p_service->b_eit_present = b_eit_present;
+    p_service->i_running_status = i_running_status;
+    p_service->b_free_ca = b_free_ca;
+    p_service->p_next = NULL;
+
+    if(p_sdt->p_first_service == NULL)
+    {
+      p_sdt->p_first_service = p_service;
+    }
+    else
+    {
+      dvbpsi_sdt_service_t* p_last_service = p_sdt->p_first_service;
+      while(p_last_service->p_next != NULL)
+        p_last_service = p_last_service->p_next;
+      p_last_service->p_next = p_service;
+    }
+  }
+
+  return p_service;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_SDTServiceAddDescriptor
+ *****************************************************************************
+ * Add a descriptor in the SDT service description.
+ *****************************************************************************/
+dvbpsi_descriptor_t* dvbpsi_SDTServiceAddDescriptor(
+                                               dvbpsi_sdt_service_t* p_service,
+                                               uint8_t i_tag, uint8_t i_length,
+                                               uint8_t* p_data)
+{
+  dvbpsi_descriptor_t* p_descriptor
+                        = dvbpsi_NewDescriptor(i_tag, i_length, p_data);
+
+  if(p_descriptor)
+  {
+    if(p_service->p_first_descriptor == NULL)
+    {
+      p_service->p_first_descriptor = p_descriptor;
+    }
+    else
+    {
+      dvbpsi_descriptor_t* p_last_descriptor = p_service->p_first_descriptor;
+      while(p_last_descriptor->p_next != NULL)
+        p_last_descriptor = p_last_descriptor->p_next;
+      p_last_descriptor->p_next = p_descriptor;
+    }
+  }
+
+  return p_descriptor;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_GatherSDTSections
+ *****************************************************************************
+ * Callback for the subtable demultiplexor.
+ *****************************************************************************/
+void dvbpsi_GatherSDTSections(dvbpsi_decoder_t * p_psi_decoder,
+                              void * p_private_decoder,
+                              dvbpsi_psi_section_t * p_section)
+{
+  dvbpsi_sdt_decoder_t* p_sdt_decoder
+                        = (dvbpsi_sdt_decoder_t*)p_private_decoder;
+  int b_append = 1;
+  int b_reinit = 0;
+  unsigned int i;
+
+  DVBPSI_DEBUG_ARG("SDT decoder",
+                   "Table version %2d, " "i_table_id %2d, " "i_extension %5d, "
+                   "section %3d up to %3d, " "current %1d",
+                   p_section->i_version, p_section->i_table_id,
+                   p_section->i_extension,
+                   p_section->i_number, p_section->i_last_number,
+                   p_section->b_current_next);
+
+  if(!p_section->b_syntax_indicator)
+  {
+    /* Invalid section_syntax_indicator */
+    DVBPSI_ERROR("SDT decoder",
+                 "invalid section (section_syntax_indicator == 0)");
+    b_append = 0;
+  }
+
+  /* Now if b_append is true then we have a valid SDT section */
+  if(b_append)
+  {
+    /* TS discontinuity check */
+    if(p_psi_decoder->b_discontinuity)
+    {
+      b_reinit = 1;
+      p_psi_decoder->b_discontinuity = 0;
+    }
+    else
+    {
+      /* Perform a few sanity checks */
+      if(p_sdt_decoder->p_building_sdt)
+      {
+        if(p_sdt_decoder->p_building_sdt->i_ts_id != p_section->i_extension)
+        {
+          /* transport_stream_id */
+          DVBPSI_ERROR("SDT decoder",
+                       "'transport_stream_id' differs"
+                       " whereas no TS discontinuity has occured");
+          b_reinit = 1;
+        }
+        else if(p_sdt_decoder->p_building_sdt->i_version
+                                                != p_section->i_version)
+        {
+          /* version_number */
+          DVBPSI_ERROR("SDT decoder",
+                       "'version_number' differs"
+                       " whereas no discontinuity has occured");
+          b_reinit = 1;
+        }
+        else if(p_sdt_decoder->i_last_section_number !=
+                                                p_section->i_last_number)
+        {
+          /* last_section_number */
+          DVBPSI_ERROR("SDT decoder",
+                       "'last_section_number' differs"
+                       " whereas no discontinuity has occured");
+          b_reinit = 1;
+        }
+      }
+      else
+      {
+        if(    (p_sdt_decoder->b_current_valid)
+            && (p_sdt_decoder->current_sdt.i_version == p_section->i_version))
+        {
+          /* Signal a new SDT if the previous one wasn't active */
+          if(    (!p_sdt_decoder->current_sdt.b_current_next)
+              && (p_section->b_current_next))
+          {
+            dvbpsi_sdt_t* p_sdt = (dvbpsi_sdt_t*)malloc(sizeof(dvbpsi_sdt_t));
+
+            p_sdt_decoder->current_sdt.b_current_next = 1;
+            *p_sdt = p_sdt_decoder->current_sdt;
+            p_sdt_decoder->pf_callback(p_sdt_decoder->p_cb_data, p_sdt);
+          }
+
+          /* Don't decode since this version is already decoded */
+          b_append = 0;
+        }
+      }
+    }
+  }
+
+  /* Reinit the decoder if wanted */
+  if(b_reinit)
+  {
+    /* Force redecoding */
+    p_sdt_decoder->b_current_valid = 0;
+    /* Free structures */
+    if(p_sdt_decoder->p_building_sdt)
+    {
+      free(p_sdt_decoder->p_building_sdt);
+      p_sdt_decoder->p_building_sdt = NULL;
+    }
+    /* Clear the section array */
+    for(i = 0; i <= 255; i++)
+    {
+      if(p_sdt_decoder->ap_sections[i] != NULL)
+      {
+        dvbpsi_DeletePSISections(p_sdt_decoder->ap_sections[i]);
+        p_sdt_decoder->ap_sections[i] = NULL;
+      }
+    }
+  }
+
+  /* Append the section to the list if wanted */
+  if(b_append)
+  {
+    int b_complete;
+
+    /* Initialize the structures if it's the first section received */
+    if(!p_sdt_decoder->p_building_sdt)
+    {
+      p_sdt_decoder->p_building_sdt =
+                                (dvbpsi_sdt_t*)malloc(sizeof(dvbpsi_sdt_t));
+      dvbpsi_InitSDT(p_sdt_decoder->p_building_sdt,
+                     p_section->i_extension,
+                     p_section->i_version,
+                     p_section->b_current_next,
+                     ((uint16_t)(p_section->p_payload_start[0]) << 8)
+                     | p_section->p_payload_start[1]);
+      p_sdt_decoder->i_last_section_number = p_section->i_last_number;
+    }
+
+    /* Fill the section array */
+    if(p_sdt_decoder->ap_sections[p_section->i_number] != NULL)
+    {
+      DVBPSI_DEBUG_ARG("SDT decoder", "overwrite section number %d",
+                       p_section->i_number);
+      dvbpsi_DeletePSISections(p_sdt_decoder->ap_sections[p_section->i_number]);
+    }
+    p_sdt_decoder->ap_sections[p_section->i_number] = p_section;
+
+    /* Check if we have all the sections */
+    b_complete = 0;
+    for(i = 0; i <= p_sdt_decoder->i_last_section_number; i++)
+    {
+      if(!p_sdt_decoder->ap_sections[i])
+        break;
+
+      if(i == p_sdt_decoder->i_last_section_number)
+        b_complete = 1;
+    }
+
+    if(b_complete)
+    {
+      /* Save the current information */
+      p_sdt_decoder->current_sdt = *p_sdt_decoder->p_building_sdt;
+      p_sdt_decoder->b_current_valid = 1;
+      /* Chain the sections */
+      if(p_sdt_decoder->i_last_section_number)
+      {
+        for(i = 0; i <= p_sdt_decoder->i_last_section_number - 1; i++)
+          p_sdt_decoder->ap_sections[i]->p_next =
+                                        p_sdt_decoder->ap_sections[i + 1];
+      }
+      /* Decode the sections */
+      dvbpsi_DecodeSDTSections(p_sdt_decoder->p_building_sdt,
+                               p_sdt_decoder->ap_sections[0]);
+      /* Delete the sections */
+      dvbpsi_DeletePSISections(p_sdt_decoder->ap_sections[0]);
+      /* signal the new SDT */
+      p_sdt_decoder->pf_callback(p_sdt_decoder->p_cb_data,
+                                 p_sdt_decoder->p_building_sdt);
+      /* Reinitialize the structures */
+      p_sdt_decoder->p_building_sdt = NULL;
+      for(i = 0; i <= p_sdt_decoder->i_last_section_number; i++)
+        p_sdt_decoder->ap_sections[i] = NULL;
+    }
+  }
+  else
+  {
+    dvbpsi_DeletePSISections(p_section);
+  }
+}
+
+
+/*****************************************************************************
+ * dvbpsi_DecodeSDTSection
+ *****************************************************************************
+ * SDT decoder.
+ *****************************************************************************/
+void dvbpsi_DecodeSDTSections(dvbpsi_sdt_t* p_sdt,
+                               dvbpsi_psi_section_t* p_section)
+{
+  uint8_t* p_byte, * p_end;
+
+  while(p_section)
+  {
+    for(p_byte = p_section->p_payload_start + 3;
+        p_byte < p_section->p_payload_end;)
+    {
+      uint16_t i_service_id = ((uint16_t)(p_byte[0]) << 8) | p_byte[1];
+      int b_eit_schedule = (int)((p_byte[2]) & 0x2 >> 1);
+      int b_eit_present = (int)((p_byte[2]) & 0x1);
+      uint8_t i_running_status = (uint8_t)(p_byte[3]) >> 5;
+      int b_free_ca = (int)(p_byte[3]) & 0x10 >> 4;
+      uint16_t i_length = ((uint16_t)(p_byte[3] & 0xf) <<8) | p_byte[4];
+      dvbpsi_sdt_service_t* p_service = dvbpsi_SDTAddService(p_sdt,
+          i_service_id, b_eit_schedule, b_eit_present,
+          i_running_status, b_free_ca);
+      /* Service descriptors */
+      p_byte += 5;
+      p_end = p_byte + i_length;
+      while(p_byte + 2 < p_end)
+      {
+        uint8_t i_tag = p_byte[0];
+        uint8_t i_length = p_byte[1];
+        if(i_length + 2 <= p_end - p_byte)
+          dvbpsi_SDTServiceAddDescriptor(p_service, i_tag, i_length, p_byte + 2);
+        p_byte += 2 + i_length;
+      }
+    }
+
+    p_section = p_section->p_next;
+  }
+}

src/tables/sdt.h

+/*****************************************************************************
+ * sdt.h
+ * (c)2001-2002 VideoLAN
+ * $Id: sdt.h,v 1.1 2002/12/11 13:04:57 jobi Exp $
+ *
+ * Authors: Johan Bilien <jobi@via.ecp.fr>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *****************************************************************************/
+
+/*!
+ * \file <sdt.h>
+ * \author Johan Bilien <jobi@via.ecp.fr>
+ * \brief Application interface for the SDT decoder and the SDT generator.
+ *
+ * Application interface for the SDT decoder and the SDT generator. New
+ * decoded SDT are sent by callback to the application. If a table
+ * wasn't active (b_current_next == 0) and the next is the same but active
+ * (b_current_next == 1) then the service description list is empty and should
+ * be caught from the previous structure.
+ */
+
+#ifndef _DVBPSI_SDT_H_
+#define _DVBPSI_SDT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*****************************************************************************
+ * dvbpsi_sdt_service_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_sdt_service_s
+ * \brief SDT service description structure.
+ *
+ * This structure is used to store a decoded SDT service description.
+ * (ETSI EN 300 468 V1.4.1 section 5.2.3).
+ */
+/*!
+ * \typedef struct dvbpsi_sdt_service_s dvbpsi_sdt_service_t
+ * \brief dvbpsi_sdt_service_t type definition.
+ */
+typedef struct dvbpsi_sdt_service_s
+{
+  uint16_t                  i_service_id;           /*!< service_id */
+  int                       b_eit_schedule;         /*!< EIT schedule flag */
+  int                       b_eit_present;          /*!< EIT present/following
+                                                         flag */
+  uint8_t                   i_running_status;       /*!< Running status */
+  int                       b_free_ca;              /*!< Free CA mode flag */
+  uint16_t                  i_descriptors_length;   /*!< Descriptors loop
+                                                         length */
+  dvbpsi_descriptor_t *     p_first_descriptor;     /*!< First of the following
+                                                         DVB descriptors */
+
+
+  struct dvbpsi_sdt_service_s * p_next;             /*!< next element of
+                                                             the list */
+
+} dvbpsi_sdt_service_t;
+
+
+/*****************************************************************************
+ * dvbpsi_sdt_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_sdt_s
+ * \brief SDT structure.
+ *
+ * This structure is used to store a decoded SDT.
+ * (ETSI EN 300 468 V1.4.1 section 5.2.3).
+ */
+/*!
+ * \typedef struct dvbpsi_sdt_s dvbpsi_sdt_t
+ * \brief dvbpsi_sdt_t type definition.
+ */
+typedef struct dvbpsi_sdt_s
+{
+  uint16_t                  i_ts_id;            /*!< transport_stream_id */
+  uint8_t                   i_version;          /*!< version_number */
+  int                       b_current_next;     /*!< current_next_indicator */
+  uint16_t                  i_network_id;       /*!< original network id */
+
+  dvbpsi_sdt_service_t *    p_first_service;    /*!< service description
+                                                     list */
+
+} dvbpsi_sdt_t;
+
+
+/*****************************************************************************
+ * dvbpsi_sdt_callback
+ *****************************************************************************/
+/*!
+ * \typedef void (* dvbpsi_sdt_callback)(void* p_cb_data,
+                                         dvbpsi_sdt_t* p_new_sdt)
+ * \brief Callback type definition.
+ */
+typedef void (* dvbpsi_sdt_callback)(void* p_cb_data, dvbpsi_sdt_t* p_new_sdt);
+
+
+/*****************************************************************************
+ * dvbpsi_AttachSDT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_AttachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
+          uint16_t i_extension, dvbpsi_sdt_callback pf_callback,
+                               void* p_cb_data)
+ * \brief Creation and initialization of a SDT decoder.
+ * \param p_demux Subtable demultiplexor to which the decoder is attached.
+ * \param i_table_id Table ID, 0x42 or 0x46.
+ * \param i_extension Table ID extension, here TS ID.
+ * \param pf_callback function to call back on new SDT.
+ * \param p_cb_data private data given in argument to the callback.
+ * \return 0 if everything went ok.
+ */
+int dvbpsi_AttachSDT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
+          uint16_t i_extension, dvbpsi_sdt_callback pf_callback,
+                               void* p_cb_data);
+
+
+/*****************************************************************************
+ * dvbpsi_DetachSDT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
+          uint16_t i_extension)
+ * \brief Destroy a SDT decoder.
+ * \param p_demux Subtable demultiplexor to which the decoder is attached.
+ * \param i_table_id Table ID, 0x42 or 0x46.
+ * \param i_extension Table ID extension, here TS ID.
+ * \return nothing.
+ */
+void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
+          uint16_t i_extension);
+
+
+/*****************************************************************************
+ * dvbpsi_InitSDT/dvbpsi_NewSDT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_InitSDT(dvbpsi_sdt_t* p_sdt, uint16_t i_ts_id,
+          uint8_t i_version, int b_current_next, uint16_t i_network_id)
+ * \brief Initialize a user-allocated dvbpsi_sdt_t structure.
+ * \param p_sdt pointer to the SDT structure
+ * \param i_ts_id transport stream ID
+ * \param i_version SDT version
+ * \param b_current_next current next indicator
+ * \param i_network_id original network id
+ * \return nothing.
+ */
+void dvbpsi_InitSDT(dvbpsi_sdt_t* p_sdt, uint16_t i_ts_id, uint8_t i_version,
+                    int b_current_next, uint16_t i_network_id);
+
+/*!
+ * \def dvbpsi_NewSDT(p_sdt, i_ts_id, i_version, b_current_next, i_network_id)
+ * \brief Allocate and initialize a new dvbpsi_sdt_t structure.
+ * \param p_sdt pointer to the SDT structure
+ * \param i_ts_id transport stream ID
+ * \param i_version SDT version
+ * \param b_current_next current next indicator
+ * \param i_network_id original network id
+ * \return nothing.
+ */
+#define dvbpsi_NewSDT(p_sdt, i_ts_id, i_version, b_current_next,i_network_id) \
+  p_sdt = (dvbpsi_sdt_t*)malloc(sizeof(dvbpsi_sdt_t));                  \
+  if(p_sdt != NULL)                                                     \
+    dvbpsi_InitSDT(p_sdt, i_ts_id, i_version, b_current_next, i_network_id);
+
+
+/*****************************************************************************
+ * dvbpsi_EmptySDT/dvbpsi_DeleteSDT
+ *****************************************************************************/
+/*!
+ * \fn void dvbpsi_EmptySDT(dvbpsi_sdt_t* p_sdt)
+ * \brief Clean a dvbpsi_sdt_t structure.
+ * \param p_sdt pointer to the SDT structure
+ * \return nothing.
+ */
+void dvbpsi_EmptySDT(dvbpsi_sdt_t* p_sdt);
+
+/*!
+ * \def dvbpsi_DeleteSDT(p_sdt)
+ * \brief Clean and free a dvbpsi_sdt_t structure.
+ * \param p_sdt pointer to the SDT structure
+ * \return nothing.
+ */
+#define dvbpsi_DeleteSDT(p_sdt)                                         \
+  dvbpsi_EmptySDT(p_sdt);                                               \
+  free(p_sdt);
+
+
+/*****************************************************************************
+ * dvbpsi_SDTAddService
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_sdt_service_t* dvbpsi_SDTAddService(dvbpsi_sdt_t* p_sdt,
+                                                  uint16_t i_service_id,
+                                                  int b_eit_schedule,
+                                                  int b_eit_present,
+                                                  uint8_t i_running_status,
+                                                  int b_free_ca)
+ * \brief Add a service description at the end of the SDT.
+ * \param p_sdt pointer to the SDT structure
+ * \param i_service_id Service ID
+ * \param b_eit_schedule EIT Schedule flag
+ * \param b_eit_present EIT Present/Following flag
+ * \param i_running_status Running status
+ * \param b_free_ca Free CA flag
+ * \return a pointer to the added service description.
+ */
+dvbpsi_sdt_service_t* dvbpsi_SDTAddService(dvbpsi_sdt_t* p_sdt,
+    uint16_t i_service_id, int b_eit_schedule, int b_eit_present,
+    uint8_t i_running_status,int b_free_ca);
+
+#ifdef __cplusplus
+};
+#endif
+
+#else
+#error "Multiple inclusions of sdt.h"
+#endif
+

src/tables/sdt_private.h

+/*****************************************************************************
+ * sdt_private.h: private SDT structures
+ *----------------------------------------------------------------------------
+ * (c)2001-2002 VideoLAN
+ * $Id: sdt_private.h,v 1.1 2002/12/11 13:04:57 jobi Exp $
+ *
+ * Authors: Johan Bilien <jobi@via.ecp.fr>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *----------------------------------------------------------------------------
+ *
+ *****************************************************************************/
+
+#ifndef _DVBPSI_SDT_PRIVATE_H_
+#define _DVBPSI_SDT_PRIVATE_H_
+
+
+/*****************************************************************************
+ * dvbpsi_sdt_decoder_t
+ *****************************************************************************
+ * SDT decoder.
+ *****************************************************************************/
+typedef struct dvbpsi_sdt_decoder_s
+{
+  dvbpsi_sdt_callback           pf_callback;
+  void *                        p_cb_data;
+
+  dvbpsi_sdt_t                  current_sdt;
+  dvbpsi_sdt_t *                p_building_sdt;
+
+  int                           b_current_valid;
+
+  uint8_t                       i_last_section_number;
+  dvbpsi_psi_section_t *        ap_sections [256];
+
+} dvbpsi_sdt_decoder_t;
+
+
+/*****************************************************************************
+ * dvbpsi_GatherSDTSections
+ *****************************************************************************
+ * Callback for the PSI decoder.
+ *****************************************************************************/
+void dvbpsi_GatherSDTSections(dvbpsi_decoder_t* p_psi_decoder,
+		              void* p_private_decoder,
+                              dvbpsi_psi_section_t* p_section);
+
+
+/*****************************************************************************
+ * dvbpsi_DecodeSDTSection
+ *****************************************************************************
+ * SDT decoder.
+ *****************************************************************************/
+void dvbpsi_DecodeSDTSections(dvbpsi_sdt_t* p_sdt,
+                              dvbpsi_psi_section_t* p_section);
+
+
+#else
+#error "Multiple inclusions of sdt_private.h"
+#endif
+