[libdvbpsi-devel] [PATCH] Implement support for the STD descriptor (0x11)
Jean-Paul Saman
jpsaman at videolan.org
Wed Mar 4 15:59:53 CET 2015
On Mon, Mar 2, 2015 at 11:45 PM, Daniel Kamil Kozar <dkk089 at gmail.com>
wrote:
> This patch adds support for the STD descriptor, as specified in ISO/IEC
> 13818-1,
> revision 10/2014.
> I chose to add the appropriate dump function to dvbinfo and dr_11.h to dr.h
> along with the other changes. If this is not desired, please let me know.
>
Patch itself looks ok.
Please split of changes to dvbinfo example application into a separate
patch.
Kind regards,
Jean-Paul Saman
---
> examples/dvbinfo/libdvbpsi.c | 11 +++++++
> src/Makefile.am | 2 ++
> src/descriptors/dr.h | 1 +
> src/descriptors/dr_11.c | 73
> ++++++++++++++++++++++++++++++++++++++++++
> src/descriptors/dr_11.h | 75
> ++++++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 162 insertions(+)
>
> diff --git a/examples/dvbinfo/libdvbpsi.c b/examples/dvbinfo/libdvbpsi.c
> index ae976e9..90055d2 100644
> --- a/examples/dvbinfo/libdvbpsi.c
> +++ b/examples/dvbinfo/libdvbpsi.c
> @@ -961,6 +961,14 @@ static void
> DumpSmoothingBufferDescriptor(dvbpsi_smoothing_buffer_dr_t *smoothin
> }
>
>
> /*****************************************************************************
> + * DumpSTDDescriptor
> +
> *****************************************************************************/
> +static void DumpSTDDescriptor(dvbpsi_std_dr_t* std_descriptor)
> +{
> + printf("Leak valid flag: %d\n", std_descriptor->b_leak_valid_flag);
> +}
> +
>
> +/*****************************************************************************
> * DumpSystemClockDescriptor
>
> *****************************************************************************/
> static void DumpSystemClockDescriptor(dvbpsi_system_clock_dr_t*
> p_clock_descriptor)
> @@ -1520,6 +1528,9 @@ static void DumpDescriptors(const char* str,
> dvbpsi_descriptor_t* p_descriptor)
> case 0x10:
>
> DumpSmoothingBufferDescriptor(dvbpsi_DecodeSmoothingBufferDr(p_descriptor));
> break;
> + case 0x11:
> + DumpSTDDescriptor(dvbpsi_DecodeSTDDr(p_descriptor));
> + break;
> case 0x4c:
>
> DumpTimeShiftedServiceDescriptor(dvbpsi_DecodeTimeShiftedServiceDr(p_descriptor));
> break;
> 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.h b/src/descriptors/dr.h
> index 2ef0e9c..a27f3a3 100644
> --- a/src/descriptors/dr.h
> +++ b/src/descriptors/dr.h
> @@ -46,6 +46,7 @@
> #include "dr_0e.h"
> #include "dr_0f.h"
> #include "dr_10.h"
> +#include "dr_11.h"
> #include "dr_13.h"
> #include "dr_14.h"
> #include "dr_40.h"
> 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..7c4c480
> --- /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
> _______________________________________________
> libdvbpsi-devel mailing list
> libdvbpsi-devel at videolan.org
> https://mailman.videolan.org/listinfo/libdvbpsi-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/libdvbpsi-devel/attachments/20150304/a9601a1c/attachment.html>
More information about the libdvbpsi-devel
mailing list