Diff: dr_59.c - dr

	dr_59.c	dr_59.c
	/************************************************************************ *	/************************************************************************ *
	* dr_59.c	* dr_59.c

	* Copyright (C) 2001-2010 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id$	* $Id$
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	* Tristan Leteurtre <tristan.leteurtre@anevia.com>	* Tristan Leteurtre <tristan.leteurtre@anevia.com>
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*

	skipping to change at line 29	skipping to change at line 29
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1 USA	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130 1 USA
	*	*
	************************************************************************ */	************************************************************************ */

	#include "config.h"	#include "config.h"

	#include <stdio.h>	#include <stdio.h>
	#include <stdlib.h>	#include <stdlib.h>

		#include <stdbool.h>
	#include <string.h>	#include <string.h>

	#if defined(HAVE_INTTYPES_H)	#if defined(HAVE_INTTYPES_H)
	#include <inttypes.h>	#include <inttypes.h>
	#elif defined(HAVE_STDINT_H)	#elif defined(HAVE_STDINT_H)
	#include <stdint.h>	#include <stdint.h>
	#endif	#endif

	#include "../dvbpsi.h"	#include "../dvbpsi.h"
	#include "../dvbpsi_private.h"	#include "../dvbpsi_private.h"
	#include "../descriptor.h"	#include "../descriptor.h"

	#include "dr_59.h"	#include "dr_59.h"

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DecodeSubtitlingDr	* dvbpsi_DecodeSubtitlingDr
	************************************************************************ */	************************************************************************ */
	dvbpsi_subtitling_dr_t * dvbpsi_DecodeSubtitlingDr(	dvbpsi_subtitling_dr_t * dvbpsi_DecodeSubtitlingDr(
	dvbpsi_descriptor_t * p_descriptor)	dvbpsi_descriptor_t * p_descriptor)
	{	{

	int i_subtitles_number, i;	int i_subtitles_number;
	dvbpsi_subtitling_dr_t * p_decoded;	dvbpsi_subtitling_dr_t * p_decoded;


	/* Check the tag */	/* Check the tag */
	if(p_descriptor->i_tag != 0x59)	if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x59))
	{	return NULL;
	DVBPSI_ERROR_ARG("dr_59 decoder", "bad tag (0x%x)", p_descriptor->i_tag
	);
	return NULL;
	}

	/* Don't decode twice */
	if(p_descriptor->p_decoded)
	return p_descriptor->p_decoded;

	/* Allocate memory */
	p_decoded =
	(dvbpsi_subtitling_dr_t*)malloc(sizeof(dvbpsi_subtitling_dr_t));
	if(!p_decoded)
	{
	DVBPSI_ERROR("dr_59 decoder", "out of memory");
	return NULL;
	}

	/* Decode data and check the length */
	if(p_descriptor->i_length < 3)
	{
	DVBPSI_ERROR_ARG("dr_59 decoder", "bad length (%d)",
	p_descriptor->i_length);
	free(p_decoded);
	return NULL;
	}

	if(p_descriptor->i_length % 8)
	{
	DVBPSI_ERROR_ARG("dr_59 decoder", "length not multiple of 8 (%d)",
	p_descriptor->i_length);
	free(p_decoded);
	return NULL;
	}

	i_subtitles_number = p_descriptor->i_length / 8;

	p_decoded->i_subtitles_number = i_subtitles_number;

	for (i=0; i < i_subtitles_number; i++)
	{
	memcpy(p_decoded->p_subtitle[i].i_iso6392_language_code,
	p_descriptor->p_data + 8 * i, 3);

	p_decoded->p_subtitle[i].i_subtitling_type =
	p_descriptor->p_data[8 * i + 3];

	p_decoded->p_subtitle[i].i_composition_page_id =
	((uint16_t)(p_descriptor->p_data[8 * i + 4]) << 8)
	\| p_descriptor->p_data[8 * i + 5];

	p_decoded->p_subtitle[i].i_ancillary_page_id =
	((uint16_t)(p_descriptor->p_data[8 * i + 6]) << 8)
	\| p_descriptor->p_data[8 * i + 7];
	}


	p_descriptor->p_decoded = (void*)p_decoded;	/* Don't decode twice */
		if (dvbpsi_IsDescriptorDecoded(p_descriptor))
		return p_descriptor->p_decoded;


	return p_decoded;	/* Decode data and check the length */
		if (p_descriptor->i_length < 3)
		return NULL;

		if (p_descriptor->i_length % 8)
		return NULL;

		/* Allocate memory */
		p_decoded = (dvbpsi_subtitling_dr_t*)malloc(sizeof(dvbpsi_subtitling_dr
		_t));
		if (!p_decoded)
		return NULL;

		i_subtitles_number = p_descriptor->i_length / 8;

		p_decoded->i_subtitles_number = i_subtitles_number;

		for (int i = 0; i < i_subtitles_number; i++)
		{
		memcpy(p_decoded->p_subtitle[i].i_iso6392_language_code,
		p_descriptor->p_data + 8 * i, 3);

		p_decoded->p_subtitle[i].i_subtitling_type =
		p_descriptor->p_data[8 * i + 3];

		p_decoded->p_subtitle[i].i_composition_page_id =
		((uint16_t)(p_descriptor->p_data[8 * i + 4]) << 8)
		\| p_descriptor->p_data[8 * i + 5];

		p_decoded->p_subtitle[i].i_ancillary_page_id =
		((uint16_t)(p_descriptor->p_data[8 * i + 6]) << 8)
		\| p_descriptor->p_data[8 * i + 7];
		}

		p_descriptor->p_decoded = (void*)p_decoded;

		return p_decoded;
	}	}

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenSubtitlingDr	* dvbpsi_GenSubtitlingDr
	************************************************************************ */	************************************************************************ */
	dvbpsi_descriptor_t * dvbpsi_GenSubtitlingDr(	dvbpsi_descriptor_t * dvbpsi_GenSubtitlingDr(
	dvbpsi_subtitling_dr_t * p_decoded,	dvbpsi_subtitling_dr_t * p_decoded,

	int b_duplicate)	bool b_duplicate)
	{	{

	int i;	/* Create the descriptor */
		dvbpsi_descriptor_t * p_descriptor =
	/* Create the descriptor */	dvbpsi_NewDescriptor(0x59, p_decoded->i_subtitles_number * 8 ,
	dvbpsi_descriptor_t * p_descriptor =	NULL);
	dvbpsi_NewDescriptor(0x59, p_decoded->i_subtitles_number * 8 , NULL);	if (!p_descriptor)
		return NULL;


	if(p_descriptor)
	{
	/* Encode data */	/* Encode data */

	for (i=0; i < p_decoded->i_subtitles_number; i++ )	for (int i = 0; i < p_decoded->i_subtitles_number; i++ )
	{	{

	memcpy( p_descriptor->p_data + 8 * i,	memcpy( p_descriptor->p_data + 8 * i,
	p_decoded->p_subtitle[i].i_iso6392_language_code,	p_decoded->p_subtitle[i].i_iso6392_language_code,
	3);	3);

	p_descriptor->p_data[8 * i + 3] =	p_descriptor->p_data[8 * i + 3] =
	p_decoded->p_subtitle[i].i_subtitling_typ	p_decoded->p_subtitle[i].i_subtitling_type;
	e;
		p_descriptor->p_data[8 * i + 4] =
	p_descriptor->p_data[8 * i + 4] =	p_decoded->p_subtitle[i].i_composition_page_id >> 8;
	p_decoded->p_subtitle[i].i_composition_page_id >	p_descriptor->p_data[8 * i + 5] =
	> 8;	p_decoded->p_subtitle[i].i_composition_page_id % 0xFF;
	p_descriptor->p_data[8 * i + 5] =
	p_decoded->p_subtitle[i].i_composition_page_id %	p_descriptor->p_data[8 * i + 6] =
	0xFF;	p_decoded->p_subtitle[i].i_ancillary_page_id >> 8;
		p_descriptor->p_data[8 * i + 7] =
	p_descriptor->p_data[8 * i + 6] =	p_decoded->p_subtitle[i].i_ancillary_page_id % 0xFF;
	p_decoded->p_subtitle[i].i_ancillary_page_id >>
	8;
	p_descriptor->p_data[8 * i + 7] =
	p_decoded->p_subtitle[i].i_ancillary_page_id % 0
	xFF;
	}	}


	if(b_duplicate)	if (b_duplicate)
	{	{

	/* Duplicate decoded data */	/* Duplicate decoded data */
	dvbpsi_subtitling_dr_t * p_dup_decoded =	p_descriptor->p_decoded =
	(dvbpsi_subtitling_dr_t*)malloc(sizeof(dvbpsi_subtitling_dr_t));	dvbpsi_DuplicateDecodedDescriptor(p_decoded,
	if(p_dup_decoded)	sizeof(dvbpsi_subtitling_
	memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_subtitling_dr_t));	dr_t));

	p_descriptor->p_decoded = (void*)p_dup_decoded;
	}	}

	}


	return p_descriptor;	return p_descriptor;
	}	}

End of changes. 15 change blocks.
	103 lines changed or deleted	78 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/