#include "a52.h"
+#include "../packetizer/packetizer_helper.h"
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_a52_header_t frame;
};
-enum {
-
- STATE_NOSYNC,
- STATE_SYNC,
- STATE_HEADER,
- STATE_NEXT_SYNC,
- STATE_GET_DATA,
- STATE_SEND_DATA
-};
-
/****************************************************************************
* Local prototypes
****************************************************************************/
-static void *DecodeBlock ( decoder_t *, block_t ** );
+static block_t *DecodeBlock ( decoder_t *, block_t ** );
static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
static aout_buffer_t *GetAoutBuffer( decoder_t * );
/* Set callback */
if( b_packetizer )
- p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **))
- DecodeBlock;
+ p_dec->pf_packetize = DecodeBlock;
else
- p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
- DecodeBlock;
+ p_dec->pf_decode_audio = DecodeBlock;
return VLC_SUCCESS;
}
****************************************************************************
* This function is called just after the thread is launched.
****************************************************************************/
-static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
uint8_t p_header[VLC_A52_HEADER_SIZE];
return p_out_buffer;
}
}
-
- return NULL;
}
/*****************************************************************************
static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- aout_buffer_t *p_buf;
-
- p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples );
- if( p_buf == NULL ) return NULL;
- p_buf->i_pts = date_Get( &p_sys->end_date );
- p_buf->i_length = date_Increment( &p_sys->end_date,
- p_sys->frame.i_samples ) - p_buf->i_pts;
+ aout_buffer_t *p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples );
+ if( p_buf )
+ {
+ p_buf->i_pts = date_Get( &p_sys->end_date );
+ p_buf->i_length = date_Increment( &p_sys->end_date,
+ p_sys->frame.i_samples ) - p_buf->i_pts;
+ }
return p_buf;
}
static block_t *GetSoutBuffer( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_block;
-
- p_block = block_New( p_dec, p_sys->frame.i_size );
- if( p_block == NULL ) return NULL;
- p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
-
- p_block->i_length =
- date_Increment( &p_sys->end_date, p_sys->frame.i_samples ) - p_block->i_pts;
+ block_t *p_block = block_New( p_dec, p_sys->frame.i_size );
+ if( p_block )
+ {
+ p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
+ p_block->i_length =
+ date_Increment( &p_sys->end_date, p_sys->frame.i_samples ) - p_block->i_pts;
+ }
return p_block;
}