aout_filter_t.(in|out)put -> aout_filter_t.fmt_(in|out).audio

[vlc] / modules / audio_filter / converter / fixed.c

diff --git a/modules/audio_filter/converter/fixed.c b/modules/audio_filter/converter/fixed.c
index 20e1922bb35db2116dd93cd309e439f56f90efb0..db82c6cab8e05e9efa6ca06674ed7437f704cbbf 100644 (file)
--- a/modules/audio_filter/converter/fixed.c
+++ b/modules/audio_filter/converter/fixed.c
@@ -73,13 +73,13 @@ static int Create_F32ToS16( vlc_object_t *p_this )
 {
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
-    if ( p_filter->input.i_format != VLC_CODEC_FI32
-          || p_filter->output.i_format != VLC_CODEC_S16N )
+    if ( p_filter->fmt_in.audio.i_format != VLC_CODEC_FI32
+          || p_filter->fmt_out.audio.i_format != VLC_CODEC_S16N )
     {
         return -1;
     }
 
-    if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+    if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
     {
         return -1;
     }
@@ -140,7 +140,7 @@ static void Do_F32ToS16( aout_instance_t * p_aout, aout_filter_t * p_filter,
     int16_t * p_out = (int16_t *)p_out_buf->p_buffer;
 
     for ( i = p_in_buf->i_nb_samples
-               * aout_FormatNbChannels( &p_filter->input ) ; i-- ; )
+               * aout_FormatNbChannels( &p_filter->fmt_in.audio ) ; i-- ; )
     {
         /* Fast Scaling */
         *p_out++ = s24_to_s16_pcm(*p_in++);
@@ -157,13 +157,13 @@ static int Create_S16ToF32( vlc_object_t *p_this )
 {
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
-    if ( p_filter->output.i_format != VLC_CODEC_FI32
-          || p_filter->input.i_format != VLC_CODEC_S16N )
+    if ( p_filter->fmt_out.audio.i_format != VLC_CODEC_FI32
+          || p_filter->fmt_in.audio.i_format != VLC_CODEC_S16N )
     {
         return -1;
     }
 
-    if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+    if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
     {
         return -1;
     }
@@ -178,7 +178,7 @@ static void Do_S16ToF32( aout_instance_t * p_aout, aout_filter_t * p_filter,
                          aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
     VLC_UNUSED(p_aout);
-    int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
+    int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->fmt_in.audio );
 
     /* We start from the end because b_in_place is true */
     int16_t * p_in = (int16_t *)p_in_buf->p_buffer + i - 1;
@@ -203,13 +203,13 @@ static int Create_U8ToF32( vlc_object_t *p_this )
 {
     aout_filter_t * p_filter = (aout_filter_t *)p_this;
 
-    if ( p_filter->input.i_format != VLC_CODEC_U8
-          || p_filter->output.i_format != VLC_CODEC_FI32 )
+    if ( p_filter->fmt_in.audio.i_format != VLC_CODEC_U8
+          || p_filter->fmt_out.audio.i_format != VLC_CODEC_FI32 )
     {
         return -1;
     }
 
-    if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+    if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
     {
         return -1;
     }
@@ -224,7 +224,7 @@ static void Do_U8ToF32( aout_instance_t * p_aout, aout_filter_t * p_filter,
                         aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
 {
     VLC_UNUSED(p_aout);
-    int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->input );
+    int i = p_in_buf->i_nb_samples * aout_FormatNbChannels( &p_filter->fmt_in.audio );
 
     /* We start from the end because b_in_place is true */
     uint8_t * p_in = (uint8_t *)p_in_buf->p_buffer + i - 1;