[libdvbpsi-devel] [PATCH 1/3] add support for the STD descriptor

[Daniel Kamil Kozar]

---
 src/Makefile.am         |  2 ++
 src/descriptors/dr_11.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 src/descriptors/dr_11.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 150 insertions(+)
 create mode 100644 src/descriptors/dr_11.c
 create mode 100644 src/descriptors/dr_11.h

diff --git a/src/Makefile.am b/src/Makefile.am
index b6432ee..5f9204c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h \
                      descriptors/dr_0e.h \
                      descriptors/dr_0f.h \
                      descriptors/dr_10.h \
+                     descriptors/dr_11.h \
                      descriptors/dr_13.h \
                      descriptors/dr_14.h \
 		     descriptors/dr_40.h \
@@ -90,6 +91,7 @@ descriptors_src = descriptors/dr_02.c \
                   descriptors/dr_0e.c \
                   descriptors/dr_0f.c \
                   descriptors/dr_10.c \
+                  descriptors/dr_11.c \
                   descriptors/dr_13.c \
                   descriptors/dr_14.c \
 		  descriptors/dr_40.c \
diff --git a/src/descriptors/dr_11.c b/src/descriptors/dr_11.c
new file mode 100644
index 0000000..347935c
--- /dev/null
+++ b/src/descriptors/dr_11.c
@@ -0,0 +1,73 @@
+/*
+Copyright (C) 2015 Daniel Kamil Kozar
+
+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 <stdlib.h>
+#include <stdbool.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_11.h"
+
+dvbpsi_std_dr_t* dvbpsi_DecodeSTDDr(dvbpsi_descriptor_t * p_descriptor)
+{
+    dvbpsi_std_dr_t * p_decoded;
+    
+    /* check the tag. */
+    if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x11))
+        return NULL;
+    
+    /* don't decode twice. */
+    if (dvbpsi_IsDescriptorDecoded(p_descriptor))
+        return p_descriptor->p_decoded;
+    
+    /* all descriptors of this type have 1 byte of payload. */
+    if (p_descriptor->i_length != 1)
+        return NULL;
+    
+    p_decoded = (dvbpsi_std_dr_t*)malloc(sizeof(*p_decoded));
+    if (!p_decoded)
+        return NULL;
+    
+    p_decoded->b_leak_valid_flag = p_descriptor->p_data[0] & 0x01;
+    
+    p_descriptor->p_decoded = (void*)p_decoded;
+    
+    return p_decoded;
+}
+
+dvbpsi_descriptor_t * dvbpsi_GenSTDDr(dvbpsi_std_dr_t * p_decoded)
+{
+    dvbpsi_descriptor_t * p_descriptor = dvbpsi_NewDescriptor(0x11, 1, NULL);
+    if (!p_descriptor)
+        return NULL;
+    
+    /* encode the data, making sure the reserved fields are set to all ones. */
+    p_descriptor->p_data[0] = (0xfe | p_decoded->b_leak_valid_flag);
+    
+    return p_descriptor;
+}
diff --git a/src/descriptors/dr_11.h b/src/descriptors/dr_11.h
new file mode 100644
index 0000000..ae42f6f
--- /dev/null
+++ b/src/descriptors/dr_11.h
@@ -0,0 +1,75 @@
+/*
+Copyright (C) 2015 Daniel Kamil Kozar
+
+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_11.h>
+ * \author Daniel Kamil Kozar <dkk089 at gmail.com>
+ * \brief Application interface for the MPEG-2 STD descriptor decoder and
+ * generator.
+ *
+ * Application interface for the MPEG-2 STD descriptor decoder and generator.
+ * This descriptor's definition can be found in ISO/IEC 13818-1 revision 2014/10
+ * section 2.6.32.
+ */
+
+#ifndef _DVBPSI_DR_11_H_
+#define _DVBPSI_DR_11_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * \struct dvbpsi_std_dr_s
+ * \brief STD descriptor structure.
+ *
+ * This structure is used to store a decoded STD descriptor. (ISO/IEC 13818-1
+ * section 2.6.32).
+ */
+
+/*!
+ * \typedef struct dvbpsi_std_dr_s dvbpsi_std_dr_t
+ * \brief dvbpsi_std_dr_t type definition.
+ */
+typedef struct dvbpsi_std_dr_s
+{
+  bool          b_leak_valid_flag; /*!< leak_valid_flag */
+} dvbpsi_std_dr_t;
+
+/*!
+ * \brief STD descriptor decoder.
+ * \param p_descriptor pointer to the descriptor structure
+ * \return A pointer to a new STD descriptor structure which contains the
+ * decoded data.
+ */
+dvbpsi_std_dr_t* dvbpsi_DecodeSTDDr(dvbpsi_descriptor_t * p_descriptor);
+
+/*!
+ * \brief STD descriptor generator.
+ * \param p_decoded pointer to a decoded STD descriptor structure.
+ * \return a pointer to a new descriptor structure which contains encoded data.
+ */
+dvbpsi_descriptor_t * dvbpsi_GenSTDDr(dvbpsi_std_dr_t * p_decoded);
+
+#ifdef __cplusplus
+}
+#endif
+
+#else
+#error "Multiple inclusions of dr_11.h"
+#endif
-- 
2.3.1