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

[vlc] / src / audio_output / filters.c

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 9bcba0ddf3a842b224e80c8f689806fbcd3827a4..d150961b760fc5d8a9384a572661d548514a5acd 100644 (file)
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -28,12 +28,10 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_interface.h>
+#include <assert.h>
 
-#ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#endif
+#include <vlc_common.h>
+#include <vlc_dialog.h>
 
 #include <vlc_aout.h>
 #include "aout_internal.h"
@@ -55,10 +53,10 @@ static aout_filter_t * FindFilter( aout_instance_t * p_aout,
     if ( p_filter == NULL ) return NULL;
     vlc_object_attach( p_filter, p_aout );
 
-    memcpy( &p_filter->input, p_input_format, sizeof(audio_sample_format_t) );
-    memcpy( &p_filter->output, p_output_format,
+    memcpy( &p_filter->fmt_in.audio, p_input_format, sizeof(audio_sample_format_t) );
+    memcpy( &p_filter->fmt_out.audio, p_output_format,
             sizeof(audio_sample_format_t) );
-    p_filter->p_module = module_need( p_filter, "audio filter", NULL, 0 );
+    p_filter->p_module = module_need( p_filter, "audio filter", NULL, false );
     if ( p_filter->p_module == NULL )
     {
         vlc_object_detach( p_filter );
@@ -156,9 +154,9 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
     if( *pi_nb_filters + 1 > AOUT_MAX_FILTERS )
     {
         msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
-        intf_UserFatal( p_aout, false, _("Audio filtering failed"),
-                        _("The maximum number of filters (%d) was reached."),
-                        AOUT_MAX_FILTERS );
+        dialog_Fatal( p_aout, _("Audio filtering failed"),
+                      _("The maximum number of filters (%d) was reached."),
+                      AOUT_MAX_FILTERS );
         return -1;
     }
 
@@ -203,17 +201,17 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
     {
         ReleaseFilter( pp_filters[0] );
         msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
-        intf_UserFatal( p_aout, false, _("Audio filtering failed"),
-                        _("The maximum number of filters (%d) was reached."),
-                        AOUT_MAX_FILTERS );
+        dialog_Fatal( p_aout, _("Audio filtering failed"),
+                      _("The maximum number of filters (%d) was reached."),
+                      AOUT_MAX_FILTERS );
         return -1;
     }
-    pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
+    pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->fmt_out.audio,
                                 p_output_format );
     if ( pp_filters[1] == NULL )
     {
         /* Try to split the conversion. */
-        i_nb_conversions = SplitConversion( &pp_filters[0]->output,
+        i_nb_conversions = SplitConversion( &pp_filters[0]->fmt_out.audio,
                                            p_output_format, &temp_format );
         if ( !i_nb_conversions )
         {
@@ -226,12 +224,12 @@ int aout_FiltersCreatePipeline( aout_instance_t * p_aout,
         {
             ReleaseFilter( pp_filters[0] );
             msg_Err( p_aout, "max filter reached (%d)", AOUT_MAX_FILTERS );
-            intf_UserFatal( p_aout, false, _("Audio filtering failed"),
-                            _("The maximum number of filters (%d) was reached."),
-                            AOUT_MAX_FILTERS );
+            dialog_Fatal( p_aout, _("Audio filtering failed"),
+                          _("The maximum number of filters (%d) was reached."),
+                          AOUT_MAX_FILTERS );
             return -1;
         }
-        pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->output,
+        pp_filters[1] = FindFilter( p_aout, &pp_filters[0]->fmt_out.audio,
                                     &temp_format );
         pp_filters[2] = FindFilter( p_aout, &temp_format,
                                     p_output_format );
@@ -300,12 +298,12 @@ void aout_FiltersHintBuffers( aout_instance_t * p_aout,
     {
         aout_filter_t * p_filter = pp_filters[i];
 
-        int i_output_size = p_filter->output.i_bytes_per_frame
-                             * p_filter->output.i_rate * AOUT_MAX_INPUT_RATE
-                             / p_filter->output.i_frame_length;
-        int i_input_size = p_filter->input.i_bytes_per_frame
-                             * p_filter->input.i_rate * AOUT_MAX_INPUT_RATE
-                             / p_filter->input.i_frame_length;
+        int i_output_size = p_filter->fmt_out.audio.i_bytes_per_frame
+                         * p_filter->fmt_out.audio.i_rate * AOUT_MAX_INPUT_RATE
+                         / p_filter->fmt_out.audio.i_frame_length;
+        int i_input_size = p_filter->fmt_in.audio.i_bytes_per_frame
+                         * p_filter->fmt_in.audio.i_rate * AOUT_MAX_INPUT_RATE
+                         / p_filter->fmt_in.audio.i_frame_length;
 
         p_first_alloc->i_bytes_per_sec = __MAX( p_first_alloc->i_bytes_per_sec,
                                                 i_output_size );
@@ -315,14 +313,14 @@ void aout_FiltersHintBuffers( aout_instance_t * p_aout,
             p_first_alloc->i_bytes_per_sec = __MAX(
                                          p_first_alloc->i_bytes_per_sec,
                                          i_input_size );
-            p_filter->output_alloc.i_alloc_type = AOUT_ALLOC_NONE;
+            p_filter->output_alloc.b_alloc = false;
         }
         else
         {
             /* We're gonna need a buffer allocation. */
             memcpy( &p_filter->output_alloc, p_first_alloc,
                     sizeof(aout_alloc_t) );
-            p_first_alloc->i_alloc_type = AOUT_ALLOC_STACK;
+            p_first_alloc->b_alloc = true;
             p_first_alloc->i_bytes_per_sec = i_input_size;
         }
     }
@@ -345,14 +343,16 @@ void aout_FiltersPlay( aout_instance_t * p_aout,
         /* Resamplers can produce slightly more samples than (i_in_nb *
          * p_filter->output.i_rate / p_filter->input.i_rate) so we need
          * slightly bigger buffers. */
-        aout_BufferAlloc( &p_filter->output_alloc,
-                          ((mtime_t)(*pp_input_buffer)->i_nb_samples + 2)
-                          * 1000000 / p_filter->input.i_rate,
-                          *pp_input_buffer, p_output_buffer );
+        p_output_buffer = aout_BufferAlloc( &p_filter->output_alloc,
+                              ((mtime_t)(*pp_input_buffer)->i_nb_samples + 2)
+                              * 1000000 / p_filter->fmt_in.audio.i_rate,
+                              *pp_input_buffer );
         if( p_output_buffer == NULL )
             return;
+        p_output_buffer->i_pts = (*pp_input_buffer)->i_pts;
+        p_output_buffer->i_length = (*pp_input_buffer)->i_length;
 
-        /* Please note that p_output_buffer->i_nb_samples & i_nb_bytes
+        /* Please note that p_output_buffer->i_nb_samples & i_buffer
          * shall be set by the filter plug-in. */
         if( (*pp_input_buffer)->i_nb_samples > 0 )
         {
@@ -361,7 +361,7 @@ void aout_FiltersPlay( aout_instance_t * p_aout,
         }
         else
         {
-            p_output_buffer->i_nb_bytes = 0;
+            p_output_buffer->i_buffer = 0;
             p_output_buffer->i_nb_samples = 0;
         }
 
@@ -371,18 +371,5 @@ void aout_FiltersPlay( aout_instance_t * p_aout,
             *pp_input_buffer = p_output_buffer;
         }
     }
-
-    assert( (*pp_input_buffer) == NULL || (*pp_input_buffer)->i_alloc_type != AOUT_ALLOC_STACK );
-}
-
-/*****************************************************************************
- * aout_filter_RequestVout
- *****************************************************************************/
-vout_thread_t *aout_filter_RequestVout( aout_filter_t *p_filter,
-                                        vout_thread_t *p_vout, video_format_t *p_fmt )
-{
-    if( !p_filter->pf_request_vout )
-        return NULL;
-    return p_filter->pf_request_vout( p_filter, p_vout, p_fmt );
 }