/* Channel positions of the current stream (for re-ordering) */
uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS];
- vlc_bool_t b_sbr, b_ps;
+ bool b_sbr, b_ps;
int i_input_rate;
};
/* buffer */
p_sys->i_buffer = p_sys->i_buffer_size = 0;
- p_sys->p_buffer = 0;
+ p_sys->p_buffer = NULL;
p_sys->i_input_rate = INPUT_RATE_DEFAULT;
/* Faad2 can't deal with truncated data (eg. from MPEG TS) */
- p_dec->b_need_packetized = VLC_TRUE;
+ p_dec->b_need_packetized = true;
- p_sys->b_sbr = p_sys->b_ps = VLC_FALSE;
+ p_sys->b_sbr = p_sys->b_ps = false;
return VLC_SUCCESS;
}
/* FIXME: multiple blocks per frame */
if( p_block->i_buffer > i_header_size )
{
- memcpy( p_block->p_buffer,
- p_block->p_buffer + i_header_size,
- p_block->i_buffer - i_header_size );
+ vlc_memcpy( p_block->p_buffer,
+ p_block->p_buffer + i_header_size,
+ p_block->i_buffer - i_header_size );
p_block->i_buffer -= i_header_size;
}
}
p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size );
}
- if( p_block->i_buffer )
+ if( p_block->i_buffer > 0 )
{
- memcpy( &p_sys->p_buffer[p_sys->i_buffer],
- p_block->p_buffer, p_block->i_buffer );
+ vlc_memcpy(, &p_sys->p_buffer[p_sys->i_buffer],
+ p_block->p_buffer, p_block->i_buffer );
p_sys->i_buffer += p_block->i_buffer;
p_block->i_buffer = 0;
}
{
p_dec->fmt_out.audio.i_rate = i_rate;
p_dec->fmt_out.audio.i_channels = i_channels;
+ p_dec->fmt_out.audio.i_physical_channels
+ = p_dec->fmt_out.audio.i_original_channels
+ = pi_channels_guessed[i_channels];
+
aout_DateInit( &p_sys->date, i_rate );
}
}
p_dec->fmt_out.audio.i_rate = i_rate;
p_dec->fmt_out.audio.i_channels = i_channels;
+ p_dec->fmt_out.audio.i_physical_channels
+ = p_dec->fmt_out.audio.i_original_channels
+ = pi_channels_guessed[i_channels];
aout_DateInit( &p_sys->date, i_rate );
}
p_dec->fmt_out.audio.i_rate = frame.samplerate;
p_dec->fmt_out.audio.i_channels = frame.channels;
+ p_dec->fmt_out.audio.i_physical_channels
+ = p_dec->fmt_out.audio.i_original_channels
+ = pi_channels_guessed[frame.channels];
/* Adjust stream info when dealing with SBR/PS */
if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] =
((uint16_t *)p_in)[i * i_nb_channels + j];
}
+