Re: [PATCH] Support for the IBP descriptor (0x12)

On Tue, Mar 3, 2015 at 9:25 PM, Daniel Kamil Kozar <[email protected]> wrote:

> This patch adds support for decoding and generating the IBP descriptor
> (0x12),
> as specified in ISO/IEC 13818-1 10/2014.
>

Same here, please split of dvbinfo changes from the rest of the patch.

Kind regards,

Jean-Paul Saman.


> ---
>  examples/dvbinfo/libdvbpsi.c | 13 +++++++
>  src/Makefile.am              |  2 +
>  src/descriptors/dr.h         |  1 +
>  src/descriptors/dr_12.c      | 88
> ++++++++++++++++++++++++++++++++++++++++++++
>  src/descriptors/dr_12.h      | 77 ++++++++++++++++++++++++++++++++++++++
>  5 files changed, 181 insertions(+)
>  create mode 100644 src/descriptors/dr_12.c
>  create mode 100644 src/descriptors/dr_12.h
>
> diff --git a/examples/dvbinfo/libdvbpsi.c b/examples/dvbinfo/libdvbpsi.c
> index ae976e9..b1b8fbf 100644
> --- a/examples/dvbinfo/libdvbpsi.c
> +++ b/examples/dvbinfo/libdvbpsi.c
> @@ -961,6 +961,16 @@ static void
> DumpSmoothingBufferDescriptor(dvbpsi_smoothing_buffer_dr_t *smoothin
>  }
>
>
>  /*****************************************************************************
> + * DumpIBPDescriptor
> +
> *****************************************************************************/
> +static void DumpIBPDescriptor(dvbpsi_ibp_dr_t *ibp_descriptor)
> +{
> +    printf("Closed GOP flag: %d \n", ibp_descriptor->b_closed_gop_flag);
> +    printf("Identical GOP flag: %d \n",
> ibp_descriptor->b_identical_gop_flag);
> +    printf("Max GOP length: %" PRIu16 " \n",
> ibp_descriptor->i_max_gop_length);
> +}
> +
>
> +/*****************************************************************************
>   * DumpSystemClockDescriptor
>
> *****************************************************************************/
>  static void DumpSystemClockDescriptor(dvbpsi_system_clock_dr_t*
> p_clock_descriptor)
> @@ -1520,6 +1530,9 @@ static void DumpDescriptors(const char* str,
> dvbpsi_descriptor_t* p_descriptor)
>              case 0x10:
>
>  DumpSmoothingBufferDescriptor(dvbpsi_DecodeSmoothingBufferDr(p_descriptor));
>                  break;
> +            case 0x12:
> +                DumpIBPDescriptor(dvbpsi_DecodeIBPDr(p_descriptor));
> +                break;
>              case 0x4c:
>
>  DumpTimeShiftedServiceDescriptor(dvbpsi_DecodeTimeShiftedServiceDr(p_descriptor));
>                  break;
> diff --git a/src/Makefile.am b/src/Makefile.am
> index b6432ee..139fbda 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_12.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_12.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..5031398 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_12.h"
>  #include "dr_13.h"
>  #include "dr_14.h"
>  #include "dr_40.h"
> diff --git a/src/descriptors/dr_12.c b/src/descriptors/dr_12.c
> new file mode 100644
> index 0000000..9292630
> --- /dev/null
> +++ b/src/descriptors/dr_12.c
> @@ -0,0 +1,88 @@
> +/*
> +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_12.h"
> +
> +dvbpsi_ibp_dr_t* dvbpsi_DecodeIBPDr(dvbpsi_descriptor_t * p_descriptor)
> +{
> +    dvbpsi_ibp_dr_t * p_decoded;
> +
> +    /* check the tag. */
> +    if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x12))
> +        return NULL;
> +
> +    /* don't decode twice. */
> +    if (dvbpsi_IsDescriptorDecoded(p_descriptor))
> +        return p_descriptor->p_decoded;
> +
> +    /* all descriptors of this type have 2 bytes of payload. */
> +    if (p_descriptor->i_length != 2)
> +        return NULL;
> +
> +    p_decoded = (dvbpsi_ibp_dr_t*)malloc(sizeof(*p_decoded));
> +    if (!p_decoded)
> +        return NULL;
> +
> +    p_decoded->b_closed_gop_flag = p_descriptor->p_data[0] & 0x80;
> +    p_decoded->b_identical_gop_flag = p_descriptor->p_data[0] & 0x40;
> +    p_decoded->i_max_gop_length =
> +        (((uint16_t)p_descriptor->p_data[0] & 0x3f) << 8)
> +        | p_descriptor->p_data[1];
> +
> +    /* a value of 0 is forbidden for max_gop_length. */
> +    if(p_decoded->i_max_gop_length == 0)
> +    {
> +        free(p_decoded);
> +        return NULL;
> +    }
> +
> +    p_descriptor->p_decoded = (void*)p_decoded;
> +
> +    return p_decoded;
> +}
> +
> +dvbpsi_descriptor_t * dvbpsi_GenIBPDr(dvbpsi_ibp_dr_t * p_decoded)
> +{
> +    dvbpsi_descriptor_t * p_descriptor = dvbpsi_NewDescriptor(0x12, 2,
> NULL);
> +    if (!p_descriptor)
> +        return NULL;
> +
> +    /* encode the data. */
> +    p_descriptor->p_data[0]  = p_decoded->b_closed_gop_flag << 7;
> +    p_descriptor->p_data[0] |= p_decoded->b_identical_gop_flag << 6;
> +    p_descriptor->p_data[0] |= p_decoded->i_max_gop_length >> 8;
> +
> +    p_descriptor->p_data[1] = p_decoded->i_max_gop_length;
> +
> +    return p_descriptor;
> +}
> diff --git a/src/descriptors/dr_12.h b/src/descriptors/dr_12.h
> new file mode 100644
> index 0000000..ac7303f
> --- /dev/null
> +++ b/src/descriptors/dr_12.h
> @@ -0,0 +1,77 @@
> +/*
> +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_12.h>
> + * \author Daniel Kamil Kozar <[email protected]>
> + * \brief Application interface for the MPEG-2 IBP descriptor decoder and
> + * generator.
> + *
> + * Application interface for the MPEG-2 IBP descriptor decoder and
> generator.
> + * This descriptor's definition can be found in ISO/IEC 13818-1 revision
> 2014/10
> + * section 2.6.34.
> + */
> +
> +#ifndef _DVBPSI_DR_12_H_
> +#define _DVBPSI_DR_12_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +/*!
> + * \struct dvbpsi_ibp_dr_s
> + * \brief IBP descriptor structure.
> + *
> + * This structure is used to store a decoded IBP descriptor. (ISO/IEC
> 13818-1
> + * section 2.6.34).
> + */
> +
> +/*!
> + * \typedef struct dvbpsi_ibp_dr_s dvbpsi_ibp_dr_t
> + * \brief dvbpsi_ibp_dr_s type definition.
> + */
> +typedef struct dvbpsi_ibp_dr_s
> +{
> +  bool          b_closed_gop_flag; /*!< closed_gop_flag */
> +  bool          b_identical_gop_flag; /*!< identical_gop_flag */
> +  uint16_t      i_max_gop_length; /*!< max_gop_length */
> +} dvbpsi_ibp_dr_t;
> +
> +/*!
> + * \brief IBP descriptor decoder.
> + * \param p_descriptor pointer to the descriptor structure
> + * \return A pointer to a new IBP descriptor structure which contains the
> + * decoded data.
> + */
> +dvbpsi_ibp_dr_t* dvbpsi_DecodeIBPDr(dvbpsi_descriptor_t * p_descriptor);
> +
> +/*!
> + * \brief IBP descriptor generator.
> + * \param p_decoded pointer to a decoded IBP descriptor structure.
> + * \return a pointer to a new descriptor structure which contains encoded
> data.
> + */
> +dvbpsi_descriptor_t * dvbpsi_GenIBPDr(dvbpsi_ibp_dr_t * p_decoded);
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#else
> +#error "Multiple inclusions of dr_12.h"
> +#endif
> --
> 2.3.1
>
> _______________________________________________
> libdvbpsi-devel mailing list
> [email protected]
> https://mailman.videolan.org/listinfo/libdvbpsi-devel
>

_______________________________________________
libdvbpsi-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/libdvbpsi-devel