#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_aout.h>
+#include <assert.h>
#include <vlc_block_helper.h>
static void CloseDecoder ( vlc_object_t * );
static void *DecodeBlock ( decoder_t *, block_t ** );
-static uint8_t *GetOutBuffer ( decoder_t *, void ** );
+static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
static aout_buffer_t *GetAoutBuffer( decoder_t * );
static block_t *GetSoutBuffer( decoder_t * );
p_sys->i_state = STATE_NOSYNC;
date_Set( &p_sys->end_date, 0 );
p_sys->bytestream = block_BytestreamInit();
+ p_sys->i_pts = VLC_TS_INVALID;
p_sys->b_discontinuity = false;
/* Set output properties */
uint8_t p_header[MAD_BUFFER_GUARD];
uint32_t i_header;
uint8_t *p_buf;
- void *p_out_buffer;
+ block_t *p_out_buffer;
if( !pp_block || !*pp_block ) return NULL;
return NULL;
}
- if( !date_Get( &p_sys->end_date ) && !(*pp_block)->i_pts )
+ if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID )
{
/* We've just started the stream, wait for the first PTS. */
msg_Dbg( p_dec, "waiting for PTS" );
case STATE_SYNC:
/* New frame, set the Presentation Time Stamp */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
- if( p_sys->i_pts != 0 &&
+ if( p_sys->i_pts > VLC_TS_INVALID &&
p_sys->i_pts != date_Get( &p_sys->end_date ) )
{
date_Set( &p_sys->end_date, p_sys->i_pts );
&p_sys->i_max_frame_size,
&p_sys->i_layer );
+ p_dec->fmt_in.i_profile = p_sys->i_layer;
+
if( p_sys->i_frame_size == -1 )
{
msg_Dbg( p_dec, "emulated startcode" );
/* Copy the whole frame into the buffer. When we reach this point
* we already know we have enough data available. */
- block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size );
+ block_GetBytes( &p_sys->bytestream,
+ p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) );
/* Get beginning of next frame for libmad */
if( !p_sys->b_packetizer )
{
+ assert( p_out_buffer->i_buffer >= (unsigned)p_sys->i_frame_size + MAD_BUFFER_GUARD );
memcpy( p_buf + p_sys->i_frame_size,
p_header, MAD_BUFFER_GUARD );
}
/* Make sure we don't reuse the same pts twice */
if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts )
- p_sys->i_pts = p_sys->bytestream.p_block->i_pts = 0;
+ p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID;
/* So p_block doesn't get re-added several times */
*pp_block = block_BytestreamPop( &p_sys->bytestream );
/*****************************************************************************
* GetOutBuffer:
*****************************************************************************/
-static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer )
+static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
{
decoder_sys_t *p_sys = p_dec->p_sys;
uint8_t *p_buf;
p_buf = decoder_NewAudioBuffer( p_dec, p_sys->i_frame_length );
if( p_buf == NULL ) return NULL;
- p_buf->start_date = date_Get( &p_sys->end_date );
- p_buf->end_date =
- date_Increment( &p_sys->end_date, p_sys->i_frame_length );
- p_buf->b_discontinuity = p_sys->b_discontinuity;
+ p_buf->i_pts = date_Get( &p_sys->end_date );
+ p_buf->i_length = date_Increment( &p_sys->end_date, p_sys->i_frame_length )
+ - p_buf->i_pts;
+ if( p_sys->b_discontinuity )
+ p_buf->i_flags |= BLOCK_FLAG_DISCONTINUITY;
p_sys->b_discontinuity = false;
/* Hack for libmad filter */
- p_buf->i_nb_bytes = p_sys->i_frame_size + MAD_BUFFER_GUARD;
+ p_buf = block_Realloc( p_buf, 0, p_sys->i_frame_size + MAD_BUFFER_GUARD );
return p_buf;
}