Add dr_54 (Content Descriptor)

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

src/Makefile.am

@@ -52,6 +52,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
                      descriptors/dr_4f.h \
                      descriptors/dr_50.h \
                      descriptors/dr_52.h \
+                     descriptors/dr_54.h \
                      descriptors/dr_55.h \
                      descriptors/dr_56.h \
                      descriptors/dr_58.h \
@@ -99,6 +100,7 @@ descriptors_src = descriptors/dr_02.c \
                   descriptors/dr_4f.c \
                   descriptors/dr_50.c \
                   descriptors/dr_52.c \
+                  descriptors/dr_54.c \
                   descriptors/dr_55.c \
                   descriptors/dr_56.c \
                   descriptors/dr_58.c \

src/descriptors/dr.h

@@ -64,6 +64,7 @@
 #include "dr_4f.h"
 #include "dr_50.h"
 #include "dr_52.h"
+#include "dr_54.h"
 #include "dr_55.h"
 #include "dr_56.h"
 #include "dr_58.h"

src/descriptors/dr_54.c

+/*****************************************************************************
+ * dr_54.c
+ * Copyright (C) 2013 VideoLAN
+ *
+ *
+ * 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_54.h"
+
+
+/*****************************************************************************
+ * dvbpsi_DecodeContentDr
+ *****************************************************************************/
+dvbpsi_content_dr_t * dvbpsi_DecodeContentDr(
+                                        dvbpsi_descriptor_t * p_descriptor)
+{
+    /* Check the tag */
+    if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x54))
+        return NULL;
+
+    /* Don't decode twice */
+    if (dvbpsi_IsDescriptorDecoded(p_descriptor))
+        return p_descriptor->p_decoded;
+
+    /* Decode data and check the length */
+    if(p_descriptor->i_length % 2)
+        return NULL;
+
+    /* Allocate memory */
+    dvbpsi_content_dr_t * p_decoded;
+    p_decoded = (dvbpsi_content_dr_t*)malloc(sizeof(dvbpsi_content_dr_t));
+    if (!p_decoded)
+        return NULL;
+
+    int i_contents_number = p_descriptor->i_length / 2;
+    p_decoded->i_contents_number = i_contents_number;
+
+    for (int i = 0; i < i_contents_number; i++)
+    {
+        p_decoded->p_content[i].i_type = p_descriptor->p_data[2 * i];
+        p_decoded->p_content[i].i_user_byte = p_descriptor->p_data[2 * i + 1];
+    }
+
+    p_descriptor->p_decoded = (void*)p_decoded;
+
+    return p_decoded;
+}
+
+
+/*****************************************************************************
+ * dvbpsi_GenContentDr
+ *****************************************************************************/
+dvbpsi_descriptor_t * dvbpsi_GenContentDr(
+                                        dvbpsi_content_dr_t * p_decoded,
+                                        bool b_duplicate)
+{
+    /* Create the descriptor */
+    dvbpsi_descriptor_t * p_descriptor =
+            dvbpsi_NewDescriptor(0x54, p_decoded->i_contents_number * 2 , NULL);
+
+    if (!p_descriptor)
+        return NULL;
+
+    /* Encode data */
+    for (int i = 0; i < p_decoded->i_contents_number; i++ )
+    {
+        p_descriptor->p_data[8 * i] = p_decoded->p_content[i].i_type;
+        p_descriptor->p_data[8 * i + 1] = p_decoded->p_content[i].i_user_byte;
+    }
+
+    if (b_duplicate)
+    {
+        /* Duplicate decoded data */
+        p_descriptor->p_decoded =
+                dvbpsi_DuplicateDecodedDescriptor(p_decoded,
+                                                  sizeof(dvbpsi_content_dr_t));
+    }
+
+    return p_descriptor;
+}