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;
+}

src/descriptors/dr_54.h

+/*****************************************************************************
+ * dr_54.h
+ * 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
+ *
+ *****************************************************************************/
+
+/*!
+ * \file <dr_54.h>
+ * \author François Cartegnie <fcvlcdev@free.fr>
+ * \brief Content descriptor parsing.
+ *
+ * Content descriptor parsing, according to ETSI EN 300 468
+ * section 6.2.9.
+ */
+
+#ifndef _DVBPSI_DR_54_H_
+#define _DVBPSI_DR_54_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DVDPSI_GetContentCategoryFromType(type) (type >> 4)
+
+#define L1L2MERGE(L1,L2) ( ( DVBPSI_CONTENT ## L1<<4) | L2 )
+#define DVBPSI_CONTENT_CAT_UNDEFINED    0x0
+#define DVBPSI_CONTENT_CAT_MOVIE        0x1
+#define DVBPSI_CONTENT_CAT_NEWS         0x2
+#define DVBPSI_CONTENT_CAT_SHOW         0x3
+#define DVBPSI_CONTENT_CAT_SPORTS       0x4
+#define DVBPSI_CONTENT_CAT_CHILDREN     0x5
+#define DVBPSI_CONTENT_CAT_MUSIC        0x6
+#define DVBPSI_CONTENT_CAT_CULTURE      0x7
+#define DVBPSI_CONTENT_CAT_SOCIAL       0x8
+#define DVBPSI_CONTENT_CAT_EDUCATION    0x9
+#define DVBPSI_CONTENT_CAT_LEISURE      0xa
+#define DVBPSI_CONTENT_CAT_SPECIAL      0xb
+#define DVBPSI_CONTENT_CAT_USERDEFINED  0xf
+
+                /* Movie/Drama */
+#define DVBPSI_CONTENT_MOVIE_GENERAL        L1L2MERGE( _MOVIE, 0x0 )
+#define DVBPSI_CONTENT_MOVIE_DETECTIVE      L1L2MERGE( _MOVIE, 0x1 )
+#define DVBPSI_CONTENT_MOVIE_ADVENTURE      L1L2MERGE( _MOVIE, 0x2 )
+#define DVBPSI_CONTENT_MOVIE_SF             L1L2MERGE( _MOVIE, 0x3 )
+#define DVBPSI_CONTENT_MOVIE_COMEDY         L1L2MERGE( _MOVIE, 0x4 )
+#define DVBPSI_CONTENT_MOVIE_SOAP           L1L2MERGE( _MOVIE, 0x5 )
+#define DVBPSI_CONTENT_MOVIE_ROMANCE        L1L2MERGE( _MOVIE, 0x6 )
+#define DVBPSI_CONTENT_MOVIE_CLASSICAL      L1L2MERGE( _MOVIE, 0x7 )
+#define DVBPSI_CONTENT_MOVIE_ADULT          L1L2MERGE( _MOVIE, 0x8 )
+#define DVBPSI_CONTENT_MOVIE_USERDEFINED    L1L2MERGE( _MOVIE, 0xf )
+/* News/Current affairs */
+#define DVBPSI_CONTENT_NEWS_GENERAL         L1L2MERGE( _NEWS, 0x0 )
+#define DVBPSI_CONTENT_NEWS_WEATHER         L1L2MERGE( _NEWS, 0x1 )
+#define DVBPSI_CONTENT_NEWS_MAGAZINE        L1L2MERGE( _NEWS, 0x2 )
+#define DVBPSI_CONTENT_NEWS_DOCUMENTARY     L1L2MERGE( _NEWS, 0x3 )
+#define DVBPSI_CONTENT_NEWS_DISCUSSION      L1L2MERGE( _NEWS, 0x4 )
+#define DVBPSI_CONTENT_NEWS_USERDEFINED     L1L2MERGE( _NEWS, 0xf )
+/* Show/Game show */
+#define DVBPSI_CONTENT_SHOW_GENERAL         L1L2MERGE( _SHOW, 0x0 )
+#define DVBPSI_CONTENT_SHOW_QUIZ            L1L2MERGE( _SHOW, 0x1 )
+#define DVBPSI_CONTENT_SHOW_VARIETY         L1L2MERGE( _SHOW, 0x2 )
+#define DVBPSI_CONTENT_SHOW_TALK            L1L2MERGE( _SHOW, 0x3 )
+#define DVBPSI_CONTENT_SHOW_USERDEFINED     L1L2MERGE( _SHOW, 0xf )
+/* Sports */
+#define DVBPSI_CONTENT_SPORTS_GENERAL       L1L2MERGE( _SPORTS, 0x0 )
+#define DVBPSI_CONTENT_SPORTS_EVENTS        L1L2MERGE( _SPORTS, 0x1 )
+#define DVBPSI_CONTENT_SPORTS_MAGAZINE      L1L2MERGE( _SPORTS, 0x2 )
+#define DVBPSI_CONTENT_SPORTS_FOOTBALL      L1L2MERGE( _SPORTS, 0x3 )
+#define DVBPSI_CONTENT_SPORTS_TENNIS        L1L2MERGE( _SPORTS, 0x4 )
+#define DVBPSI_CONTENT_SPORTS_TEAM          L1L2MERGE( _SPORTS, 0x5 )
+#define DVBPSI_CONTENT_SPORTS_ATHLETICS     L1L2MERGE( _SPORTS, 0x6 )
+#define DVBPSI_CONTENT_SPORTS_MOTOR         L1L2MERGE( _SPORTS, 0x7 )
+#define DVBPSI_CONTENT_SPORTS_WATER         L1L2MERGE( _SPORTS, 0x8 )
+#define DVBPSI_CONTENT_SPORTS_WINTER        L1L2MERGE( _SPORTS, 0x9 )
+#define DVBPSI_CONTENT_SPORTS_EQUESTRIAN    L1L2MERGE( _SPORTS, 0xa )
+#define DVBPSI_CONTENT_SPORTS_MARTIAL       L1L2MERGE( _SPORTS, 0xb )
+#define DVBPSI_CONTENT_SPORTS_USERDEFINED   L1L2MERGE( _SPORTS, 0xf )
+/* Children's/Youth */
+#define DVBPSI_CONTENT_CHILDREN_GENERAL     L1L2MERGE( _CHILDREN, 0x0 )
+#define DVBPSI_CONTENT_CHILDREN_PRESCHOOL   L1L2MERGE( _CHILDREN, 0x1 )
+#define DVBPSI_CONTENT_CHILDREN_06TO14ENT   L1L2MERGE( _CHILDREN, 0x2 )
+#define DVBPSI_CONTENT_CHILDREN_10TO16ENT   L1L2MERGE( _CHILDREN, 0x3 )
+#define DVBPSI_CONTENT_CHILDREN_EDUCATIONAL L1L2MERGE( _CHILDREN, 0x4 )
+#define DVBPSI_CONTENT_CHILDREN_CARTOONS    L1L2MERGE( _CHILDREN, 0x5 )
+#define DVBPSI_CONTENT_CHILDREN_USERDEFINED L1L2MERGE( _CHILDREN, 0xf )
+/* Music/Ballet/Dance */
+#define DVBPSI_CONTENT_MUSIC_GENERAL        L1L2MERGE( _MUSIC, 0x0 )
+#define DVBPSI_CONTENT_MUSIC_POPROCK        L1L2MERGE( _MUSIC, 0x1 )
+#define DVBPSI_CONTENT_MUSIC_CLASSICAL      L1L2MERGE( _MUSIC, 0x2 )
+#define DVBPSI_CONTENT_MUSIC_FOLK           L1L2MERGE( _MUSIC, 0x3 )
+#define DVBPSI_CONTENT_MUSIC_JAZZ           L1L2MERGE( _MUSIC, 0x4 )
+#define DVBPSI_CONTENT_MUSIC_OPERA          L1L2MERGE( _MUSIC, 0x5 )
+#define DVBPSI_CONTENT_MUSIC_BALLET         L1L2MERGE( _MUSIC, 0x6 )
+#define DVBPSI_CONTENT_MUSIC_USERDEFINED    L1L2MERGE( _MUSIC, 0xf )
+/* Arts/Culture */
+#define DVBPSI_CONTENT_CULTURE_GENERAL      L1L2MERGE( _CULTURE, 0x0 )
+#define DVBPSI_CONTENT_CULTURE_PERFORMANCE  L1L2MERGE( _CULTURE, 0x1 )
+#define DVBPSI_CONTENT_CULTURE_FINEARTS     L1L2MERGE( _CULTURE, 0x2 )
+#define DVBPSI_CONTENT_CULTURE_RELIGION     L1L2MERGE( _CULTURE, 0x3 )
+#define DVBPSI_CONTENT_CULTURE_TRADITIONAL  L1L2MERGE( _CULTURE, 0x4 )
+#define DVBPSI_CONTENT_CULTURE_LITERATURE   L1L2MERGE( _CULTURE, 0x5 )
+#define DVBPSI_CONTENT_CULTURE_CINEMA       L1L2MERGE( _CULTURE, 0x6 )
+#define DVBPSI_CONTENT_CULTURE_EXPERIMENTAL L1L2MERGE( _CULTURE, 0x7 )
+#define DVBPSI_CONTENT_CULTURE_PRESS        L1L2MERGE( _CULTURE, 0x8 )
+#define DVBPSI_CONTENT_CULTURE_NEWMEDIA     L1L2MERGE( _CULTURE, 0x9 )
+#define DVBPSI_CONTENT_CULTURE_MAGAZINE     L1L2MERGE( _CULTURE, 0xa )
+#define DVBPSI_CONTENT_CULTURE_FASHION      L1L2MERGE( _CULTURE, 0xb )
+#define DVBPSI_CONTENT_CULTURE_USERDEFINED  L1L2MERGE( _CULTURE, 0xf )
+/* Socal/Political/Economics */
+#define DVBPSI_CONTENT_SOCIAL_GENERAL       L1L2MERGE( _SOCIAL, 0x0 )
+#define DVBPSI_CONTENT_SOCIAL_MAGAZINE      L1L2MERGE( _SOCIAL, 0x1 )
+#define DVBPSI_CONTENT_SOCIAL_ADVISORY      L1L2MERGE( _SOCIAL, 0x2 )
+#define DVBPSI_CONTENT_SOCIAL_PEOPLE        L1L2MERGE( _SOCIAL, 0x3 )
+#define DVBPSI_CONTENT_SOCIAL_USERDEFINED   L1L2MERGE( _SOCIAL, 0xf )
+/* Eduction/Science/Factual */
+#define DVBPSI_CONTENT_EDUCATION_GENERAL    L1L2MERGE( _EDUCATION, 0x0 )
+#define DVBPSI_CONTENT_EDUCATION_NATURE     L1L2MERGE( _EDUCATION, 0x1 )
+#define DVBPSI_CONTENT_EDUCATION_TECHNOLOGY L1L2MERGE( _EDUCATION, 0x2 )
+#define DVBPSI_CONTENT_EDUCATION_MEDICINE   L1L2MERGE( _EDUCATION, 0x3 )
+#define DVBPSI_CONTENT_EDUCATION_FOREIGN    L1L2MERGE( _EDUCATION, 0x4 )
+#define DVBPSI_CONTENT_EDUCATION_SOCIAL     L1L2MERGE( _EDUCATION, 0x5 )
+#define DVBPSI_CONTENT_EDUCATION_FURTHER    L1L2MERGE( _EDUCATION, 0x6 )
+#define DVBPSI_CONTENT_EDUCATION_LANGUAGE   L1L2MERGE( _EDUCATION, 0x7 )
+#define DVBPSI_CONTENT_EDUCATION_USERDEFINED L1L2MERGE( _EDUCATION, 0xf )
+/* Leisure/Hobbies */
+#define DVBPSI_CONTENT_LEISURE_GENERAL      L1L2MERGE( _LEISURE, 0x0 )
+#define DVBPSI_CONTENT_LEISURE_TRAVEL       L1L2MERGE( _LEISURE, 0x1 )
+#define DVBPSI_CONTENT_LEISURE_HANDICRAFT   L1L2MERGE( _LEISURE, 0x2 )
+#define DVBPSI_CONTENT_LEISURE_MOTORING     L1L2MERGE( _LEISURE, 0x3 )
+#define DVBPSI_CONTENT_LEISURE_FITNESS      L1L2MERGE( _LEISURE, 0x4 )
+#define DVBPSI_CONTENT_LEISURE_COOKING      L1L2MERGE( _LEISURE, 0x5 )
+#define DVBPSI_CONTENT_LEISURE_SHOPPING     L1L2MERGE( _LEISURE, 0x6 )
+#define DVBPSI_CONTENT_LEISURE_GARDENING    L1L2MERGE( _LEISURE, 0x7 )
+#define DVBPSI_CONTENT_LEISURE_USERDEFINED  L1L2MERGE( _LEISURE, 0xf )
+/* Special characteristics */
+#define DVBPSI_CONTENT_SPECIAL_ORIGINALLANGUAGE L1L2MERGE( _SPECIAL, 0x0 )
+#define DVBPSI_CONTENT_SPECIAL_BLACKANDWHITE    L1L2MERGE( _SPECIAL, 0x1 )
+#define DVBPSI_CONTENT_SPECIAL_UNPUBLISHED      L1L2MERGE( _SPECIAL, 0x2 )
+#define DVBPSI_CONTENT_SPECIAL_LIVE             L1L2MERGE( _SPECIAL, 0x3 )
+#define DVBPSI_CONTENT_SPECIAL_PLANOSTEREOSCOPIC L1L2MERGE( _SPECIAL, 0x4 )
+#define DVBPSI_CONTENT_SPECIAL_USERDEFINED      L1L2MERGE( _SPECIAL, 0xb )
+#define DVBPSI_CONTENT_SPECIAL_USERDEFINED1     L1L2MERGE( _SPECIAL, 0xc )
+#define DVBPSI_CONTENT_SPECIAL_USERDEFINED2     L1L2MERGE( _SPECIAL, 0xd )
+#define DVBPSI_CONTENT_SPECIAL_USERDEFINED3     L1L2MERGE( _SPECIAL, 0xe )
+#define DVBPSI_CONTENT_SPECIAL_USERDEFINED4     L1L2MERGE( _SPECIAL, 0xf )
+#undef L1L2MERGE
+
+/*****************************************************************************
+ * dvbpsi_content_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_content_s
+ * \brief  Content nibble structure.
+ *
+ * This structure is used since content_descriptor will contain several
+ * content nibbles pairs.
+ */
+/*!
+ * \typedef struct dvbpsi_content_s dvbpsi_content_t
+ * \brief dvbpsi_content_t type definition.
+ */
+typedef struct dvbpsi_content_s
+{
+  uint8_t       i_type;            /*!< content nibble level 1+2 (4+4bits)*/
+  uint8_t       i_user_byte;       /*!< defined by broadcaster */
+
+} dvbpsi_content_t;
+
+
+/*****************************************************************************
+ * dvbpsi_content_dr_t
+ *****************************************************************************/
+/*!
+ * \struct dvbpsi_content_dr_s
+ * \brief "content" descriptor structure.
+ *
+ * This structure is used to store a decoded "content"
+ * descriptor. (ETSI EN 300 468 section 6.2.9).
+ */
+/*!
+ * \typedef struct dvbpsi_content_dr_s dvbpsi_content_dr_t
+ * \brief dvbpsi_content_dr_t type definition.
+ */
+typedef struct dvbpsi_content_dr_s
+{
+  uint8_t       i_contents_number;   /*!< number of content */
+  dvbpsi_content_t p_content[64];   /*!< parental rating table */
+
+} dvbpsi_content_dr_t;
+
+
+/*****************************************************************************
+ * dvbpsi_DecodeContentDataDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_content_dr_t * dvbpsi_DecodeContentDr(
+                                        dvbpsi_descriptor_t * p_descriptor)
+ * \brief "content" descriptor decoder.
+ * \param p_descriptor pointer to the descriptor structure
+ * \return a pointer to a new "content" descriptor structure
+ * which contains the decoded data.
+ */
+dvbpsi_content_dr_t* dvbpsi_DecodeContentDr(
+                                        dvbpsi_descriptor_t * p_descriptor);
+
+
+/*****************************************************************************
+ * dvbpsi_GenContentDataDr
+ *****************************************************************************/
+/*!
+ * \fn dvbpsi_descriptor_t * dvbpsi_GenContentDr(
+                        dvbpsi_content_dr_t * p_decoded, bool b_duplicate)
+ * \brief "content" descriptor generator.
+ * \param p_decoded pointer to a decoded "content" descriptor
+ * structure
+ * \param b_duplicate if true 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_GenContentDr(
+                                        dvbpsi_content_dr_t * p_decoded,
+                                        bool b_duplicate);
+
+
+#ifdef __cplusplus
+};
+#endif
+
+#else
+#error "Multiple inclusions of dr_55.h"
+#endif
+