Diff: dr_02.c - dr

	dr_02.c	dr_02.c
	/************************************************************************ *	/************************************************************************ *
	* dr_02.c	* dr_02.c

	* Copyright (C) 2001-2010 VideoLAN	* Copyright (C) 2001-2011 VideoLAN
	* $Id: dr_02.c,v 1.7 2003/07/25 20:20:40 fenrir Exp $	* $Id: dr_02.c,v 1.7 2003/07/25 20:20:40 fenrir Exp $
	*	*
	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>	* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
	*	*
	* 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.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,

	skipping to change at line 28	skipping to change at line 28
	* 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"

	skipping to change at line 50	skipping to change at line 51
	#include "dr_02.h"	#include "dr_02.h"

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_DecodeVStreamDr	* dvbpsi_DecodeVStreamDr
	************************************************************************ */	************************************************************************ */
	dvbpsi_vstream_dr_t * dvbpsi_DecodeVStreamDr(dvbpsi_descriptor_t * p_descri ptor)	dvbpsi_vstream_dr_t * dvbpsi_DecodeVStreamDr(dvbpsi_descriptor_t * p_descri ptor)
	{	{
	dvbpsi_vstream_dr_t * p_decoded;	dvbpsi_vstream_dr_t * p_decoded;

	/* Check the tag */	/* Check the tag */

	if(p_descriptor->i_tag != 0x02)	if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x02))
	{	return NULL;
	DVBPSI_ERROR_ARG("dr_02 decoder", "bad tag (0x%x)", p_descriptor->i_tag
	);
	return NULL;
	}

	/* Don't decode twice */	/* Don't decode twice */

	if(p_descriptor->p_decoded)	if (dvbpsi_IsDescriptorDecoded(p_descriptor))
	return p_descriptor->p_decoded;	return p_descriptor->p_decoded;

	/* Allocate memory */	/* Allocate memory */
	p_decoded = (dvbpsi_vstream_dr_t*)malloc(sizeof(dvbpsi_vstream_dr_t));	p_decoded = (dvbpsi_vstream_dr_t*)malloc(sizeof(dvbpsi_vstream_dr_t));

	if(!p_decoded)	if(!p_decoded) return NULL;
	{
	DVBPSI_ERROR("dr_02 decoder", "out of memory");
	return NULL;
	}

	/* Decode data and check the length */	/* Decode data and check the length */

	p_decoded->b_mpeg2 = (p_descriptor->p_data[0] & 0x04) ? 1 : 0;	p_decoded->b_mpeg2 = (p_descriptor->p_data[0] & 0x04) ? true : false;

	if( (!p_decoded->b_mpeg2 && (p_descriptor->i_length != 1))	if( (!p_decoded->b_mpeg2 && (p_descriptor->i_length != 1))
	\|\| (p_decoded->b_mpeg2 && (p_descriptor->i_length != 3)))	\|\| (p_decoded->b_mpeg2 && (p_descriptor->i_length != 3)))
	{	{

	DVBPSI_ERROR_ARG("dr_02 decoder", "bad length (%d)",
	p_descriptor->i_length);
	free(p_decoded);	free(p_decoded);


	return NULL;	return NULL;
	}	}


	p_decoded->b_multiple_frame_rate = (p_descriptor->p_data[0] & 0x80) ? 1 : 0;	p_decoded->b_multiple_frame_rate = (p_descriptor->p_data[0] & 0x80) ? tru e : false;
	p_decoded->i_frame_rate_code = (p_descriptor->p_data[0] & 0x78) >> 3;	p_decoded->i_frame_rate_code = (p_descriptor->p_data[0] & 0x78) >> 3;

	p_decoded->b_constrained_parameter = (p_descriptor->p_data[0] & 0x02) ? 1	p_decoded->b_constrained_parameter = (p_descriptor->p_data[0] & 0x02) ? t
	: 0;	rue : false;
	p_decoded->b_still_picture = (p_descriptor->p_data[0] & 0x01) ? 1 : 0;	p_decoded->b_still_picture = (p_descriptor->p_data[0] & 0x01) ? true : fa
		lse;

	if(p_decoded->b_mpeg2)	if(p_decoded->b_mpeg2)
	{	{
	p_decoded->i_profile_level_indication = p_descriptor->p_data[1];	p_decoded->i_profile_level_indication = p_descriptor->p_data[1];
	p_decoded->i_chroma_format = (p_descriptor->p_data[2] & 0xc0) >> 6;	p_decoded->i_chroma_format = (p_descriptor->p_data[2] & 0xc0) >> 6;
	p_decoded->b_frame_rate_extension =	p_decoded->b_frame_rate_extension =

	(p_descriptor->p_data[2] & 0x20) ? 1 : 0;	(p_descriptor->p_data[2] & 0x20) ? true : f alse;
	}	}

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

	return p_decoded;	return p_decoded;
	}	}

	/************************************************************************ *	/************************************************************************ *
	* dvbpsi_GenVStreamDr	* dvbpsi_GenVStreamDr
	************************************************************************ */	************************************************************************ */
	dvbpsi_descriptor_t * dvbpsi_GenVStreamDr(dvbpsi_vstream_dr_t * p_decoded,	dvbpsi_descriptor_t * dvbpsi_GenVStreamDr(dvbpsi_vstream_dr_t * p_decoded,

	int b_duplicate)	bool b_duplicate)
	{	{

	/* Create the descriptor */	/* Create the descriptor */
	dvbpsi_descriptor_t * p_descriptor =	dvbpsi_descriptor_t * p_descriptor =
	dvbpsi_NewDescriptor(0x02, p_decoded->b_mpeg2 ? 3 : 1, NULL	dvbpsi_NewDescriptor(0x02, p_decoded->b_mpeg2 ? 3 : 1, NULL);
	);	if (!p_descriptor)
		return NULL;


	if(p_descriptor)
	{
	/* Encode data */	/* Encode data */
	p_descriptor->p_data[0] = 0;	p_descriptor->p_data[0] = 0;

	if(p_decoded->b_multiple_frame_rate)	if (p_decoded->b_multiple_frame_rate)
	p_descriptor->p_data[0] \|= 0x80;	p_descriptor->p_data[0] \|= 0x80;
	p_descriptor->p_data[0] \|= (p_decoded->i_frame_rate_code & 0x0f) << 3;	p_descriptor->p_data[0] \|= (p_decoded->i_frame_rate_code & 0x0f) << 3;

	if(p_decoded->b_constrained_parameter)	if (p_decoded->b_constrained_parameter)
	p_descriptor->p_data[0] \|= 0x02;	p_descriptor->p_data[0] \|= 0x02;
	if(p_decoded->b_still_picture)	if (p_decoded->b_still_picture)
	p_descriptor->p_data[0] \|= 0x01;	p_descriptor->p_data[0] \|= 0x01;


	if(p_decoded->b_mpeg2)	if (p_decoded->b_mpeg2)
	{	{

	p_descriptor->p_data[0] \|= 0x04;	p_descriptor->p_data[0] \|= 0x04;
	p_descriptor->p_data[1] = p_decoded->i_profile_level_indication;	p_descriptor->p_data[1] = p_decoded->i_profile_level_indication;
	p_descriptor->p_data[2] = 0x1f;	p_descriptor->p_data[2] = 0x1f;
	p_descriptor->p_data[2] \|= (p_decoded->i_chroma_format & 0x03) << 6;	p_descriptor->p_data[2] \|= (p_decoded->i_chroma_format & 0x03) << 6
	if(p_decoded->b_frame_rate_extension)	;
	p_descriptor->p_data[2] \|= 0x20;	if (p_decoded->b_frame_rate_extension)
		p_descriptor->p_data[2] \|= 0x20;
	}	}


	if(b_duplicate)	if (b_duplicate)
	{	{

	/* Duplicate decoded data */	/* Duplicate decoded data */
	dvbpsi_vstream_dr_t * p_dup_decoded =	p_descriptor->p_decoded =
	(dvbpsi_vstream_dr_t*)malloc(sizeof(dvbpsi_vstream_dr_t));	dvbpsi_DuplicateDecodedDescriptor(p_decoded,
	if(p_dup_decoded)	sizeof(dvbpsi_vstream_dr_
	memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_vstream_dr_t));	t));

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

	}


	return p_descriptor;	return p_descriptor;
	}	}

End of changes. 22 change blocks.
	54 lines changed or deleted	41 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/