]> git.sesse.net Git - vlc/commitdiff
audio filters: remove old filter_NewAudioBuffer()
authorRémi Denis-Courmont <remi@remlab.net>
Fri, 1 Mar 2013 15:59:56 +0000 (17:59 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Fri, 1 Mar 2013 15:59:56 +0000 (17:59 +0200)
12 files changed:
include/vlc_filter.h
modules/arm_neon/simple_channel_mixer.c
modules/audio_filter/channel_mixer/dolby.c
modules/audio_filter/channel_mixer/headphone.c
modules/audio_filter/channel_mixer/remap.c
modules/audio_filter/channel_mixer/simple.c
modules/audio_filter/channel_mixer/trivial.c
modules/audio_filter/converter/a52tofloat32.c
modules/audio_filter/converter/a52tospdif.c
modules/audio_filter/converter/dtstospdif.c
modules/audio_filter/resampler/bandlimited.c
modules/audio_filter/scaletempo.c

index f7c5b32f2f028c617fbcf79abf973780c45061e6..320cbac3a4a5b8461ec41eabd77f323bbbc509dd 100644 (file)
@@ -209,8 +209,6 @@ static inline void filter_DeleteSubpicture( filter_t *p_filter, subpicture_t *p_
     p_filter->pf_sub_buffer_del( p_filter, p_subpicture );
 }
 
-#define filter_NewAudioBuffer(f,s) ((f), block_Alloc(s))
-
 /**
  * This function gives all input attachments at once.
  *
index e2baaaf506ad30f1bb2b54fa1c3f03ff14aaa809..8627415805726071359fcbbd0148f9ca034b9e30 100644 (file)
@@ -89,7 +89,7 @@ static bool FilterInit( filter_t *p_filter, block_t *p_block, block_t **pp_out )
         p_filter->fmt_out.audio.i_bitspersample *
         p_filter->fmt_out.audio.i_channels / 8;
 
-    block_t *p_out = filter_NewAudioBuffer( p_filter, i_out_size );
+    block_t *p_out = block_Alloc( i_out_size );
     if( !p_out )
     {
         msg_Warn( p_filter, "can't get output buffer" );
index cd9922cd2a5206f9911f4407edc033b975e84649..60819f6a3d2afb477b637dc8ea62878fec57fa9f 100644 (file)
@@ -164,7 +164,7 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
     size_t i_nb_channels = aout_FormatNbChannels( &p_filter->fmt_out.audio );
     size_t i_nb_rear = 0;
     size_t i;
-    block_t *p_out_buf = filter_NewAudioBuffer( p_filter,
+    block_t *p_out_buf = block_Alloc(
                                 sizeof(float) * i_nb_samples * i_nb_channels );
     if( !p_out_buf )
         goto out;
index 0d868ef56298fea46c4f8f03619e38983cee8816..92c1a3b24b8a9702e54deb2f25d3b94101794002 100644 (file)
@@ -510,7 +510,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
       p_filter->fmt_out.audio.i_bitspersample/8 *
         aout_FormatNbChannels( &(p_filter->fmt_out.audio) );
 
-    block_t *p_out = filter_NewAudioBuffer( p_filter, i_out_size );
+    block_t *p_out = block_Alloc( i_out_size );
     if( !p_out )
     {
         msg_Warn( p_filter, "can't get output buffer" );
index 5ee91901d3bdb4c193becafe01afaf4561d3dd85..77aeb094de97b05770eefbb7e0b334a40526e3b2 100644 (file)
@@ -376,7 +376,7 @@ static block_t *Remap( filter_t *p_filter, block_t *p_block )
     size_t i_out_size = p_block->i_nb_samples *
         p_filter->fmt_out.audio.i_bytes_per_frame;
 
-    block_t *p_out = filter_NewAudioBuffer( p_filter, i_out_size );
+    block_t *p_out = block_Alloc( i_out_size );
     if( !p_out )
     {
         msg_Warn( p_filter, "can't get output buffer" );
index d902d1aaa9c4df6a85916a2a25949357ac5275a0..00d538a6b35ae8b9e2a41765b07eaff4f425cd32 100644 (file)
@@ -247,7 +247,7 @@ static block_t *Filter( filter_t *p_filter, block_t *p_block )
       p_filter->fmt_out.audio.i_bitspersample *
         p_filter->fmt_out.audio.i_channels / 8;
 
-    block_t *p_out = filter_NewAudioBuffer( p_filter, i_out_size );
+    block_t *p_out = block_Alloc( i_out_size );
     if( !p_out )
     {
         msg_Warn( p_filter, "can't get output buffer" );
index e4667afbcbd8e34ab19f0186c125f844e281a490..86b9de0632f86f87131743ada5ea3344d40ffb11 100644 (file)
@@ -109,7 +109,7 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
     }
     else
     {
-        p_out_buf = filter_NewAudioBuffer( p_filter,
+        p_out_buf = block_Alloc(
                               p_in_buf->i_buffer / i_input_nb * i_output_nb );
         if( !p_out_buf )
             goto out;
index 2040e1322abcdd8c8a0f05257b5d329f009af530..346a36dd8a11a9aa9eea2e1ed1c4d8985968c497 100644 (file)
@@ -296,7 +296,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
     int i_flags = p_sys->i_flags;
     size_t i_bytes_per_block = 256 * p_sys->i_nb_channels * sizeof(sample_t);
 
-    block_t *p_out_buf = filter_NewAudioBuffer( p_filter, 6 * i_bytes_per_block );
+    block_t *p_out_buf = block_Alloc( 6 * i_bytes_per_block );
     if( unlikely(p_out_buf == NULL) )
         goto out;
 
index 53f6303f8a282797ca49c5ad89fc7ae58abcdd29..2e4a820702e5882e4536f8bc006ce0dcb37693ab 100644 (file)
@@ -86,7 +86,7 @@ static block_t *DoWork( filter_t * p_filter, block_t *p_in_buf )
     uint16_t i_frame_size = p_in_buf->i_buffer / 2;
     uint8_t * p_in = p_in_buf->p_buffer;
 
-    block_t *p_out_buf = filter_NewAudioBuffer( p_filter, AOUT_SPDIF_SIZE );
+    block_t *p_out_buf = block_Alloc( AOUT_SPDIF_SIZE );
     if( !p_out_buf )
         goto out;
     uint8_t * p_out = p_out_buf->p_buffer;
index 71dd6cd903925f9e587dc8059def559ec660e99a..88384c8e2329f96f50d9e69d75917b3d553963a3 100644 (file)
@@ -156,8 +156,7 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
     }
 
     p_filter->p_sys->i_frames = 0;
-    block_t *p_out_buf = filter_NewAudioBuffer( p_filter,
-                                                12 * p_in_buf->i_nb_samples );
+    block_t *p_out_buf = block_Alloc( 12 * p_in_buf->i_nb_samples );
     if( !p_out_buf )
         goto out;
 
index f5c5c552a0803e489b30c6c27622747aeeb722f1..f86be17da148af4ebc2039b3f0876a10d1c1f883 100644 (file)
@@ -145,7 +145,7 @@ static block_t *Resample( filter_t * p_filter, block_t * p_in_buf )
     size_t i_out_size = i_bytes_per_frame * ( 1 + ( p_in_buf->i_nb_samples *
               p_filter->fmt_out.audio.i_rate / p_filter->fmt_in.audio.i_rate) )
             + p_filter->p_sys->i_buf_size;
-    block_t *p_out_buf = filter_NewAudioBuffer( p_filter, i_out_size );
+    block_t *p_out_buf = block_Alloc( i_out_size );
     if( !p_out_buf )
     {
         block_Release( p_in_buf );
index e851bc4dd86e589a463ec658763d1bbe642d78c1..4600ec33b5ffcb1b0836c4e4d3623b4af6268ab8 100644 (file)
@@ -468,7 +468,7 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
     }
 
     size_t i_outsize = calculate_output_buffer_size ( p_filter, p_in_buf->i_buffer );
-    block_t *p_out_buf = filter_NewAudioBuffer( p_filter, i_outsize );
+    block_t *p_out_buf = block_Alloc( i_outsize );
     if( p_out_buf == NULL )
         return NULL;