Changeset 70a8bb9649c3e44350d0fd579c24b8a9ddd7af34

Timestamp:

06/12/07 21:46:35 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[8f1901a659e0778dd4c6086bcc3b9d7174d1abaf]

git-author:

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

Message:

All: preliminary support for audio while playing faster/slower (1/4 -> 4).
It use our standard resampler to do it and so we do not keep
pitch yet (I am working on a soundtouch resampler).
Please test any regression.

Files:

• include/vlc_aout.h (modified) (2 diffs)
• modules/audio_filter/resampler/bandlimited.c (modified) (1 diff)
• modules/codec/a52.c (modified) (6 diffs)
• modules/codec/faad.c (modified) (4 diffs)
• modules/codec/ffmpeg/audio.c (modified) (5 diffs)
• modules/codec/mpeg_audio.c (modified) (6 diffs)
• modules/codec/vorbis.c (modified) (5 diffs)
• modules/packetizer/mpeg4audio.c (modified) (6 diffs)
• src/audio_output/aout_internal.h (modified) (2 diffs)
• src/audio_output/dec.c (modified) (3 diffs)
• src/audio_output/filters.c (modified) (2 diffs)
• src/audio_output/input.c (modified) (14 diffs)
• src/input/decoder.c (modified) (3 diffs)
• src/input/es_out.c (modified) (4 diffs)
• src/input/input.c (modified) (1 diff)

include/vlc_aout.h

@@ -170 +170 @@
-#define A52_FRAME_NB 1536
-
+/* Max input rate factor (1/4 -> 4) */
+#define AOUT_MAX_INPUT_RATE (4)
+
-/** date incrementation helper structure without long-term
- * rounding errors
@@ -278 +281 @@
-    vlc_bool_t              b_changed;
-
+    /* last rate from input */
+    int                     i_last_input_rate;
-    /* internal caching delay from input */
-    int                     i_pts_delay;

modules/audio_filter/resampler/bandlimited.c

@@ -124 +124 @@
-    /* Calculate worst case for the length of the filter wing */
-    d_factor = (double)p_filter->output.i_rate
-
+ / AOUT_MAX_INPUT_RATE
-    i_filter_wing = ((SMALL_FILTER_NMULT + 1)/2.0)
-                      * __MAX(1.0, 1.0/d_factor) + 10;

modules/codec/a52.c

@@ -30 +30 @@
-#include <vlc_codec.h>
-#include <vlc_aout.h>
+#include <vlc_input.h>
-#include <vlc_block_helper.h>
-
@@ -58 +59 @@
-    unsigned int i_rate, i_channels, i_channels_conf;
-
+    int i_input_rate;
-};
-
@@ -129 +131 @@
-
-    p_sys->bytestream = block_BytestreamInit( p_dec );
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
-
-    /* Set output properties */
@@ -188 +191 @@
-    }
-
+    if( (*pp_block)->i_rate > 0 )
+        p_sys->i_input_rate = (*pp_block)->i_rate;
+
-    block_BytestreamPush( &p_sys->bytestream, *pp_block );
-
@@ -386 +392 @@
-
-    p_buf->start_date = aout_DateGet( &p_sys->end_date );
-
+
+
-
-    return p_buf;
@@ -404 +411 @@
-    p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date );
-
-
-
+
+
+
+
-
-    return p_block;

modules/codec/faad.c

@@ -70 +70 @@
-
-    vlc_bool_t b_sbr, b_ps;
+
+    int i_input_rate;
-};
-
@@ -167 +169 @@
-    p_sys->p_buffer = 0;
-
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
+
-    /* Faad2 can't deal with truncated data (eg. from MPEG TS) */
-    p_dec->b_need_packetized = VLC_TRUE;
@@ -191 +195 @@
-        return NULL;
-    }
+
+    if( p_block->i_rate > 0 )
+        p_sys->i_input_rate = p_block->i_rate;
-
-    /* Append the block to the temporary buffer */
@@ -375 +382 @@
-        p_out->start_date = aout_DateGet( &p_sys->date );
-        p_out->end_date = aout_DateIncrement( &p_sys->date,
-                                  frame.samples / frame.channels
+(frame.samples / frame.channels) * p_sys->i_input_rate / INPUT_RATE_DEFAULT
-
-        DoReordering( p_dec, (uint32_t *)p_out->p_buffer, samples,

modules/codec/ffmpeg/audio.c

@@ -29 +29 @@
-#include <vlc_aout.h>
-#include <vlc_codec.h>
+#include <vlc_input.h>
-
-/* ffmpeg header */
@@ -76 +77 @@
-    /* */
-    int     i_reject_count;
+
+    int i_input_rate;
-};
-
@@ -147 +150 @@
-    p_sys->i_samples = 0;
-    p_sys->i_reject_count = 0;
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
-
-    aout_DateSet( &p_sys->end_date, 0 );
@@ -179 +183 @@
-
-    p_buffer->start_date = aout_DateGet( &p_sys->end_date );
-
+
+
-
-    memcpy( p_buffer->p_buffer, p_sys->p_samples, p_buffer->i_nb_bytes );
@@ -202 +207 @@
-
-    p_block = *pp_block;
+
+    if( p_block->i_rate > 0 )
+        p_sys->i_input_rate = p_block->i_rate;
-
-    if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )

modules/codec/mpeg_audio.c

@@ -31 +31 @@
-#include <vlc_codec.h>
-#include <vlc_aout.h>
+#include <vlc_input.h>
-
-#include <vlc_block_helper.h>
@@ -63 +64 @@
-
-    vlc_bool_t   b_discontinuity;
+
+    int i_input_rate;
-};
-
@@ -156 +159 @@
-    p_sys->bytestream = block_BytestreamInit( p_dec );
-    p_sys->b_discontinuity = VLC_FALSE;
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
-
-    /* Set output properties */
@@ -220 +224 @@
-        return NULL;
-    }
+
+    if( (*pp_block)->i_rate > 0 )
+        p_sys->i_input_rate = (*pp_block)->i_rate;
-
-    block_BytestreamPush( &p_sys->bytestream, *pp_block );
@@ -536 +543 @@
-    p_buf->start_date = aout_DateGet( &p_sys->end_date );
-    p_buf->end_date =
-
+
+
-    p_buf->b_discontinuity = p_sys->b_discontinuity;
-    p_sys->b_discontinuity = VLC_FALSE;
@@ -560 +568 @@
-
-    p_block->i_length =
-
-
+
+
+
-
-    return p_block;

modules/codec/vorbis.c

@@ -79 +79 @@
-    int          i_last_block_size;
-
+    int i_input_rate;
+
-    /*
-    ** Channel reordering
@@ -238 +240 @@
-    p_sys->b_packetizer = VLC_FALSE;
-    p_sys->i_headers = 0;
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
-
-    /* Take care of vorbis init */
@@ -292 +295 @@
-        oggpacket.packet = (*pp_block)->p_buffer;
-        oggpacket.bytes = (*pp_block)->i_buffer;
+
+        if( (*pp_block)->i_rate > 0 )
+            p_sys->i_input_rate = (*pp_block)->i_rate;
-    }
-    else
@@ -564 +570 @@
-        p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date );
-        p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date,
-
+* p_sys->i_input_rate / INPUT_RATE_DEFAULT 
-        return p_aout_buffer;
-    }
@@ -591 +597 @@
-
-    if( p_sys->i_headers >= 3 )
-
-
+
+
+
-    else
-        p_block->i_length = 0;

modules/packetizer/mpeg4audio.c

@@ -35 +35 @@
-#include <vlc_sout.h>
-#include <vlc_codecs.h>
+#include <vlc_input.h>
-
-#include "vlc_block_helper.h"
@@ -73 +74 @@
-    unsigned int i_channels;
-    unsigned int i_rate, i_frame_length, i_header_size;
+
+    int i_input_rate;
-};
-
@@ -147 +150 @@
-    aout_DateSet( &p_sys->end_date, 0 );
-    p_sys->bytestream = block_BytestreamInit( p_dec );
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
-
-    /* Set output properties */
@@ -242 +246 @@
-
-    p_block->i_length = aout_DateIncrement( &p_sys->end_date,
-
+* p_sys->i_input_rate / INPUT_RATE_DEFAULT 
-
-    return p_block;
@@ -278 +282 @@
-    }
-
+    if( (*pp_block)->i_rate > 0 )
+        p_sys->i_input_rate = (*pp_block)->i_rate;
+
-    block_BytestreamPush( &p_sys->bytestream, *pp_block );
-
@@ -444 +451 @@
-
-    p_block->i_length = aout_DateIncrement( &p_sys->end_date,
-
+
+
-
-    *pp_out_buffer = p_block;

src/audio_output/aout_internal.h

@@ -80 +80 @@
-int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input );
-int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
-
+, int i_input_rate
-
-/* From filters.c : */
@@ -130 +130 @@
-aout_buffer_t * aout_DecNewBuffer( aout_instance_t *, aout_input_t *, size_t );
-void aout_DecDeleteBuffer( aout_instance_t *, aout_input_t *, aout_buffer_t * );
-
+, int i_input_rate
-

src/audio_output/dec.c

@@ -311 +311 @@
- *****************************************************************************/
-int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
-
+, int i_input_rate
-{
-    if ( p_buffer->start_date == 0 )
@@ -318 +318 @@
-        aout_BufferFree( p_buffer );
-        return -1;
+    }
+
+    if( i_input_rate > INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE ||
+        i_input_rate < INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE )
+    {
+        aout_BufferFree( p_buffer );
+        return 0;
-    }
-
@@ -376 +383 @@
-    mwait( p_buffer->start_date - AOUT_MAX_PREPARE_TIME );
-
-
+, i_input_rate
-    {
-        vlc_mutex_unlock( &p_input->lock );

src/audio_output/filters.c

@@ -294 +294 @@
-
-        int i_output_size = p_filter->output.i_bytes_per_frame
-
+ * AOUT_MAX_INPUT_RATE
-                             / p_filter->output.i_frame_length;
-        int i_input_size = p_filter->input.i_bytes_per_frame
-
+ * AOUT_MAX_INPUT_RATE
-                             / p_filter->input.i_frame_length;
-
@@ -358 +358 @@
-            *pp_input_buffer = p_output_buffer;
-        }
-
-
-
+
+
+
+
+
+

src/audio_output/input.c

@@ -45 +45 @@
-
-static void inputFailure( aout_instance_t *, aout_input_t *, const char * );
-
+
+
+
-static int VisualizationCallback( vlc_object_t *, char const *,
-                                  vlc_value_t, vlc_value_t, void * );
@@ -365 +367 @@
-                                     * p_input->input.i_rate
-                                     / p_input->input.i_frame_length) );
-
-    /* Success */
-    p_input->b_error = VLC_FALSE;
-    p_input->b_restart = VLC_FALSE;
+    p_input->i_last_input_rate = INPUT_RATE_DEFAULT;
-
-    return 0;
@@ -398 +400 @@
- * This function must be entered with the input lock.
- *****************************************************************************/
+/* XXX Do not activate it !! */
+//#define AOUT_PROCESS_BEFORE_CHEKS
-int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
-
+, int i_input_rate
-{
-    mtime_t start_date;
@@ -421 +425 @@
-
-        vlc_mutex_unlock( &p_aout->mixer_lock );
+    }
+
+#ifdef AOUT_PROCESS_BEFORE_CHEKS
+    /* Run pre-filters. */
+    aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
+                      &p_buffer );
+
+    /* Actually run the resampler now. */
+    if ( p_input->i_nb_resamplers > 0 )
+    {
+        const mtime_t i_date = p_buffer->start_date;
+        aout_FiltersPlay( p_aout, p_input->pp_resamplers,
+                          p_input->i_nb_resamplers,
+                          &p_buffer );
+    }
+
+    if( p_buffer->i_nb_samples <= 0 )
+    {
+        aout_BufferFree( p_buffer );
+        return 0;
+    }
+#endif
+
+    /* Handle input rate change by modifying resampler input rate */
+    if( i_input_rate != p_input->i_last_input_rate )
+    {
+        unsigned int * const pi_rate = &p_input->pp_resamplers[0]->input.i_rate;
+#define F(r,ir) ( INPUT_RATE_DEFAULT * (r) / (ir) )
+        const int i_delta = *pi_rate - F(p_input->input.i_rate,p_input->i_last_input_rate);
+        *pi_rate = F(p_input->input.i_rate + i_delta, i_input_rate);
+#undef F
+        p_input->i_last_input_rate = i_input_rate;
-    }
-
@@ -443 +479 @@
-        if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
-            msg_Warn( p_aout, "timing screwed, stopping resampling" );
-
-
-
-
-
-
+
-        start_date = 0;
-        inputDrop( p_aout, p_input );
-    }
-
@@ -460 +490 @@
-                  mdate() - p_buffer->start_date );
-
-
-
-
-
-
-
-
-
+
+
-        return 0;
-    }
@@ -484 +508 @@
-        if ( p_input->i_resampling_type != AOUT_RESAMPLING_NONE )
-            msg_Warn( p_aout, "timing screwed, stopping resampling" );
-
-
-
-
-
-
+
-        start_date = 0;
-    }
@@ -497 +516 @@
-        msg_Warn( p_aout, "audio drift is too big ("I64Fd"), dropping buffer",
-                  start_date - p_buffer->start_date );
-
-
+
-        return 0;
-    }
@@ -504 +522 @@
-    if ( start_date == 0 ) start_date = p_buffer->start_date;
-
+#ifndef AOUT_PROCESS_BEFORE_CHEKS
-    /* Run pre-filters. */
-
-    aout_FiltersPlay( p_aout, p_input->pp_filters, p_input->i_nb_filters,
-                      &p_buffer );
+#endif
-
-    /* Run the resampler if needed.
@@ -556 +575 @@
-        /* Check if everything is back to normal, in which case we can stop the
-         * resampling */
-
-
+
-        {
-            p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
@@ -583 +601 @@
-             * is bad. We'd better stop the resampling right now. */
-            msg_Warn( p_aout, "timing screwed, stopping resampling" );
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* Adding the start date will be managed by aout_FifoPush(). */
@@ -593 +626 @@
-    p_buffer->start_date = start_date;
-
-    /* Actually run the resampler now. */
-    if ( p_input->i_nb_resamplers > 0 )
-    {
-        aout_FiltersPlay( p_aout, p_input->pp_resamplers,
-                          p_input->i_nb_resamplers,
-                          &p_buffer );
-    }
-
-    vlc_mutex_lock( &p_aout->input_fifos_lock );
-    aout_FifoPush( p_aout, &p_input->fifo, p_buffer );
-    vlc_mutex_unlock( &p_aout->input_fifos_lock );
-
-    return 0;
-}
@@ -633 +657 @@
-}
-
-
+, aout_buffer_t *p_buffer
-{
+    aout_BufferFree( p_buffer );
+
-    if( !p_input->p_input_thread )
-        return;
@@ -641 +667 @@
-    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 void inputResamplingStop( aout_input_t *p_input )
+{
+    p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
+    if( p_input->i_nb_resamplers != 0 )
+    {
+        p_input->pp_resamplers[0]->input.i_rate = INPUT_RATE_DEFAULT *
+                            p_input->input.i_rate / p_input->i_last_input_rate;
+        p_input->pp_resamplers[0]->b_continuity = VLC_FALSE;
+    }
-}
-

src/input/decoder.c

@@ -469 +469 @@
-{
-    input_thread_t *p_input = p_dec->p_owner->p_input;
+    const int i_rate = p_block->i_rate;
-    aout_buffer_t *p_aout_buf;
-
@@ -492 +493 @@
-        aout_DecPlay( p_dec->p_owner->p_aout,
-                      p_dec->p_owner->p_aout_input,
-
+, i_rate
-    }
-}
@@ -524 +525 @@
-        picture_t *p_pic = p_vout->render.pp_picture[i];
-
-
+
+
-        {
-            /* We cannot change picture status if it is in READY_PICTURE state,

src/input/es_out.c

@@ -34 +34 @@
-#include <vlc_es_out.h>
-#include <vlc_block.h>
+#include <vlc_aout.h>
-
-#include "input_internal.h"
@@ -1217 +1218 @@
-    }
-
-    /* +11 -> avoid null value with non null dts/pts */
-    if( p_block->i_dts > 0 && (p_block->i_flags&BLOCK_FLAG_PREROLL) )
-    {
@@ -1253 +1253 @@
-
-    /* TODO handle mute */
-
-
+
+
+
+
-    {
-        input_DecoderDecode( es->p_dec, p_block );
@@ -1512 +1514 @@
-            i_pcr = (int64_t)va_arg( args, int64_t );
-            /* search program */
-            /* 11 is a vodoo trick to avoid non_pcr*9/100 to be null */
-            input_ClockSetPCR( p_sys->p_input, &p_pgrm->clock, i_pcr );
-            return VLC_SUCCESS;

src/input/input.c

@@ -1671 +1671 @@
-                var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
-
-
-
-
+
+
-
-                p_input->p->i_rate  = i_rate;