#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_aout.h>
#include <vlc_codec.h>
/*****************************************************************************
static int OpenDecoder( vlc_object_t * );
static void CloseDecoder( vlc_object_t * );
-static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
+static block_t *DecodeBlock( decoder_t *, block_t ** );
vlc_module_begin ()
set_description( N_("ADPCM audio decoder") )
/*****************************************************************************
* DecodeBlock:
*****************************************************************************/
-static aout_buffer_t *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;
block_t *p_block;
p_block = *pp_block;
- if( p_block->i_pts != 0 &&
+ if( p_block->i_pts > VLC_TS_INVALID &&
p_block->i_pts != date_Get( &p_sys->end_date ) )
{
date_Set( &p_sys->end_date, p_block->i_pts );
}
/* Don't re-use the same pts twice */
- p_block->i_pts = 0;
+ p_block->i_pts = VLC_TS_INVALID;
if( p_block->i_buffer >= p_sys->i_block )
{
- aout_buffer_t *p_out;
+ block_t *p_out;
p_out = decoder_NewAudioBuffer( p_dec, p_sys->i_samplesperblock );
if( p_out == NULL )
}
p_out->i_pts = date_Get( &p_sys->end_date );
- p_out->end_date =
- date_Increment( &p_sys->end_date, p_sys->i_samplesperblock );
+ p_out->i_length = date_Increment( &p_sys->end_date,
+ p_sys->i_samplesperblock ) - p_out->i_pts;
switch( p_sys->codec )
{