Add 0x49 descriptor support

Some readability improvements.
Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>

src/Makefile.am

@@ -44,6 +44,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
                      descriptors/dr_45.h \
                      descriptors/dr_47.h \
                      descriptors/dr_48.h \
+                     descriptors/dr_49.h \
                      descriptors/dr_4d.h \
                      descriptors/dr_4e.h \
                      descriptors/dr_52.h \
@@ -85,6 +86,7 @@ descriptors_src = descriptors/dr_02.c \
                   descriptors/dr_45.c \
                   descriptors/dr_47.c \
                   descriptors/dr_48.c \
+                  descriptors/dr_49.c \
                   descriptors/dr_4d.c \
                   descriptors/dr_4e.c \
                   descriptors/dr_52.c \

src/descriptors/dr.h

@@ -54,6 +54,7 @@
 #include "dr_45.h"
 #include "dr_47.h"
 #include "dr_48.h"
+#include "dr_49.h"
 #include "dr_4d.h"
 #include "dr_4e.h"
 #include "dr_52.h"

src/descriptors/dr_49.c

+/*
+ * dr_49.c
+ * Copyright (C) 2012 VideoLAN
+ *
+ * Authors: rcorno (May 21, 2012)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.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_49.h"
+
+/*****************************************************************************
+ * dvbpsi_DecodeCountryAvailability
+ *****************************************************************************/
+dvbpsi_country_availability_dr_t* dvbpsi_DecodeCountryAvailability(
+                                        dvbpsi_descriptor_t * p_descriptor)
+{
+    dvbpsi_country_availability_dr_t * p_decoded;
+
+    /* Check the tag */
+    if (p_descriptor->i_tag != 0x49)
+        return NULL;
+
+    /* Don't decode twice */
+    if (p_descriptor->p_decoded)
+        return p_descriptor->p_decoded;
+
+    /* Check the length */
+    unsigned int code_count = (p_descriptor->i_length-1) / 3;
+    if ((p_descriptor->i_length < 1) ||
+        ((p_descriptor->i_length-1) % 3 != 0) ||
+         (code_count > 83))
+        return NULL;
+
+    /* Allocate memory */
+    p_decoded = (dvbpsi_country_availability_dr_t*)calloc(1, sizeof(dvbpsi_country_availability_dr_t));
+    if (!p_decoded)
+        return NULL;
+
+    /* Decode data */
+    p_decoded->i_code_count = code_count;
+    p_decoded->b_country_availability_flag = p_descriptor->p_data[0] & 0x80;
+
+    for (uint8_t i = 0; i < p_decoded->i_code_count; i++)
+    {
+    	p_decoded->code[i].iso_639_code[0] = p_descriptor->p_data[1+i*3];
+    	p_decoded->code[i].iso_639_code[1] = p_descriptor->p_data[2+i*3];
+    	p_decoded->code[i].iso_639_code[2] = p_descriptor->p_data[3+i*3];
+    }
+
+    p_descriptor->p_decoded = (void*)p_decoded;
+
+    return p_decoded;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_GenCountryAvailabilityDr
+ *****************************************************************************/
+dvbpsi_descriptor_t * dvbpsi_GenCountryAvailabilityDr(
+		                        dvbpsi_country_availability_dr_t * p_decoded,
+                                        bool b_duplicate)
+{
+    /* Check the length */    
+    if (p_decoded->i_code_count > 83) 
+        return NULL;
+
+    /* Create the descriptor */
+    dvbpsi_descriptor_t * p_descriptor =
+            dvbpsi_NewDescriptor(0x83, 1+p_decoded->i_code_count*3, NULL);
+    if (!p_descriptor)
+        return NULL;
+
+    /* Encode data */
+    p_descriptor->p_data[0] = (p_decoded->b_country_availability_flag) ? 0x80: 0x00;
+
+    for (uint8_t i = 0; i < p_decoded->i_code_count; i++)
+    {
+        p_descriptor->p_data[1+i*3] = p_decoded->code[i].iso_639_code[0];
+        p_descriptor->p_data[2+i*3] = p_decoded->code[i].iso_639_code[1];
+        p_descriptor->p_data[3+i*3] = p_decoded->code[i].iso_639_code[2];
+    }
+
+    if (b_duplicate)
+    {
+        /* Duplicate decoded data */
+        p_descriptor->p_decoded =
+               dvbpsi_DuplicateDecodedDescriptor(p_descriptor->p_decoded,
+                      sizeof(dvbpsi_country_availability_dr_t));
+    }
+
+    return p_descriptor;
+}

src/descriptors/dr_49.h

+/*****************************************************************************
+ * dr_49.h
+ * Copyright (C) 2012 VideoLAN
+ *
+ * Authors: rcorno (May 21, 2012)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+/*!
+ * \file <dr_49.h>
+ * \author Corno Roberto <corno.roberto@gmail.com>
+ * \brief Application interface for the DVB "country availability"
+ * descriptor decoder and generator.
+ *
+ * Application interface for the DVB "country availability" descriptor
+ * decoder and generator. This descriptor's definition can be found in
+ * ETSI EN 300 468 section 6.2.10.
+ */
+
+#ifndef DR_49_H_
+#define DR_49_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef uint8_t iso_639_language_code_t[3]; /*!< ISO639 three letter language codes */
+
+/*****************************************************************************
+ * dvbpsi_country_availability_dr_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_country_availability_dr_t
+ * \brief "country availability" descriptor structure.
+ *
+ * This structure is used to store a decoded "country availability"
+ * descriptor. (ETSI EN 300 468 section 6.2.10).
+ */
+/*!
+ * \typedef struct dvbpsi_country_availability_dr_s dvbpsi_country_availability_dr_t
+ * \brief dvbpsi_country_availability_dr_t type definition.
+ */
+typedef struct dvbpsi_country_availability_dr_s
+{
+  bool          b_country_availability_flag;    /*!< country availability flag */
+  uint8_t       i_code_count;                   /*!< length of the i_iso_639_code
+                                                array */
+  struct {
+    iso_639_language_code_t  iso_639_code;
+  } code[84];                                   /*!< ISO_639_language_code */
+
+} dvbpsi_country_availability_dr_t;
+
+/*****************************************************************************
+ * dvbpsi_DecodeCountryAvailabilityDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_country_availability_dr_t * dvbpsi_DecodeCountryAvailability(
+                                        dvbpsi_descriptor_t * p_descriptor)
+ * \brief "country availability" descriptor decoder.
+ * \param p_descriptor pointer to the descriptor structure
+ * \return a pointer to a new "country availability" descriptor structure
+ * which contains the decoded data.
+ */
+dvbpsi_country_availability_dr_t* dvbpsi_DecodeCountryAvailability(
+                                        dvbpsi_descriptor_t * p_descriptor);
+
+
+/*****************************************************************************
+ * dvbpsi_GenCountryAvailabilityDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_descriptor_t * dvbpsi_GenCountryAvailabilityDr(
+                        dvbpsi_country_availability_dr_t * p_decoded, int b_duplicate)
+ * \brief "country availability" descriptor generator.
+ * \param p_decoded pointer to a decoded "country availability" 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_GenCountryAvailabilityDr(
+		                        dvbpsi_country_availability_dr_t * p_decoded,
+                                        bool b_duplicate);
+
+#ifdef __cplusplus
+};
+#endif
+
+#else
+#error "Multiple inclusions of dr_49.h"
+#endif /* DR_49_H_ */