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

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

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 41be20b4e1c362fe9a46f538c575777736c8c405..af43cfd73694e5ead95391cdf12c9f2e275b4f2e 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -57,7 +57,7 @@ struct filter_sys_t
 
     unsigned int i_remainder;                /* remainder of previous sample */
 
-    audio_date_t end_date;
+    date_t       end_date;
 };
 
 /*****************************************************************************
@@ -107,7 +107,7 @@ static int Create( vlc_object_t *p_this )
         free( p_sys );
         return VLC_ENOMEM;
     }
-    aout_DateInit( &p_sys->end_date, p_filter->output.i_rate );
+    date_Init( &p_sys->end_date, p_filter->output.i_rate, 1 );
 
     p_filter->pf_do_work = DoWork;
 
@@ -145,7 +145,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     int i_chan, i_in, i_out = 0;
 
     /* Check if we really need to run the resampler */
-    if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate )
+    if( p_aout->mixer_format.i_rate == p_filter->input.i_rate )
     {
         if( p_filter->b_continuity &&
             p_in_buf->i_size >=
@@ -170,7 +170,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     {
         p_filter->b_continuity = true;
         p_sys->i_remainder = 0;
-        aout_DateInit( &p_sys->end_date, p_filter->output.i_rate );
+        date_Init( &p_sys->end_date, p_filter->output.i_rate, 1 );
     }
     else
     {
@@ -223,15 +223,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     }
 
     p_out_buf->i_nb_samples = i_out;
-    p_out_buf->start_date = p_in_buf->start_date;
+    p_out_buf->i_pts = p_in_buf->i_pts;
 
-    if( p_in_buf->start_date !=
-        aout_DateGet( &p_sys->end_date ) )
+    if( p_in_buf->i_pts !=
+        date_Get( &p_sys->end_date ) )
     {
-        aout_DateSet( &p_sys->end_date, p_in_buf->start_date );
+        date_Set( &p_sys->end_date, p_in_buf->i_pts );
     }
 
-    p_out_buf->end_date = aout_DateIncrement( &p_sys->end_date,
+    p_out_buf->end_date = date_Increment( &p_sys->end_date,
                                               p_out_buf->i_nb_samples );
 
     p_out_buf->i_nb_bytes = p_out_buf->i_nb_samples *
@@ -265,7 +265,7 @@ static int OpenFilter( vlc_object_t *p_this )
         free( p_sys );
         return VLC_ENOMEM;
     }
-    aout_DateInit( &p_sys->end_date, p_filter->fmt_in.audio.i_rate );
+    date_Init( &p_sys->end_date, p_filter->fmt_in.audio.i_rate, 1 );
 
     p_filter->pf_audio_filter = Resample;
 
@@ -304,7 +304,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 );
@@ -314,7 +314,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_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
@@ -325,7 +325,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;
@@ -337,17 +337,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 = 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 = 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;
 }