Re: [PATCH] Implement support for the smoothing buffer descriptor (0x10)

Patch applied, thanks for contributing.

Kind regards,

Jean-Paul Saman

On Sun, Mar 1, 2015 at 9:46 PM, Daniel Kamil Kozar <[email protected]> wrote:

> This patch adds support for the smoothing buffer descriptor, as described
> in
> the latest (10/2014) ISO/IEC 13818-1 specification.
> Comments welcome.
> ---
>  src/Makefile.am         |  2 ++
>  src/descriptors/dr_10.c | 89
> +++++++++++++++++++++++++++++++++++++++++++++++++
>  src/descriptors/dr_10.h | 81 ++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 172 insertions(+)
>  create mode 100644 src/descriptors/dr_10.c
>  create mode 100644 src/descriptors/dr_10.h
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 43011bc..ab4751f 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -34,6 +34,7 @@ pkginclude_HEADERS = dvbpsi.h psi.h descriptor.h demux.h
> \
>                       descriptors/dr_0d.h \
>                       descriptors/dr_0e.h \
>                       descriptors/dr_0f.h \
> +                     descriptors/dr_10.h \
>                       descriptors/dr_13.h \
>                       descriptors/dr_14.h \
>                      descriptors/dr_40.h \
> @@ -88,6 +89,7 @@ descriptors_src = descriptors/dr_02.c \
>                    descriptors/dr_0d.c \
>                    descriptors/dr_0e.c \
>                    descriptors/dr_0f.c \
> +                  descriptors/dr_10.c \
>                    descriptors/dr_13.c \
>                    descriptors/dr_14.c \
>                   descriptors/dr_40.c \
> diff --git a/src/descriptors/dr_10.c b/src/descriptors/dr_10.c
> new file mode 100644
> index 0000000..ff83eb8
> --- /dev/null
> +++ b/src/descriptors/dr_10.c
> @@ -0,0 +1,89 @@
> +/*
> +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_10.h"
> +
> +dvbpsi_smoothing_buffer_dr_t* dvbpsi_DecodeSmoothingBufferDr(
> +                                      dvbpsi_descriptor_t * p_descriptor)
> +{
> +    dvbpsi_smoothing_buffer_dr_t * p_decoded;
> +
> +    /* check the tag. */
> +    if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x10))
> +        return NULL;
> +
> +    /* don't decode twice. */
> +    if (dvbpsi_IsDescriptorDecoded(p_descriptor))
> +        return p_descriptor->p_decoded;
> +
> +    /* all descriptors of this type have 6 bytes of payload. */
> +    if (p_descriptor->i_length != 6)
> +        return NULL;
> +
> +    p_decoded = (dvbpsi_smoothing_buffer_dr_t*)malloc(sizeof(*p_decoded));
> +    if (!p_decoded)
> +        return NULL;
> +
> +    p_decoded->i_sb_leak_rate =
> +        (((uint32_t)p_descriptor->p_data[0] & 0x3f) << 16)
> +        | ((uint32_t)p_descriptor->p_data[1] << 8)
> +        | p_descriptor->p_data[2];
> +
> +    p_decoded->i_sb_size =
> +        (((uint32_t)p_descriptor->p_data[3] & 0x3f) << 16)
> +        | ((uint32_t)p_descriptor->p_data[4] << 8)
> +        | p_descriptor->p_data[5];
> +
> +    p_descriptor->p_decoded = (void*)p_decoded;
> +
> +    return p_decoded;
> +}
> +
> +dvbpsi_descriptor_t * dvbpsi_GenSmoothingBufferDr(
> +                                      dvbpsi_smoothing_buffer_dr_t *
> p_decoded)
> +{
> +    dvbpsi_descriptor_t * p_descriptor = dvbpsi_NewDescriptor(0x10, 6,
> NULL);
> +    if (!p_descriptor)
> +        return NULL;
> +
> +    /* encode the data, making sure the reserved fields are set to all
> ones. */
> +    p_descriptor->p_data[0] = (p_decoded->i_sb_leak_rate >> 16) | 0xc0;
> +    p_descriptor->p_data[1] = p_decoded->i_sb_leak_rate >> 8;
> +    p_descriptor->p_data[2] = p_decoded->i_sb_leak_rate;
> +
> +    p_descriptor->p_data[3] = (p_decoded->i_sb_size >> 16) | 0xc0;
> +    p_descriptor->p_data[4] = p_decoded->i_sb_size >> 8;
> +    p_descriptor->p_data[5] = p_decoded->i_sb_size;
> +
> +    return p_descriptor;
> +}
> diff --git a/src/descriptors/dr_10.h b/src/descriptors/dr_10.h
> new file mode 100644
> index 0000000..d2a4f22
> --- /dev/null
> +++ b/src/descriptors/dr_10.h
> @@ -0,0 +1,81 @@
> +/*
> +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_10.h>
> + * \author Daniel Kamil Kozar <[email protected]>
> + * \brief Application interface for the MPEG-2 smoothing buffer descriptor
> + * decoder and generator.
> + *
> + * Application interface for the MPEG-2 smoothing buffer descriptor
> decoder and
> + * generator. This descriptor's definition can be found in ISO/IEC 13818-1
> + * revision 2014/10 section 2.6.30.
> + */
> +
> +#ifndef _DVBPSI_DR_10_H_
> +#define _DVBPSI_DR_10_H_
> +
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
> +
> +/*!
> + * \struct dvbpsi_smoothing_buffer_dr_s
> + * \brief Smoothing buffer descriptor structure.
> + *
> + * This structure is used to store a decoded smoothing buffer descriptor.
> + * (ISO/IEC 13818-1 section 2.6.30).
> + */
> +
> +/*!
> + * \typedef struct dvbpsi_smoothing_buffer_dr_s
> dvbpsi_smoothing_buffer_dr_t
> + * \brief dvbpsi_smoothing_buffer_dr_t type definition.
> + */
> +typedef struct dvbpsi_smoothing_buffer_dr_s
> +{
> +  /*! Value of the leak rate out of the SBn buffer, in units of 400
> bits/s. */
> +  uint32_t      i_sb_leak_rate;
> +
> +  /*! Value of the size of the multiplexing buffer smoothing buffer SBn.
> */
> +  uint32_t      i_sb_size;
> +} dvbpsi_smoothing_buffer_dr_t;
> +
> +/*!
> + * \brief Smoothing buffer descriptor decoder.
> + * \param p_descriptor pointer to the descriptor structure
> + * \return A pointer to a new smoothing buffer descriptor structure which
> + * contains the decoded data.
> + */
> +dvbpsi_smoothing_buffer_dr_t* dvbpsi_DecodeSmoothingBufferDr(
> +                                      dvbpsi_descriptor_t * p_descriptor);
> +
> +/*!
> + * \brief Smoothing buffer descriptor generator.
> + * \param p_decoded pointer to a decoded smoothing buffer descriptor
> structure.
> + * \return a pointer to a new descriptor structure which contains encoded
> data.
> + */
> +dvbpsi_descriptor_t * dvbpsi_GenSmoothingBufferDr(
> +                                      dvbpsi_smoothing_buffer_dr_t *
> p_decoded);
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#else
> +#error "Multiple inclusions of dr_10.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