Changeset 4f6b904c37e1f62109e46f8d16bb2d801435d4c1

Timestamp:

10/06/07 21:53:00 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1181505180 +0000

git-parent:

[ba9cf795c46e27566149aa0ae096221e9924e6d2]

git-author:

Laurent Aimar <fenrir@videolan.org> 1181505180 +0000

Message:

Simplify + fix a potential overflow.

Files:

• src/audio_output/dec.c (modified) (1 diff)
• src/audio_output/input.c (modified) (5 diffs)

src/audio_output/dec.c

@@ -342 +342 @@
-
-    p_buffer->end_date = p_buffer->start_date
-(p_buffer->i_nb_samples * 1000000)
+p_buffer->i_nb_samples * 1000000
-                                / p_input->input.i_rate;
-

src/audio_output/input.c

@@ -45 +45 @@
-
-static void inputFailure( aout_instance_t *, aout_input_t *, const char * );
+static void inputDrop( aout_instance_t *, aout_input_t * );
-static int VisualizationCallback( vlc_object_t *, char const *,
-                                  vlc_value_t, vlc_value_t, void * );
@@ -449 +450 @@
-        }
-        start_date = 0;
-
-
-
-
-
-
+
-    }
-
@@ -463 +459 @@
-        msg_Warn( p_aout, "PTS is out of range ("I64Fd"), dropping buffer",
-                  mdate() - p_buffer->start_date );
-
-
-
-
-
-
+
+
-        aout_BufferFree( p_buffer );
-        p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
@@ -506 +498 @@
-                  start_date - p_buffer->start_date );
-        aout_BufferFree( p_buffer );
-
-
-
-
-
-
+
-        return 0;
-    }
@@ -646 +633 @@
-}
-
+static void inputDrop( aout_instance_t *p_aout, aout_input_t *p_input )
+{
+    if( !p_input->p_input_thread )
+        return;
+
+    vlc_mutex_lock( &p_input->p_input_thread->p->counters.counters_lock);
+    stats_UpdateInteger( p_aout, p_input->p_input_thread->p->counters.p_lost_abuffers, 1, NULL );
+    vlc_mutex_unlock( &p_input->p_input_thread->p->counters.counters_lock);
+}
+
-static int ChangeFiltersString( aout_instance_t * p_aout, const char* psz_variable,
-                                 const char *psz_name, vlc_bool_t b_add )