dr_04.c   dr_04.c 
/************************************************************************** *** /************************************************************************** ***
* dr_04.c * dr_04.c
* Copyright (C) 2001-2010 VideoLAN * Copyright (C) 2001-2011 VideoLAN
* $Id: dr_04.c,v 1.3 2003/07/25 20:20:40 fenrir Exp $ * $Id: dr_04.c,v 1.3 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 51 skipping to change at line 52
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_DecodeHierarchyDr * dvbpsi_DecodeHierarchyDr
************************************************************************** ***/ ************************************************************************** ***/
dvbpsi_hierarchy_dr_t * dvbpsi_DecodeHierarchyDr( dvbpsi_hierarchy_dr_t * dvbpsi_DecodeHierarchyDr(
dvbpsi_descriptor_t * p_descriptor) dvbpsi_descriptor_t * p_descriptor)
{ {
dvbpsi_hierarchy_dr_t * p_decoded; dvbpsi_hierarchy_dr_t * p_decoded;
/* Check the tag */ /* Check the tag */
if(p_descriptor->i_tag != 0x04) if (!dvbpsi_CanDecodeAsDescriptor(p_descriptor, 0x04))
{ return NULL;
DVBPSI_ERROR_ARG("dr_04 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_hierarchy_dr_t*)malloc(sizeof(dvbpsi_hierarchy_dr_t)) ; p_decoded = (dvbpsi_hierarchy_dr_t*)malloc(sizeof(dvbpsi_hierarchy_dr_t)) ;
if(!p_decoded) if(!p_decoded) return NULL;
{
DVBPSI_ERROR("dr_04 decoder", "out of memory");
return NULL;
}
/* Decode data and check the length */ /* Decode data and check the length */
if(p_descriptor->i_length != 4) if(p_descriptor->i_length != 4)
{ {
DVBPSI_ERROR_ARG("dr_04 decoder", "bad length (%d)",
p_descriptor->i_length);
free(p_decoded); free(p_decoded);
return NULL; return NULL;
} }
p_decoded->i_h_type = p_descriptor->p_data[0] & 0x0f; p_decoded->i_h_type = p_descriptor->p_data[0] & 0x0f;
p_decoded->i_h_layer_index = p_descriptor->p_data[1] & 0x3f; p_decoded->i_h_layer_index = p_descriptor->p_data[1] & 0x3f;
p_decoded->i_h_embedded_layer = p_descriptor->p_data[2] & 0x3f; p_decoded->i_h_embedded_layer = p_descriptor->p_data[2] & 0x3f;
p_decoded->i_h_priority = p_descriptor->p_data[3] & 0x3f; p_decoded->i_h_priority = p_descriptor->p_data[3] & 0x3f;
p_descriptor->p_decoded = (void*)p_decoded; p_descriptor->p_decoded = (void*)p_decoded;
return p_decoded; return p_decoded;
} }
/************************************************************************** *** /************************************************************************** ***
* dvbpsi_GenHierarchyDr * dvbpsi_GenHierarchyDr
************************************************************************** ***/ ************************************************************************** ***/
dvbpsi_descriptor_t * dvbpsi_GenHierarchyDr(dvbpsi_hierarchy_dr_t * p_decod ed, dvbpsi_descriptor_t * dvbpsi_GenHierarchyDr(dvbpsi_hierarchy_dr_t * p_decod ed,
int b_duplicate) bool b_duplicate)
{ {
/* Create the descriptor */ /* Create the descriptor */
dvbpsi_descriptor_t * p_descriptor = dvbpsi_NewDescriptor(0x04, 4, NULL); dvbpsi_descriptor_t * p_descriptor = dvbpsi_NewDescriptor(0x04, 4, NULL
);
if (!p_descriptor)
return NULL;
if(p_descriptor)
{
/* Encode data */ /* Encode data */
p_descriptor->p_data[0] = 0xf0 | p_decoded->i_h_type; p_descriptor->p_data[0] = 0xf0 | p_decoded->i_h_type;
p_descriptor->p_data[1] = 0xc0 | p_decoded->i_h_layer_index; p_descriptor->p_data[1] = 0xc0 | p_decoded->i_h_layer_index;
p_descriptor->p_data[2] = 0xc0 | p_decoded->i_h_embedded_layer; p_descriptor->p_data[2] = 0xc0 | p_decoded->i_h_embedded_layer;
p_descriptor->p_data[3] = 0xc0 | p_decoded->i_h_priority; p_descriptor->p_data[3] = 0xc0 | p_decoded->i_h_priority;
if(b_duplicate) if (b_duplicate)
{ {
/* Duplicate decoded data */ /* Duplicate decoded data */
dvbpsi_hierarchy_dr_t * p_dup_decoded = p_descriptor->p_decoded =
(dvbpsi_hierarchy_dr_t*)malloc(sizeof(dvbpsi_hierarchy_dr_t dvbpsi_DuplicateDecodedDescriptor(p_decoded,
)); sizeof(dvbpsi_hierarchy_d
if(p_dup_decoded) r_t));
memcpy(p_dup_decoded, p_decoded, sizeof(dvbpsi_hierarchy_dr_t));
p_descriptor->p_decoded = (void*)p_dup_decoded;
} }
}
return p_descriptor; return p_descriptor;
} }
 End of changes. 13 change blocks. 
32 lines changed or deleted 20 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/