block_t.i_samples -> block_t.i_nb_samples (as aout_buffer_t)

[vlc] / modules / audio_filter / resampler / bandlimited.c

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index d03b4cbf1bb360e685ddd74fc48bb84d3668b7e8..e1da18cb8d2a424f0d1f92dd791834b7242d2dde 100644 (file)
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -547,7 +547,7 @@ static block_t *Resample( filter_t *p_filter, block_t *p_block )
     int i_out_size;
     int i_bytes_per_frame;
 
-    if( !p_block || !p_block->i_samples )
+    if( !p_block || !p_block->i_nb_samples )
     {
         if( p_block )
             block_Release( p_block );
@@ -557,7 +557,7 @@ static block_t *Resample( filter_t *p_filter, block_t *p_block )
     i_bytes_per_frame = p_filter->fmt_out.audio.i_channels *
                   p_filter->fmt_out.audio.i_bitspersample / 8;
 
-    i_out_size = i_bytes_per_frame * ( 1 + ( p_block->i_samples *
+    i_out_size = i_bytes_per_frame * ( 1 + ( p_block->i_nb_samples *
                                              p_filter->fmt_out.audio.i_rate /
                                              p_filter->fmt_in.audio.i_rate) ) +
                  p_filter->p_sys->i_buf_size;
@@ -570,7 +570,7 @@ static block_t *Resample( filter_t *p_filter, block_t *p_block )
         return NULL;
     }
 
-    p_out->i_samples = i_out_size / i_bytes_per_frame;
+    p_out->i_nb_samples = i_out_size / i_bytes_per_frame;
     p_out->i_dts = p_block->i_dts;
     p_out->i_pts = p_block->i_pts;
     p_out->i_length = p_block->i_length;
@@ -587,17 +587,17 @@ static block_t *Resample( filter_t *p_filter, block_t *p_block )
 
     in_buf.p_buffer = p_block->p_buffer;
     in_buf.i_nb_bytes = in_buf.i_size = p_block->i_buffer;
-    in_buf.i_nb_samples = p_block->i_samples;
+    in_buf.i_nb_samples = p_block->i_nb_samples;
     out_buf.p_buffer = p_out->p_buffer;
     out_buf.i_nb_bytes = out_buf.i_size = p_out->i_buffer;
-    out_buf.i_nb_samples = p_out->i_samples;
+    out_buf.i_nb_samples = p_out->i_nb_samples;
 
     DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
 
     block_Release( p_block );
 
     p_out->i_buffer = out_buf.i_nb_bytes;
-    p_out->i_samples = out_buf.i_nb_samples;
+    p_out->i_nb_samples = out_buf.i_nb_samples;
 
     return p_out;
 }