* all: added descriptor 4d/4e for EIT.

src/descriptors/dr.h

@@ -49,6 +49,8 @@
 #include "dr_42.h"
 #include "dr_47.h"
 #include "dr_48.h"
+#include "dr_4d.h"
+#include "dr_4e.h"
 #include "dr_52.h"
 #include "dr_55.h"
 #include "dr_56.h"

src/descriptors/dr_4d.c

+/*****************************************************************************
+ * dr_4d.c
+ * (c)2005 VideoLAN
+ * $Id: dr_4d.c,v 1.7 2003/07/25 20:20:40 fenrir Exp $
+ *
+ * Authors: Laurent Aimar <fenrir@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 "../descriptor.h"
+
+#include "dr_4d.h"
+
+/*****************************************************************************
+ * dvbpsi_DecodeShortEventDr
+ *****************************************************************************/
+dvbpsi_short_event_dr_t * dvbpsi_DecodeShortEventDr(dvbpsi_descriptor_t * p_descriptor)
+{
+  dvbpsi_short_event_dr_t * p_decoded;
+  int i_len1;
+  int i_len2;
+
+  /* Check the tag */
+  if(p_descriptor->i_tag != 0x4d ||
+     p_descriptor->i_length < 5 )
+  {
+    DVBPSI_ERROR_ARG("dr_4d decoder", "bad tag or corrupted(0x%x)", p_descriptor->i_tag);
+    return NULL;
+  }
+  /* Check length */
+  i_len1 = p_descriptor->p_data[3];
+  i_len2 = p_descriptor->p_data[4+i_len1];
+  if( p_descriptor->i_length < 5 + i_len1 + i_len2 )
+  {
+    DVBPSI_ERROR_ARG("dr_4d decoder", "invalid length/content (tag=0x%x)", p_descriptor->i_tag );
+    return NULL;
+  }
+
+  /* Don't decode twice */
+  if(p_descriptor->p_decoded)
+    return p_descriptor->p_decoded;
+
+  /* Allocate memory */
+  p_decoded = malloc(sizeof(dvbpsi_short_event_dr_t));
+  if(!p_decoded)
+  {
+    DVBPSI_ERROR("dr_4d decoder", "out of memory");
+    return NULL;
+  }
+
+  /* Decode data and check the length */
+  memcpy( p_decoded->i_iso_639_code, &p_descriptor->p_data[0], 3 );
+  p_decoded->i_event_name_length = i_len1;
+  if( i_len1 > 0 )
+      memcpy( p_decoded->i_event_name, &p_descriptor->p_data[3+1], i_len1 );
+  p_decoded->i_text_length = i_len2;
+  if( i_len2 > 0 )
+      memcpy( p_decoded->i_text, &p_descriptor->p_data[4+i_len1+1], i_len2 );
+
+  p_descriptor->p_decoded = (void*)p_decoded;
+
+  return p_decoded;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_GenShortEventDr
+ *****************************************************************************/
+dvbpsi_descriptor_t * dvbpsi_GenShortEventDr(dvbpsi_short_event_dr_t * p_decoded,
+                                          int b_duplicate)
+{
+  int i_len1 = p_decoded->i_event_name_length;
+  int i_len2 = p_decoded->i_text_length;
+
+  /* Create the descriptor */
+  dvbpsi_descriptor_t * p_descriptor =
+                dvbpsi_NewDescriptor(0x4d, 5 + i_len1 + i_len2, NULL );
+
+  if(p_descriptor)
+  {
+    /* Encode data */
+    memcpy( &p_descriptor->p_data[0], p_decoded->i_iso_639_code, 3 );
+    p_descriptor->p_data[3] = i_len1;
+    if( i_len1 )
+        memcpy( &p_descriptor->p_data[4], p_decoded->i_event_name, i_len1 );
+    p_descriptor->p_data[3+i_len1] = i_len2;
+    if( i_len2 )
+        memcpy( &p_descriptor->p_data[3+i_len1+1], p_decoded->i_text, i_len2 );
+
+    if(b_duplicate)
+    {
+      /* Duplicate decoded data */
+      dvbpsi_short_event_dr_t * p_dup_decoded =
+                (dvbpsi_short_event_dr_t*)malloc(sizeof(dvbpsi_short_event_dr_t));
+      if(p_dup_decoded)
+        memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_short_event_dr_t));
+
+      p_descriptor->p_decoded = (void*)p_dup_decoded;
+    }
+  }
+
+  return p_descriptor;
+}

src/descriptors/dr_4d.h

+/*****************************************************************************
+ * dr_4d.h
+ * (c)2005 VideoLAN
+ * $Id: dr_4d.h,v 1.3 2002/05/10 23:50:36 bozo Exp $
+ *
+ * Authors: Laurent Aimar <fenrir@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 <dr_4d.h>
+ * \author Laurent Aimar <fenrir@via.ecp.fr>
+ * \brief Application interface for the "Short event" descriptor
+ * decoder and generator.
+ *
+ * Application interface for the "Short event" descriptor
+ * decoder and generator. This descriptor's definition can be found in
+ * ETSI EN 300 468 section 6.2.35.
+ */
+
+#ifndef _DVBPSI_DR_4D_H_
+#define _DVBPSI_DR_4D_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*****************************************************************************
+ * dvbpsi_short_event_dr_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_short_event_dr_s
+ * \brief "short event" descriptor structure.
+ *
+ * This structure is used to store a decoded "short event" descriptor.
+ */
+/*!
+ * \typedef struct dvbpsi_short_event_dr_s dvbpsi_short_event_dr_t
+ * \brief dvbpsi_short_event_dr_t type definition.
+ */
+typedef struct dvbpsi_short_event_dr_s
+{
+  uint8_t i_iso_639_code[3];
+  int     i_event_name_length;
+  uint8_t i_event_name[256];
+  int     i_text_length;
+  uint8_t i_text[256];
+
+} dvbpsi_short_event_dr_t;
+
+
+/*****************************************************************************
+ * dvbpsi_DecodeShortEventDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_short_event_dr_t * dvbpsi_DecodeShortEventDr(
+                                        dvbpsi_descriptor_t * p_descriptor)
+ * \brief "short event" descriptor decoder.
+ * \param p_descriptor pointer to the descriptor structure
+ * \return a pointer to a new "short event" descriptor structure which
+ * contains the decoded data.
+ */
+dvbpsi_short_event_dr_t* dvbpsi_DecodeShortEventDr(dvbpsi_descriptor_t * p_descriptor);
+
+
+/*****************************************************************************
+ * dvbpsi_GenShortEventDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_descriptor_t * dvbpsi_GenShortEventDr(
+                        dvbpsi_short_event_dr_t * p_decoded, int b_duplicate)
+ * \brief "short event" descriptor generator.
+ * \param p_decoded pointer to a decoded "video stream" descriptor structure
+ * \param b_duplicate if non zero then duplicate the p_decoded structure into
+ * the descriptor
+ * \return a pointer to a new descriptor structure which contains encoded data.
+ */
+dvbpsi_descriptor_t * dvbpsi_GenShortEventDr(dvbpsi_short_event_dr_t * p_decoded,
+                                             int b_duplicate);
+
+
+#ifdef __cplusplus
+};
+#endif
+
+#else
+#error "Multiple inclusions of dr_4d.h"
+#endif
+

src/descriptors/dr_4e.c

+/*****************************************************************************
+ * dr_4e.c
+ * (c)2005 VideoLAN
+ * $Id: dr_4d.c,v 1.7 2003/07/25 20:20:40 fenrir Exp $
+ *
+ * Authors: Laurent Aimar <fenrir@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 "../descriptor.h"
+
+#include "dr_4e.h"
+
+/*****************************************************************************
+ * dvbpsi_DecodeExtendedEventDr
+ *****************************************************************************/
+dvbpsi_extended_event_dr_t * dvbpsi_DecodeExtendedEventDr(dvbpsi_descriptor_t * p_descriptor)
+{
+  dvbpsi_extended_event_dr_t * p_decoded;
+  int i_len;
+  int i_pos;
+  uint8_t *p;
+
+  /* Check the tag */
+  if(p_descriptor->i_tag != 0x4e ||
+     p_descriptor->i_length < 6 )
+  {
+    DVBPSI_ERROR_ARG("dr_4e decoder", "bad tag or corrupted(0x%x)", p_descriptor->i_tag);
+    return NULL;
+  }
+
+  /* Don't decode twice */
+  if(p_descriptor->p_decoded)
+    return p_descriptor->p_decoded;
+
+  /* Allocate memory */
+  p_decoded = malloc(sizeof(dvbpsi_extended_event_dr_t));
+  if(!p_decoded)
+  {
+    DVBPSI_ERROR("dr_4e decoder", "out of memory");
+    return NULL;
+  }
+
+  /* Decode */
+  p_decoded->i_descriptor_number = (p_descriptor->p_data[0] >> 4)&0xf;
+  p_decoded->i_last_descriptor_number = p_descriptor->p_data[0]&0x0f;
+  memcpy( &p_decoded->i_iso_639_code[0], &p_descriptor->p_data[1], 3 );
+  p_decoded->i_entry_count = 0;
+  i_len = p_descriptor->p_data[4];
+  i_pos = 0;
+  for( p = &p_descriptor->p_data[5]; p < &p_descriptor->p_data[5+i_len]; )
+  {
+      int idx = p_decoded->i_entry_count;
+
+      p_decoded->i_item_description_length[idx] = p[0];
+      p_decoded->i_item_description[idx] = &p_decoded->i_buffer[i_pos];
+      memcpy( &p_decoded->i_buffer[i_pos], &p[1], p[0] );
+      i_pos += p[0];
+      p += 1 + p[0];
+
+      p_decoded->i_item_length[idx] = p[0];
+      p_decoded->i_item[idx] = &p_decoded->i_buffer[i_pos];
+      memcpy( &p_decoded->i_buffer[i_pos], &p[1], p[0] );
+      i_pos += p[0];
+      p += 1 + p[0];
+
+      p_decoded->i_entry_count++;
+  }
+
+  p_decoded->i_text_length = p_descriptor->p_data[5+i_len];
+  if( p_decoded->i_text_length > 0 )
+      memcpy( &p_decoded->i_buffer[i_pos],
+              &p_descriptor->p_data[5+i_len+1], p_decoded->i_text_length );
+  p_decoded->i_text = &p_decoded->i_buffer[i_pos];
+
+  p_descriptor->p_decoded = (void*)p_decoded;
+
+  return p_decoded;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_GenExtendedEventDr
+ *****************************************************************************/
+dvbpsi_descriptor_t * dvbpsi_GenExtendedEventDr(dvbpsi_extended_event_dr_t * p_decoded,
+                                          int b_duplicate)
+{
+  int i_len;
+  int i_len2;
+  dvbpsi_descriptor_t * p_descriptor;
+  int i;
+
+  i_len2 = 0;
+  for( i = 0; i < p_decoded->i_entry_count; i++ )
+      i_len2 += 2 + p_decoded->i_item_description_length[i] + p_decoded->i_item_length[i];
+  i_len = 1 + 3 + 1 + i_len2 + 1 + p_decoded->i_text_length;
+
+  /* Create the descriptor */
+  p_descriptor = dvbpsi_NewDescriptor(0x4e, i_len, NULL );
+
+  if(p_descriptor)
+  {
+    uint8_t *p = &p_descriptor->p_data[0];
+    int i;
+
+    /* Encode data */
+    p[0] = (p_decoded->i_descriptor_number << 4 ) |
+           p_decoded->i_last_descriptor_number;
+    memcpy( &p[1], p_decoded->i_iso_639_code, 3 );
+    p[4] = i_len2;
+
+    p += 4;
+
+    for( i = 0; i < p_decoded->i_entry_count; i++ )
+    {
+        p[0] = p_decoded->i_item_description_length[i];
+        memcpy( &p[1], p_decoded->i_item_description[i], p[0] );
+        p += 1 + p_decoded->i_item_description_length[i];
+
+        p[0] = p_decoded->i_item_length[i];
+        memcpy( &p[1], p_decoded->i_item[i], p[0] );
+        p += 1 + p_decoded->i_item_length[i];
+    }
+
+    p[0] = p_decoded->i_text_length;
+    memcpy( &p[1], p_decoded->i_text, p[0] );
+
+    if(b_duplicate)
+    {
+      /* Duplicate decoded data */
+      dvbpsi_extended_event_dr_t * p_dup_decoded =
+                (dvbpsi_extended_event_dr_t*)malloc(sizeof(dvbpsi_extended_event_dr_t));
+      if(p_dup_decoded)
+        memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_extended_event_dr_t));
+
+      p_descriptor->p_decoded = (void*)p_dup_decoded;
+    }
+  }
+
+  return p_descriptor;
+}

src/descriptors/dr_4e.h

+/*****************************************************************************
+ * dr_4e.h
+ * (c)2005 VideoLAN
+ * $Id: dr_4d.h,v 1.3 2002/05/10 23:50:36 bozo Exp $
+ *
+ * Authors: Laurent Aimar <fenrir@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 <dr_4e.h>
+ * \author Laurent Aimar <fenrir@via.ecp.fr>
+ * \brief Application interface for the "Extended event" descriptor
+ * decoder and generator.
+ *
+ * Application interface for the "Extended event" descriptor
+ * decoder and generator. This descriptor's definition can be found in
+ * ETSI EN 300 468 section 6.2.15.
+ */
+
+#ifndef _DVBPSI_DR_4E_H_
+#define _DVBPSI_DR_4E_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*****************************************************************************
+ * dvbpsi_extended_event_dr_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_short_event_dr_s
+ * \brief "short event" descriptor structure.
+ *
+ * This structure is used to store a decoded "short event" descriptor.
+ */
+/*!
+ * \typedef struct dvbpsi_short_event_dr_s dvbpsi_extended_event_dr_t
+ * \brief dvbpsi_extended_event_dr_t type definition.
+ */
+typedef struct dvbpsi_extended_event_dr_s
+{
+  uint8_t i_descriptor_number;
+  uint8_t i_last_descriptor_number;
+
+  uint8_t i_iso_639_code[3];
+
+  int     i_entry_count;
+  uint8_t i_item_description_length[126];
+  uint8_t *i_item_description[126];
+  uint8_t i_item_length[126];
+  uint8_t *i_item[126];
+
+  int     i_text_length;
+  uint8_t *i_text;
+
+  uint8_t i_buffer[256];    /* do not use */
+} dvbpsi_extended_event_dr_t;
+
+
+/*****************************************************************************
+ * dvbpsi_DecodeExtendedEventDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_extended_event_dr_t * dvbpsi_DecodeExtendedEventDr(
+                                        dvbpsi_descriptor_t * p_descriptor)
+ * \brief "short event" descriptor decoder.
+ * \param p_descriptor pointer to the descriptor structure
+ * \return a pointer to a new "short event" descriptor structure which
+ * contains the decoded data.
+ */
+dvbpsi_extended_event_dr_t* dvbpsi_DecodeExtendedEventDr(dvbpsi_descriptor_t * p_descriptor);
+
+
+/*****************************************************************************
+ * dvbpsi_GenExtendedEventDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_descriptor_t * dvbpsi_GenExtendedEventDr(
+                        dvbpsi_extended_event_dr_t * p_decoded, int b_duplicate)
+ * \brief "short event" descriptor generator.
+ * \param p_decoded pointer to a decoded "video stream" descriptor structure
+ * \param b_duplicate if non zero then duplicate the p_decoded structure into
+ * the descriptor
+ * \return a pointer to a new descriptor structure which contains encoded data.
+ */
+dvbpsi_descriptor_t * dvbpsi_GenExtendedEventDr(dvbpsi_extended_event_dr_t * p_decoded,
+                                             int b_duplicate);
+
+
+#ifdef __cplusplus
+};
+#endif
+
+#else
+#error "Multiple inclusions of dr_4e.h"
+#endif
+