Commit d2bd568b authored by Jean-Paul Saman's avatar Jean-Paul Saman

Cleanup whitespace and use fastmemcpy.

parent 6f6396b6
...@@ -188,7 +188,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -188,7 +188,7 @@ static int Open( vlc_object_t *p_this )
/* buffer */ /* buffer */
p_sys->i_buffer = p_sys->i_buffer_size = 0; 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; p_sys->i_input_rate = INPUT_RATE_DEFAULT;
...@@ -231,7 +231,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -231,7 +231,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
/* FIXME: multiple blocks per frame */ /* FIXME: multiple blocks per frame */
if( p_block->i_buffer > i_header_size ) if( p_block->i_buffer > i_header_size )
{ {
memcpy( p_block->p_buffer, p_dec->p_libvlc->pf_memcpy( p_block->p_buffer,
p_block->p_buffer + i_header_size, p_block->p_buffer + i_header_size,
p_block->i_buffer - i_header_size ); p_block->i_buffer - i_header_size );
p_block->i_buffer -= i_header_size; p_block->i_buffer -= i_header_size;
...@@ -246,9 +246,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -246,9 +246,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_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_dec->p_libvlc->pf_memcpy( &p_sys->p_buffer[p_sys->i_buffer],
p_block->p_buffer, p_block->i_buffer ); p_block->p_buffer, p_block->i_buffer );
p_sys->i_buffer += p_block->i_buffer; p_sys->i_buffer += p_block->i_buffer;
p_block->i_buffer = 0; p_block->i_buffer = 0;
...@@ -492,3 +492,4 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples, ...@@ -492,3 +492,4 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] = ((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] =
((uint16_t *)p_in)[i * i_nb_channels + j]; ((uint16_t *)p_in)[i * i_nb_channels + j];
} }
...@@ -1351,7 +1351,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -1351,7 +1351,7 @@ static void Close( vlc_object_t *p_this )
{ {
encoder_t *p_enc = (encoder_t *)p_this; encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys = p_enc->p_sys; encoder_sys_t *p_sys = p_enc->p_sys;
free( p_sys->psz_stat_name ); free( p_sys->psz_stat_name );
x264_encoder_close( p_sys->h ); x264_encoder_close( p_sys->h );
...@@ -1369,7 +1369,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -1369,7 +1369,7 @@ static void Close( vlc_object_t *p_this )
var_Set( p_enc->p_libvlc, "pthread_win32_count", count ); var_Set( p_enc->p_libvlc, "pthread_win32_count", count );
if( count.i_int == 0 ) if( count.i_int == 0 )
{ {
pthread_win32_thread_detach_np(); pthread_win32_thread_detach_np();
pthread_win32_process_detach_np(); pthread_win32_process_detach_np();
msg_Dbg( p_enc, "pthread-win32 deinitialized" ); msg_Dbg( p_enc, "pthread-win32 deinitialized" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment