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

diff --git a/include/vlc_block.h b/include/vlc_block.h
index 98e562645079fadc2d8cacda0dec8551a75ef4ab..bc56992971b27e019479b1dd2918c30fad630930 100644 (file)
--- a/include/vlc_block.h
+++ b/include/vlc_block.h
@@ -102,7 +102,7 @@ struct block_t
     mtime_t     i_dts;
     mtime_t     i_length;
 
-    int         i_samples; /* Used for audio */
+    unsigned    i_nb_samples; /* Used for audio */
     int         i_rate;
 
     size_t      i_buffer;
@@ -146,7 +146,7 @@ static inline block_t *block_Duplicate( block_t *p_block )
     p_dup->i_flags   = p_block->i_flags;
     p_dup->i_length  = p_block->i_length;
     p_dup->i_rate    = p_block->i_rate;
-    p_dup->i_samples = p_block->i_samples;
+    p_dup->i_nb_samples = p_block->i_nb_samples;
     memcpy( p_dup->p_buffer, p_block->p_buffer, p_block->i_buffer );
 
     return p_dup;

diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 4712510c313388518e4ba44991321c2b4bc60419..0bcf38654f103246e802dd1ffa4ce65786d28a08 100644 (file)
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -643,14 +643,14 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     block_t *p_out;
     int i_out_size;
 
-    if( !p_block || !p_block->i_samples )
+    if( !p_block || !p_block->i_nb_samples )
     {
         if( p_block )
             block_Release( p_block );
         return NULL;
     }
 
-    i_out_size = p_block->i_samples *
+    i_out_size = p_block->i_nb_samples *
       p_filter->fmt_out.audio.i_bitspersample/8 *
         aout_FormatNbChannels( &(p_filter->fmt_out.audio) );
 
@@ -662,7 +662,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
         return NULL;
     }
 
-    p_out->i_samples = p_block->i_samples;
+    p_out->i_nb_samples = p_block->i_nb_samples;
     p_out->i_dts = p_block->i_dts;
     p_out->i_pts = p_block->i_pts;
     p_out->i_length = p_block->i_length;
@@ -676,15 +676,15 @@ static block_t *Convert( 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 );
 
     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;
 
     block_Release( p_block );
     return p_out;

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 56d047e696ac34648c3b50f72fdaf034d0c7a83b..defb78302f5ac86237deb1a8eef7f8aa0f400e05 100644 (file)
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -459,14 +459,14 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     unsigned int i_samples;
     int i_out_size;
 
-    if( !p_block || !p_block->i_samples )
+    if( !p_block || !p_block->i_nb_samples )
     {
         if( p_block )
             block_Release( p_block );
         return NULL;
     }
 
-    i_out_size = p_block->i_samples * p_filter->p_sys->i_bitspersample/8 *
+    i_out_size = p_block->i_nb_samples * p_filter->p_sys->i_bitspersample/8 *
                  aout_FormatNbChannels( &(p_filter->fmt_out.audio) );
 
     p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
@@ -476,7 +476,8 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
         block_Release( p_block );
         return NULL;
     }
-    p_out->i_samples = (p_block->i_samples / p_filter->p_sys->i_nb_channels) *
+    p_out->i_nb_samples =
+                  (p_block->i_nb_samples / p_filter->p_sys->i_nb_channels) *
                        aout_FormatNbChannels( &(p_filter->fmt_out.audio) );
     p_out->i_dts = p_block->i_dts;
     p_out->i_pts = p_block->i_pts;
@@ -490,7 +491,7 @@ static block_t *Convert( 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;
 
 #if 0
     unsigned int i_in_size = in_buf.i_nb_samples  * (p_filter->p_sys->i_bitspersample/8) *
@@ -504,7 +505,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
 
     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;
 
     memset( p_out->p_buffer, 0, i_out_size );
     if( p_filter->p_sys->b_downmix )
@@ -518,7 +519,7 @@ static block_t *Convert( filter_t *p_filter, block_t *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;
 
     block_Release( p_block );
     return p_out;

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 9d9b3f7b163d84253f3b0ce198552d3aaa4470e1..156d0671b9cba3330816d271aa5cfe6d25a3966b 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -281,14 +281,14 @@ static block_t *Filter( filter_t *p_filter, block_t *p_block )
     block_t *p_out;
     int i_out_size;
 
-    if( !p_block || !p_block->i_samples )
+    if( !p_block || !p_block->i_nb_samples )
     {
         if( p_block )
             block_Release( p_block );
         return NULL;
     }
 
-    i_out_size = p_block->i_samples *
+    i_out_size = p_block->i_nb_samples *
       p_filter->fmt_out.audio.i_bitspersample *
         p_filter->fmt_out.audio.i_channels / 8;
 
@@ -300,7 +300,7 @@ static block_t *Filter( filter_t *p_filter, block_t *p_block )
         return NULL;
     }
 
-    p_out->i_samples = p_block->i_samples;
+    p_out->i_nb_samples = p_block->i_nb_samples;
     p_out->i_dts = p_block->i_dts;
     p_out->i_pts = p_block->i_pts;
     p_out->i_length = p_block->i_length;
@@ -313,17 +313,17 @@ static block_t *Filter( 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;
 }

diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
index 5b9ed6f6f738ab03f95d7b90b79cf0afbe22870c..51ee9e47d0a64598d4ce1564a012297e790253d8 100644 (file)
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ b/modules/audio_filter/converter/a52tofloat32.c
@@ -463,14 +463,14 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     block_t *p_out;
     int i_out_size;
 
-    if( !p_block || !p_block->i_samples )
+    if( !p_block || !p_block->i_nb_samples )
     {
         if( p_block )
             block_Release( p_block );
         return NULL;
     }
 
-    i_out_size = p_block->i_samples *
+    i_out_size = p_block->i_nb_samples *
       p_filter->fmt_out.audio.i_bitspersample *
         p_filter->fmt_out.audio.i_channels / 8;
 
@@ -482,7 +482,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
         return NULL;
     }
 
-    p_out->i_samples = p_block->i_samples;
+    p_out->i_nb_samples = p_block->i_nb_samples;
     p_out->i_dts = p_block->i_dts;
     p_out->i_pts = p_block->i_pts;
     p_out->i_length = p_block->i_length;
@@ -495,15 +495,15 @@ static block_t *Convert( 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 );
 
     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;
 
     block_Release( p_block );
 

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 87ea2c6a9dec8f62521a7170dac1c8af791f24e8..86a9eb4151b9d63d920cb83594d0b36963853c0f 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -428,14 +428,14 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     block_t *p_out;
     int i_out_size;
 
-    if( !p_block || !p_block->i_samples )
+    if( !p_block || !p_block->i_nb_samples )
     {
         if( p_block )
             block_Release( p_block );
         return NULL;
     }
 
-    i_out_size = p_block->i_samples *
+    i_out_size = p_block->i_nb_samples *
       p_filter->fmt_out.audio.i_bitspersample *
         p_filter->fmt_out.audio.i_channels / 8;
 
@@ -447,7 +447,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
         return NULL;
     }
 
-    p_out->i_samples = p_block->i_samples;
+    p_out->i_nb_samples = p_block->i_nb_samples;
     p_out->i_dts = p_block->i_dts;
     p_out->i_pts = p_block->i_pts;
     p_out->i_length = p_block->i_length;
@@ -460,15 +460,15 @@ static block_t *Convert( 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 );
 
     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;
 
     block_Release( p_block );
 

diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index b242a1f760a895c7ba1780cc79767925f1278ff3..fe5fb301221a2a25dbe32473cada6700dabea13d 100644 (file)
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -364,14 +364,14 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     block_t *p_out;
     int i_out_size;
 
-    if( !p_block || !p_block->i_samples )
+    if( !p_block || !p_block->i_nb_samples )
     {
         if( p_block )
             block_Release( p_block );
         return NULL;
     }
 
-    i_out_size = p_block->i_samples *
+    i_out_size = p_block->i_nb_samples *
       p_filter->fmt_out.audio.i_bitspersample *
         p_filter->fmt_out.audio.i_channels / 8;
 
@@ -383,7 +383,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
         return NULL;
     }
 
-    p_out->i_samples = p_block->i_samples;
+    p_out->i_nb_samples = p_block->i_nb_samples;
     p_out->i_dts = p_block->i_dts;
     p_out->i_pts = p_block->i_pts;
     p_out->i_length = p_block->i_length;
@@ -397,17 +397,17 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     in_buf.p_buffer = p_block->p_buffer;
     in_buf.b_discontinuity = false;
     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;
 }

diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c
index 7b124d1d1ec79837a050d0cb66819083e5d594ec..ee750f31cd6f0c4d58c31135f15dc3bcebe79864 100644 (file)
--- a/modules/audio_filter/format.c
+++ b/modules/audio_filter/format.c
@@ -341,7 +341,7 @@ static block_t *S24toFloat32( filter_t *p_filter, block_t *p_block )
         p_in += 3; p_out++;
     }
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;
@@ -410,7 +410,7 @@ static block_t *S16toFloat32( filter_t *p_filter, block_t *p_block )
         p_in++; p_out++;
     }
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;
@@ -443,7 +443,7 @@ static block_t *U16toFloat32( filter_t *p_filter, block_t *p_block )
         *p_out++ = (float)(*p_in++ - 32768) / 32768.0;
     }
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;
@@ -483,7 +483,7 @@ static block_t *S16toS24( filter_t *p_filter, block_t *p_block )
 #endif
     }
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;
@@ -618,7 +618,7 @@ static block_t *S8toU16( filter_t *p_filter, block_t *p_block )
     for( i = p_block->i_buffer; i--; )
         *p_out++ = ((*p_in++) + 128) << 8;
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;
@@ -649,7 +649,7 @@ static block_t *U8toS16( filter_t *p_filter, block_t *p_block )
     for( i = p_block->i_buffer; i--; )
         *p_out++ = ((*p_in++) - 128) << 8;
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;
@@ -681,7 +681,7 @@ static block_t *S8toS16( filter_t *p_filter, block_t *p_block )
     for( i = p_block->i_buffer; i--; )
         *p_out++ = (*p_in++) << 8;
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;
@@ -712,7 +712,7 @@ static block_t *U8toU16( filter_t *p_filter, block_t *p_block )
     for( i = p_block->i_buffer; i--; )
         *p_out++ = (*p_in++) << 8;
 
-    p_block_out->i_samples = p_block->i_samples;
+    p_block_out->i_nb_samples = p_block->i_nb_samples;
     p_block_out->i_dts = p_block->i_dts;
     p_block_out->i_pts = p_block->i_pts;
     p_block_out->i_length = p_block->i_length;

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;
 }

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 090a703f53467f402cd6166a7d579f769ae0f258..af43cfd73694e5ead95391cdf12c9f2e275b4f2e 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -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;
 }

diff --git a/modules/codec/shine/shine_mod.c b/modules/codec/shine/shine_mod.c
index f69bea6fa54bf11ec7a9c5378de38d2dd9414a17..5249d239c98865add822f9e30278a7c88e5b9f02 100644 (file)
--- a/modules/codec/shine/shine_mod.c
+++ b/modules/codec/shine/shine_mod.c
@@ -216,7 +216,7 @@ static block_t *EncodeFrame( encoder_t *p_enc, aout_buffer_t *p_block )
         start_date += p_mp3_block->i_length;
         p_mp3_block->i_dts = p_mp3_block->i_pts = start_date;
 
-        p_mp3_block->i_samples = SAMP_PER_FRAME1;
+        p_mp3_block->i_nb_samples = SAMP_PER_FRAME1;
 
         block_ChainAppend( &p_chain, p_mp3_block );
 

diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index f85419cba884a1bce9926c30168c482458fe9151..b9a095821f9b7c3659cb333f4bb5d271ab96b8ff 100644 (file)
--- a/modules/stream_out/smem.c
+++ b/modules/stream_out/smem.c
@@ -368,7 +368,7 @@ static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
     vlc_memcpy( p_pcm_buffer, p_buffer->p_buffer, i_size );
     /* Calling the postrender callback to tell the user his buffer is ready */
     p_sys->pf_audio_postrender_callback( id->p_data, p_pcm_buffer,
-                                         id->format->audio.i_channels, id->format->audio.i_rate, p_buffer->i_samples,
+                                         id->format->audio.i_channels, id->format->audio.i_rate, p_buffer->i_nb_samples,
                                          id->format->audio.i_bitspersample, i_size, p_buffer->i_pts );
     block_ChainRelease( p_buffer );
     return VLC_SUCCESS;

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index c528aa32899ce1fde545a5a8d40b6e0a49b1ede5..59767066ac5698cb4ff64a362356d9b858244a40 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -1314,7 +1314,7 @@ static int transcode_audio_process( sout_stream_t *p_stream,
             p_audio_buf->i_pts;
         p_audio_block->i_length = p_audio_buf->end_date -
             p_audio_buf->i_pts;
-        p_audio_block->i_samples = p_audio_buf->i_nb_samples;
+        p_audio_block->i_nb_samples = p_audio_buf->i_nb_samples;
 
         /* Run filter chain */
         if( id->p_uf_chain )
@@ -1328,7 +1328,7 @@ static int transcode_audio_process( sout_stream_t *p_stream,
 
         p_audio_buf->p_buffer = p_audio_block->p_buffer;
         p_audio_buf->i_nb_bytes = p_audio_block->i_buffer;
-        p_audio_buf->i_nb_samples = p_audio_block->i_samples;
+        p_audio_buf->i_nb_samples = p_audio_block->i_nb_samples;
         p_audio_buf->i_pts = p_audio_block->i_dts;
         p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
 
@@ -1374,7 +1374,7 @@ static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
     p_buffer->p_buffer = p_block->p_buffer;
     p_buffer->i_size = p_buffer->i_nb_bytes = p_block->i_buffer;
     p_buffer->i_nb_samples = i_samples;
-    p_block->i_samples = i_samples;
+    p_block->i_nb_samples = i_samples;
 
     return p_buffer;
 }

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 18c144a5365578d9d0bc9345847221714c9e25dc..dbfe97f9a8d39754cfab96884cfb71490e079dd1 100644 (file)
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -1173,7 +1173,7 @@ static void TsStoragePopCmd( ts_storage_t *p_storage, ts_cmd_t *p_cmd, bool b_fl
                 p_block->i_flags    = block.i_flags;
                 p_block->i_length   = block.i_length;
                 p_block->i_rate     = block.i_rate;
-                p_block->i_samples  = block.i_samples;
+                p_block->i_nb_samples = block.i_nb_samples;
                 p_block->i_buffer = fread( p_block->p_buffer, 1, block.i_buffer, p_storage->p_filer );
             }
             p_cmd->send.p_block = p_block;

diff --git a/src/misc/block.c b/src/misc/block.c
index b57e63ab394ef3511bc445dbe5abf7b148232eb9..72e366f895573730acde48ec8c5d1e90cd77ae96 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -65,7 +65,7 @@ void block_Init( block_t *restrict b, void *buf, size_t size )
     b->i_dts = VLC_TS_INVALID;
     b->i_length = 0;
     b->i_rate = 0;
-    b->i_samples = 0;
+    b->i_nb_samples = 0;
     b->p_buffer = buf;
     b->i_buffer = size;
 #ifndef NDEBUG
@@ -86,7 +86,7 @@ static void BlockMetaCopy( block_t *restrict out, const block_t *in )
     out->i_flags   = in->i_flags;
     out->i_length  = in->i_length;
     out->i_rate    = in->i_rate;
-    out->i_samples = in->i_samples;
+    out->i_nb_samples = in->i_nb_samples;
 }
 
 /* Memory alignment */