Commit 5070805f authored by Jean-Paul Saman's avatar Jean-Paul Saman

ATSC: whitespace cleanup

parent 20f6f247
...@@ -56,7 +56,7 @@ typedef struct dvbpsi_frequency_list_dr_s ...@@ -56,7 +56,7 @@ typedef struct dvbpsi_frequency_list_dr_s
* dvbpsi_descriptor_t *p_descriptor) * dvbpsi_descriptor_t *p_descriptor)
* \brief Decode a Frequency List descriptor (tag 0x62) * \brief Decode a Frequency List descriptor (tag 0x62)
* \param p_descriptor Raw descriptor to decode. * \param p_descriptor Raw descriptor to decode.
* \return NULL if the descriptor could not be decoded or a pointer to a * \return NULL if the descriptor could not be decoded or a pointer to a
* dvbpsi_frequency_list_dr_t structure. * dvbpsi_frequency_list_dr_t structure.
*/ */
dvbpsi_frequency_list_dr_t *dvbpsi_DecodeFrequencyListDr(dvbpsi_descriptor_t *p_descriptor); dvbpsi_frequency_list_dr_t *dvbpsi_DecodeFrequencyListDr(dvbpsi_descriptor_t *p_descriptor);
......
...@@ -68,7 +68,7 @@ dvbpsi_data_broadcast_id_dr_t *dvbpsi_DecodeDataBroadcastIdDr(dvbpsi_descriptor_ ...@@ -68,7 +68,7 @@ dvbpsi_data_broadcast_id_dr_t *dvbpsi_DecodeDataBroadcastIdDr(dvbpsi_descriptor_
/* Check length */ /* Check length */
if (p_descriptor->i_length < 2) if (p_descriptor->i_length < 2)
return NULL; return NULL;
p_decoded = NewDataBroadcastDr(p_descriptor->i_length - 2); p_decoded = NewDataBroadcastDr(p_descriptor->i_length - 2);
if (!p_decoded) if (!p_decoded)
return NULL; return NULL;
......
...@@ -53,7 +53,7 @@ typedef struct dvbpsi_data_broadcast_id_dr_s ...@@ -53,7 +53,7 @@ typedef struct dvbpsi_data_broadcast_id_dr_s
* dvbpsi_descriptor_t *p_descriptor) * dvbpsi_descriptor_t *p_descriptor)
* \brief Decode a Data broadcast id descriptor (tag 0x66) * \brief Decode a Data broadcast id descriptor (tag 0x66)
* \param p_descriptor Raw descriptor to decode. * \param p_descriptor Raw descriptor to decode.
* \return NULL if the descriptor could not be decoded or a pointer to a * \return NULL if the descriptor could not be decoded or a pointer to a
* dvbpsi_data_broadcast_id_dr_t structure. * dvbpsi_data_broadcast_id_dr_t structure.
*/ */
dvbpsi_data_broadcast_id_dr_t *dvbpsi_DecodeDataBroadcastIdDr(dvbpsi_descriptor_t *p_descriptor); dvbpsi_data_broadcast_id_dr_t *dvbpsi_DecodeDataBroadcastIdDr(dvbpsi_descriptor_t *p_descriptor);
......
...@@ -47,7 +47,7 @@ dvbpsi_default_authority_dr_t *dvbpsi_DecodeDefaultAuthorityDr(dvbpsi_descriptor ...@@ -47,7 +47,7 @@ dvbpsi_default_authority_dr_t *dvbpsi_DecodeDefaultAuthorityDr(dvbpsi_descriptor
/* Don't decode twice */ /* Don't decode twice */
if (p_descriptor->p_decoded) if (p_descriptor->p_decoded)
return p_descriptor->p_decoded; return p_descriptor->p_decoded;
p_decoded = (dvbpsi_default_authority_dr_t*)malloc(sizeof(dvbpsi_default_authority_dr_t)); p_decoded = (dvbpsi_default_authority_dr_t*)malloc(sizeof(dvbpsi_default_authority_dr_t));
if (!p_decoded) if (!p_decoded)
return NULL; return NULL;
......
...@@ -48,7 +48,7 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript ...@@ -48,7 +48,7 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript
/* Don't decode twice */ /* Don't decode twice */
if (p_descriptor->p_decoded) if (p_descriptor->p_decoded)
return p_descriptor->p_decoded; return p_descriptor->p_decoded;
/* Check boundaries */ /* Check boundaries */
if (p_descriptor->i_length > ARRAY_SIZE(p_decoded->p_entries)) if (p_descriptor->i_length > ARRAY_SIZE(p_decoded->p_entries))
p_descriptor->i_length = ARRAY_SIZE(p_decoded->p_entries); p_descriptor->i_length = ARRAY_SIZE(p_decoded->p_entries);
...@@ -65,7 +65,7 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript ...@@ -65,7 +65,7 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript
entry->i_type = (p_descriptor->p_data[byte] >> 2) & 0x3f; entry->i_type = (p_descriptor->p_data[byte] >> 2) & 0x3f;
entry->i_location = p_descriptor->p_data[byte] & 3; entry->i_location = p_descriptor->p_data[byte] & 3;
byte ++; byte ++;
if (entry->i_location == CRID_LOCATION_DESCRIPTOR) if (entry->i_location == CRID_LOCATION_DESCRIPTOR)
{ {
uint8_t len = p_descriptor->p_data[byte]; uint8_t len = p_descriptor->p_data[byte];
...@@ -76,7 +76,7 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript ...@@ -76,7 +76,7 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript
byte ++; byte ++;
for (i = 0; i < len; i ++) for (i = 0; i < len; i ++)
{ {
entry->value.path[i] = p_descriptor->p_data[byte + i]; entry->value.path[i] = p_descriptor->p_data[byte + i];
} }
byte += len; byte += len;
entry->value.path[i] = 0; entry->value.path[i] = 0;
...@@ -85,7 +85,6 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript ...@@ -85,7 +85,6 @@ dvbpsi_content_id_dr_t *dvbpsi_DecodeContentIdDr(dvbpsi_descriptor_t *p_descript
{ {
entry->value.ref = (p_descriptor->p_data[byte] << 8) | p_descriptor->p_data[byte + 1]; entry->value.ref = (p_descriptor->p_data[byte] << 8) | p_descriptor->p_data[byte + 1];
byte += 2; byte += 2;
} }
else else
{ {
......
...@@ -35,7 +35,7 @@ extern "C" { ...@@ -35,7 +35,7 @@ extern "C" {
#define CRID_LOCATION_DESCRIPTOR 0 #define CRID_LOCATION_DESCRIPTOR 0
#define CRID_LOCATION_CIT 1 #define CRID_LOCATION_CIT 1
/***************************************************************************** /*****************************************************************************
* dvbpsi_lcn_entry_t * dvbpsi_lcn_entry_t
*****************************************************************************/ *****************************************************************************/
...@@ -52,7 +52,7 @@ extern "C" { ...@@ -52,7 +52,7 @@ extern "C" {
typedef struct dvbpsi_crid_entry_s typedef struct dvbpsi_crid_entry_s
{ {
uint8_t i_type; uint8_t i_type;
uint8_t i_location; uint8_t i_location;
union union
{ {
uint8_t path[253]; uint8_t path[253];
......
...@@ -21,7 +21,7 @@ Decode PSIP Extended Text Table. ...@@ -21,7 +21,7 @@ Decode PSIP Extended Text Table.
*/ */
#ifndef _ATSC_ETT_H #ifndef _ATSC_ETT_H
#define _ATSC_ETT_H #define _ATSC_ETT_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -96,7 +96,7 @@ void dvbpsi_atsc_DetachETT(dvbpsi_demux_t * p_demux, uint8_t i_table_id, ...@@ -96,7 +96,7 @@ void dvbpsi_atsc_DetachETT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
* dvbpsi_atsc_InitETT/dvbpsi_atsc_NewETT * dvbpsi_atsc_InitETT/dvbpsi_atsc_NewETT
*****************************************************************************/ *****************************************************************************/
/*! /*!
* \fn void dvbpsi_atsc_InitETT(dvbpsi_atsc_ett_t* p_ett, uint8_t i_version, * \fn void dvbpsi_atsc_InitETT(dvbpsi_atsc_ett_t* p_ett, uint8_t i_version,
int b_current_next, uint8_t i_protocol) int b_current_next, uint8_t i_protocol)
* \brief Initialize a user-allocated dvbpsi_atsc_ett_t structure. * \brief Initialize a user-allocated dvbpsi_atsc_ett_t structure.
* \param p_ett pointer to the ETT structure * \param p_ett pointer to the ETT structure
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment