- Remove config_FindModule as module_Find nowadays does the same thing

[vlc] / src / audio_output / mixer.c

diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 5c66c45190628a8c96854c2bd53a9fb9193e13fa..cbcfcc3e10df1f5d56b93f0d205549c789611089 100644 (file)
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * mixer.c : audio output mixing operations
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: mixer.c,v 1.24 2003/01/23 17:13:28 massiot Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -18,24 +18,19 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                            /* calloc(), malloc(), free() */
-#include <string.h>
-
 #include <vlc/vlc.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
 #endif
-
-#include "audio_output.h"
+#include <vlc_aout.h>
 #include "aout_internal.h"
-
 /*****************************************************************************
  * aout_MixerNew: prepare a mixer plug-in
  *****************************************************************************
@@ -43,10 +38,10 @@
  *****************************************************************************/
 int aout_MixerNew( aout_instance_t * p_aout )
 {
-    p_aout->mixer.p_module = module_Need( p_aout, "audio mixer", NULL );
+    p_aout->mixer.p_module = module_Need( p_aout, "audio mixer", NULL, 0 );
     if ( p_aout->mixer.p_module == NULL )
     {
-        msg_Err( p_aout, "no suitable aout mixer" );
+        msg_Err( p_aout, "no suitable audio mixer" );
         return -1;
     }
     p_aout->mixer.b_error = 0;
@@ -140,7 +135,13 @@ static int MixBuffer( aout_instance_t * p_aout )
                           "trashing", mdate() - p_buffer->start_date );
                 p_buffer = aout_FifoPop( p_aout, p_fifo );
                 aout_BufferFree( p_buffer );
+                if( p_input->p_input_thread )
+                {
+//                    stats_UpdateInteger( p_input->p_input_thread,
+//                                         "lost_abuffers", 1 );
+                }
                 p_buffer = p_fifo->p_first;
+                p_input->p_first_byte_to_mix = NULL;
             }
 
             if ( p_buffer == NULL )
@@ -188,12 +189,19 @@ static int MixBuffer( aout_instance_t * p_aout )
         }
 
         /* Check for the continuity of start_date */
-        while ( p_buffer != NULL && p_buffer->end_date < start_date )
+        while ( p_buffer != NULL && p_buffer->end_date < start_date - 1 )
         {
+            /* We authorize a +-1 because rounding errors get compensated
+             * regularly. */
             aout_buffer_t * p_next = p_buffer->p_next;
             msg_Warn( p_aout, "the mixer got a packet in the past ("I64Fd")",
                       start_date - p_buffer->end_date );
             aout_BufferFree( p_buffer );
+            if( p_input->p_input_thread )
+            {
+//                stats_UpdateInteger( p_input->p_input_thread,
+//                                     "lost_abuffers", 1 );
+            }
             p_fifo->p_first = p_buffer = p_next;
             p_input->p_first_byte_to_mix = NULL;
         }
@@ -203,41 +211,6 @@ static int MixBuffer( aout_instance_t * p_aout )
             break;
         }
 
-        if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
-        {
-            /* Additionally check that p_first_byte_to_mix is well
-             * located. */
-            mtime_t i_nb_bytes = (start_date - p_buffer->start_date)
-                            * p_aout->mixer.mixer.i_bytes_per_frame
-                            * p_aout->mixer.mixer.i_rate
-                            / p_aout->mixer.mixer.i_frame_length
-                            / 1000000;
-            ptrdiff_t mixer_nb_bytes;
-
-            if ( p_input->p_first_byte_to_mix == NULL )
-            {
-                p_input->p_first_byte_to_mix = p_buffer->p_buffer;
-            }
-            mixer_nb_bytes = p_input->p_first_byte_to_mix
-                              - p_buffer->p_buffer;
-
-            if ( !((i_nb_bytes + p_aout->mixer.mixer.i_bytes_per_frame
-                     > mixer_nb_bytes) &&
-                   (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame
-                     + mixer_nb_bytes)) )
-            {
-                msg_Warn( p_aout,
-                          "mixer start isn't output start ("I64Fd,
-                          i_nb_bytes - mixer_nb_bytes );
-
-                /* Round to the nearest multiple */
-                i_nb_bytes /= p_aout->mixer.mixer.i_bytes_per_frame;
-                i_nb_bytes *= p_aout->mixer.mixer.i_bytes_per_frame;
-                p_input->p_first_byte_to_mix = p_buffer->p_buffer
-                                                + i_nb_bytes;
-            }
-        }
-
         /* Check that we have enough samples. */
         for ( ; ; )
         {
@@ -276,6 +249,47 @@ static int MixBuffer( aout_instance_t * p_aout )
             else break;
         }
         if ( p_buffer == NULL ) break;
+
+        p_buffer = p_fifo->p_first;
+        if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
+        {
+            /* Additionally check that p_first_byte_to_mix is well
+             * located. */
+            mtime_t i_nb_bytes = (start_date - p_buffer->start_date)
+                            * p_aout->mixer.mixer.i_bytes_per_frame
+                            * p_aout->mixer.mixer.i_rate
+                            / p_aout->mixer.mixer.i_frame_length
+                            / 1000000;
+            ptrdiff_t mixer_nb_bytes;
+
+            if ( p_input->p_first_byte_to_mix == NULL )
+            {
+                p_input->p_first_byte_to_mix = p_buffer->p_buffer;
+            }
+            mixer_nb_bytes = p_input->p_first_byte_to_mix - p_buffer->p_buffer;
+
+            if ( !((i_nb_bytes + p_aout->mixer.mixer.i_bytes_per_frame
+                     > mixer_nb_bytes) &&
+                   (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame
+                     + mixer_nb_bytes)) )
+            {
+                msg_Warn( p_aout, "mixer start isn't output start ("I64Fd")",
+                          i_nb_bytes - mixer_nb_bytes );
+
+                /* Round to the nearest multiple */
+                i_nb_bytes /= p_aout->mixer.mixer.i_bytes_per_frame;
+                i_nb_bytes *= p_aout->mixer.mixer.i_bytes_per_frame;
+                if( i_nb_bytes < 0 )
+                {
+                    /* Is it really the best way to do it ? */
+                    aout_FifoSet( p_aout, &p_aout->output.fifo, 0 );
+                    aout_DateSet( &exact_start_date, 0 );
+                    break;
+                }
+
+                p_input->p_first_byte_to_mix = p_buffer->p_buffer + i_nb_bytes;
+            }
+        }
     }
 
     if ( i < p_aout->i_nb_inputs || i_first_input == p_aout->i_nb_inputs )