case VLC_CODEC_ALAW:
case VLC_CODEC_MULAW:
- case VLC_CODEC_FL64:
- case VLC_CODEC_FL32:
+ case VLC_CODEC_F64L:
+ case VLC_CODEC_F64B:
+ case VLC_CODEC_F32L:
+ case VLC_CODEC_F32B:
case VLC_CODEC_S32L:
case VLC_CODEC_S32B:
case VLC_CODEC_S24L:
p_dec->fmt_in.audio.i_rate, p_dec->fmt_in.audio.i_channels,
p_dec->fmt_in.audio.i_bitspersample );
- if( p_dec->fmt_in.i_codec == VLC_CODEC_FL64 )
+ if( p_dec->fmt_in.i_codec == VLC_CODEC_F64L ||
+ p_dec->fmt_in.i_codec == VLC_CODEC_F64B )
{
p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec;
p_dec->fmt_in.audio.i_bitspersample = 64;
}
- else if( p_dec->fmt_in.i_codec == VLC_CODEC_FL32 )
+ else if( p_dec->fmt_in.i_codec == VLC_CODEC_F32L ||
+ p_dec->fmt_in.i_codec == VLC_CODEC_F32B )
{
p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec;
p_dec->fmt_in.audio.i_bitspersample = 32;
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;
i_samples = p_block->i_buffer / p_sys->i_bytespersample /
p_dec->fmt_in.audio.i_channels;
return NULL;
}
- p_out->start_date = date_Get( &p_sys->end_date );
- p_out->end_date = date_Increment( &p_sys->end_date, i_samples );
+ p_out->i_pts = date_Get( &p_sys->end_date );
+ p_out->i_length = date_Increment( &p_sys->end_date, i_samples )
+ - p_out->i_pts;
if( p_sys->p_logtos16 )
{
int16_t *s = (int16_t*)p_out->p_buffer;
unsigned int i;
- for( i = 0; i < p_out->i_nb_bytes / 2; i++ )
+ for( i = 0; i < p_out->i_buffer / 2; i++ )
{
*s++ = p_sys->p_logtos16[*p_block->p_buffer++];
p_block->i_buffer--;
}
else
{
- memcpy( p_out->p_buffer, p_block->p_buffer, p_out->i_nb_bytes );
- p_block->p_buffer += p_out->i_nb_bytes;
- p_block->i_buffer -= p_out->i_nb_bytes;
+ memcpy( p_out->p_buffer, p_block->p_buffer, p_out->i_buffer );
+ p_block->p_buffer += p_out->i_buffer;
+ p_block->i_buffer -= p_out->i_buffer;
}
return p_out;
encoder_sys_t *p_sys = p_enc->p_sys;
block_t *p_block = NULL;
- if( !p_aout_buf || !p_aout_buf->i_nb_bytes ) return NULL;
+ if( !p_aout_buf || !p_aout_buf->i_buffer ) return NULL;
if( p_sys->i_s16tolog )
{
- if( ( p_block = block_New( p_enc, p_aout_buf->i_nb_bytes / 2 ) ) )
+ if( ( p_block = block_New( p_enc, p_aout_buf->i_buffer / 2 ) ) )
{
int8_t *s = (int8_t*)p_block->p_buffer; // sink
int16_t *aout = (int16_t*)p_aout_buf->p_buffer; // source
if( p_sys->i_s16tolog == ALAW )
{
- for( i = 0; i < p_aout_buf->i_nb_bytes / 2; i++ )
+ for( i = 0; i < p_aout_buf->i_buffer / 2; i++ )
{
if( *aout >= 0)
*s++ = alaw_encode[*aout / 16];
}
else /* ULAW */
{
- for( i = 0; i < p_aout_buf->i_nb_bytes / 2; i++ )
+ for( i = 0; i < p_aout_buf->i_buffer / 2; i++ )
{
if( *aout >= 0)
*s++ = ulaw_encode[*aout / 4];
}
}
}
- else if( ( p_block = block_New( p_enc, p_aout_buf->i_nb_bytes ) ) )
+ else if( ( p_block = block_New( p_enc, p_aout_buf->i_buffer ) ) )
{
memcpy( p_block->p_buffer, p_aout_buf->p_buffer,
- p_aout_buf->i_nb_bytes );
+ p_aout_buf->i_buffer );
}
if( p_block )
{
- p_block->i_dts = p_block->i_pts = p_aout_buf->start_date;
+ p_block->i_dts = p_block->i_pts = p_aout_buf->i_pts;
p_block->i_length = (int64_t)p_aout_buf->i_nb_samples *
(int64_t)1000000 / p_enc->fmt_in.audio.i_rate;
}