typedef struct
{
int i_type;
- int i_rate;
- int i_channels;
+ unsigned i_rate;
+ unsigned i_channels;
int i_channels_conf;
- int i_samples;
+ unsigned i_samples;
bool b_vbr;
- int i_bitrate;
+ unsigned i_bitrate;
- int i_substreams;
+ unsigned i_substreams;
} mlp_header_t;
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 );
msg_Info( p_dec, "MLP channels: %d samplerate: %d",
p_sys->mlp.i_channels, p_sys->mlp.i_rate );
+ const mtime_t i_end_date = date_Get( &p_sys->end_date );
date_Init( &p_sys->end_date, p_sys->mlp.i_rate, 1 );
- date_Set( &p_sys->end_date, p_sys->i_pts );
+ date_Set( &p_sys->end_date, i_end_date );
}
p_dec->fmt_out.audio.i_rate = p_sys->mlp.i_rate;
/* 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 );
bs_skip( &s, 4 + 4 );
i_rate_idx1 = bs_read( &s, 4 );
- const int i_rate_idx2 = bs_read( &s, 4 );
+
+ // Just skip the 4 following, since we don't use it
+ // const int i_rate_idx2 = bs_read( &s, 4 );
+ bs_skip( &s, 4 );
bs_skip( &s, 11 );
int i_tmp = 0 ^ p_hdr[0] ^ p_hdr[1] ^ p_hdr[2] ^ p_hdr[3];
const uint8_t *p = &p_hdr[4 + ( b_has_sync ? 28 : 0 )];
- for( int i = 0; i < p_mlp->i_substreams; i++ )
+ for( unsigned i = 0; i < p_mlp->i_substreams; i++ )
{
i_tmp ^= *p++;
i_tmp ^= *p++;