Skip to content

V
vlc-1.1
Commit 1b3363d1 authored by Cyril Deguet's avatar Cyril Deguet
Browse files
Options 

- beginning of code factorization in aout_s16 (more cleaning will come)
- As for libmad, I have tried to create the aout fifo in libmad_output,
  to open it with the right sample rate, but strangely it didn't work.
parent 0e8b68b5
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 100 deletions
plugins/mpeg_adec/mpeg_adec.c
View file @ 1b3363d1
......@@ -2,7 +2,7 @@
* mpeg_adec.c: MPEG audio decoder thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: mpeg_adec.c,v 1.12 2002/01/10 04:11:25 sam Exp $
* $Id: mpeg_adec.c,v 1.13 2002/01/10 23:41:08 asmax Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
......@@ -198,7 +198,7 @@ static void DecodeThread( adec_thread_t * p_adec )
p_adec->i_sync = 1;
p_adec->p_aout_fifo->l_rate = sync_info.sample_rate;
// p_adec->p_aout_fifo->l_rate = sync_info.sample_rate;
buffer = ((s16 *)p_adec->p_aout_fifo->buffer)
+ (p_adec->p_aout_fifo->l_end_frame * ADEC_FRAME_SIZE);
......@@ -223,7 +223,6 @@ static void DecodeThread( adec_thread_t * p_adec )
else
{
vlc_mutex_lock (&p_adec->p_aout_fifo->data_lock);
p_adec->p_aout_fifo->l_end_frame =
(p_adec->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE;
vlc_cond_signal (&p_adec->p_aout_fifo->data_wait);
......
src/audio_output/aout_s16.c
View file @ 1b3363d1
......@@ -237,132 +237,51 @@ static void S16Play( aout_thread_t * p_aout, aout_fifo_t * p_fifo )
break;
case AOUT_ADEC_MONO_FIFO:
case AOUT_ADEC_STEREO_FIFO:
l_units = p_aout->l_units;
while ( l_units > 0 )
{
if ( !p_fifo->b_next_frame )
if( !p_fifo->b_next_frame )
{
if ( NextFrame(p_aout, p_fifo, p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
if( NextFrame(p_aout, p_fifo, p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
{
break;
}
}
if ( p_fifo->l_units > l_units )
{
/* p_aout->b_stereo == 1 */
l_buffer_limit = p_aout->l_units << 1;
l_buffer_limit = p_aout->l_units << p_aout->b_stereo;
while ( l_buffer < l_buffer_limit )
{
if( p_aout->b_stereo )
{
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[p_fifo->l_unit] );
(s32)( ((s16 *)p_fifo->buffer)[2*p_fifo->l_unit] );
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[p_fifo->l_unit] );
UPDATE_INCREMENT( p_fifo->unit_increment, p_fifo->l_unit )
if ( p_fifo->l_unit >= /* p_fifo->b_stereo == 0 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 0)) )
{
p_fifo->l_unit -= /* p_fifo->b_stereo == 0 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 0));
}
}
p_fifo->l_units -= l_units;
break;
(s32)( ((s16 *)p_fifo->buffer)[2*p_fifo->l_unit+1] );
}
else /* p_fifo->l_units <= l_units */
{
/* p_aout->b_stereo == 1 */
l_buffer_limit = p_fifo->l_units << 1;
while ( l_buffer < l_buffer_limit )
else
{
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[p_fifo->l_unit] );
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[p_fifo->l_unit] );
UPDATE_INCREMENT( p_fifo->unit_increment, p_fifo->l_unit )
if ( p_fifo->l_unit >= /* p_fifo->b_stereo == 0 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 0)) )
{
p_fifo->l_unit -= /* p_fifo->b_stereo == 0 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 0));
}
}
l_units -= p_fifo->l_units;
vlc_mutex_lock( &p_fifo->data_lock );
p_fifo->l_start_frame = p_fifo->l_next_frame;
vlc_cond_signal( &p_fifo->data_wait );
vlc_mutex_unlock( &p_fifo->data_lock );
/* p_fifo->b_start_frame = 1; */
p_fifo->l_next_frame += 1;
p_fifo->l_next_frame &= AOUT_FIFO_SIZE;
p_fifo->b_next_frame = 0;
}
}
break;
case AOUT_ADEC_STEREO_FIFO:
l_units = p_aout->l_units;
while ( l_units > 0 )
{
if ( !p_fifo->b_next_frame )
{
if ( NextFrame(p_aout, p_fifo, p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
UPDATE_INCREMENT( p_fifo->unit_increment, p_fifo->l_unit )
if ( p_fifo->l_unit >=
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> p_fifo->b_stereo)) )
{
break;
p_fifo->l_unit -=
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> p_fifo->b_stereo));
}
}
if ( p_fifo->l_units > l_units )
{
/* p_aout->b_stereo == 1 */
l_buffer_limit = p_aout->l_units << 1;
while ( l_buffer < l_buffer_limit )
{
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[2*p_fifo->l_unit] );
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[2*p_fifo->l_unit+1] );
UPDATE_INCREMENT( p_fifo->unit_increment, p_fifo->l_unit )
if ( p_fifo->l_unit >= /* p_fifo->b_stereo == 1 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 1)) )
{
p_fifo->l_unit -= /* p_fifo->b_stereo == 1 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 1));
}
}
p_fifo->l_units -= l_units;
break;
}
else /* p_fifo->l_units <= l_units */
{
/* p_aout->b_stereo == 1 */
l_buffer_limit = p_fifo->l_units << 1;
while ( l_buffer < l_buffer_limit )
{
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[2*p_fifo->l_unit] );
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_fifo->buffer)[2*p_fifo->l_unit+1] );
UPDATE_INCREMENT( p_fifo->unit_increment, p_fifo->l_unit )
if ( p_fifo->l_unit >= /* p_fifo->b_stereo == 1 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 1)) )
{
p_fifo->l_unit -= /* p_fifo->b_stereo == 1 */
((AOUT_FIFO_SIZE + 1) * (p_fifo->l_frame_size >> 1));
}
}
l_units -= p_fifo->l_units;
vlc_mutex_lock( &p_fifo->data_lock );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment