i_nb_bytes -> i_buffer

[vlc] / modules / audio_filter / scaletempo.c

diff --git a/modules/audio_filter/scaletempo.c b/modules/audio_filter/scaletempo.c
index 08541f175c179e32f6904f04daba869a8d117555..5161e937b8049dd638e742db242fbccb7e403bc3 100644 (file)
--- a/modules/audio_filter/scaletempo.c
+++ b/modules/audio_filter/scaletempo.c
@@ -43,22 +43,22 @@ static void Close( vlc_object_t * );
 static void DoWork( aout_instance_t *, aout_filter_t *,
                     aout_buffer_t *, aout_buffer_t * );
 
-vlc_module_begin();
-    set_description( N_("Scale audio tempo in sync with playback rate") );
-    set_shortname( N_("Scaletempo") );
-    set_capability( "audio filter", 0 );
-    set_category( CAT_AUDIO );
-    set_subcategory( SUBCAT_AUDIO_AFILTER );
+vlc_module_begin ()
+    set_description( N_("Audio tempo scaler synched with rate") )
+    set_shortname( N_("Scaletempo") )
+    set_capability( "audio filter", 0 )
+    set_category( CAT_AUDIO )
+    set_subcategory( SUBCAT_AUDIO_AFILTER )
 
     add_integer_with_range( "scaletempo-stride", 30, 1, 2000, NULL,
-        N_("Stride Length"), N_("Length in milliseconds to output each stride"), true );
+        N_("Stride Length"), N_("Length in milliseconds to output each stride"), true )
     add_float_with_range( "scaletempo-overlap", .20, 0.0, 1.0, NULL,
-        N_("Overlap Length"), N_("Percentage of stride to overlap"), true );
+        N_("Overlap Length"), N_("Percentage of stride to overlap"), true )
     add_integer_with_range( "scaletempo-search", 14, 0, 200, NULL,
-        N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true );
+        N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true )
 
-    set_callbacks( Open, Close );
-vlc_module_end();
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 /*
  * Scaletempo works by producing audio in constant sized chunks (a "stride") but
@@ -76,7 +76,7 @@ vlc_module_end();
  * frame: a single set of samples, one for each channel
  * VLC uses these terms differently
  */
-typedef struct aout_filter_sys_t
+struct aout_filter_sys_t
 {
     /* Filter static config */
     double    scale;
@@ -114,7 +114,7 @@ typedef struct aout_filter_sys_t
     /* for "audio filter" only, manage own buffers */
     int       i_buf;
     uint8_t  *p_buffers[2];
-} aout_filter_sys_t;
+};
 
 /*****************************************************************************
  * best_overlap_offset: calculate best offset for overlap
@@ -392,11 +392,11 @@ static int Open( vlc_object_t *p_this )
     aout_filter_sys_t *p_sys;
     bool b_fit = true;
 
-    if( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) ||
-        p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
+    if( p_filter->input.i_format != VLC_CODEC_FL32 ||
+        p_filter->output.i_format != VLC_CODEC_FL32 )
     {
         b_fit = false;
-        p_filter->input.i_format = p_filter->output.i_format = VLC_FOURCC('f','l','3','2');
+        p_filter->input.i_format = p_filter->output.i_format = VLC_CODEC_FL32;
         msg_Warn( p_filter, "bad input or output format" );
     }
     if( ! AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
@@ -482,8 +482,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     aout_filter_sys_t *p = p_filter->p_sys;
 
     if( p_filter->input.i_rate == p->sample_rate ) {
-      memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer, p_in_buf->i_nb_bytes );
-      p_out_buf->i_nb_bytes   = p_in_buf->i_nb_bytes;
+      memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer, p_in_buf->i_buffer );
+      p_out_buf->i_buffer   = p_in_buf->i_buffer;
       p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
       return;
     }
@@ -500,7 +500,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                (int)( p->bytes_stride / p->bytes_per_frame ) );
     }
 
-    size_t i_outsize = calculate_output_buffer_size ( p_filter, p_in_buf->i_nb_bytes );
+    size_t i_outsize = calculate_output_buffer_size ( p_filter, p_in_buf->i_buffer );
     if( i_outsize > p_out_buf->i_size ) {
         void *temp = realloc( p->p_buffers[ p->i_buf ], i_outsize );
         if( temp == NULL )
@@ -513,9 +513,9 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     }
 
     size_t bytes_out = transform_buffer( p_filter,
-        p_in_buf->p_buffer, p_in_buf->i_nb_bytes,
+        p_in_buf->p_buffer, p_in_buf->i_buffer,
         p_out_buf->p_buffer );
 
-    p_out_buf->i_nb_bytes   = bytes_out;
+    p_out_buf->i_buffer   = bytes_out;
     p_out_buf->i_nb_samples = bytes_out / p->bytes_per_frame;
 }