mirror of https://code.videolan.org/videolan/vlc
* ./modules/audio_output/esd.c: we now properly use the esd_get_latency()
return value to avoid audio starvation. * ./modules/audio_filter/converter/*: a little loop optimization trick. * ./src/audio_output/aout_ext-dec.c: removed this deprecated file.
This commit is contained in:
Sam Hocevar
parent
a6ef9bbb9d
commit
eefc863b23
|
|
@ -2,7 +2,7 @@
|
|||
* a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2002 VideoLAN
|
||||
* $Id: a52tospdif.c,v 1.4 2002/08/13 11:59:36 sam Exp $
|
||||
* $Id: a52tospdif.c,v 1.5 2002/08/13 14:53:46 sam Exp $
|
||||
*
|
||||
* Authors: Christophe Massiot <massiot@via.ecp.fr>
|
||||
* Stéphane Borel <stef@via.ecp.fr>
|
||||
|
|
@ -105,7 +105,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
|
|||
swab( p_out + 8, p_in, i_length );
|
||||
# else
|
||||
p_out += 8;
|
||||
for ( i = 0; i < i_length / 2; i++ )
|
||||
for ( i = i_length / 2 ; i-- ; )
|
||||
{
|
||||
p_out[0] = p_in[1];
|
||||
p_out[1] = p_in[0];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* fixed32float32.c : converter from fixed32 to float32 bits integer
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2002 VideoLAN
|
||||
* $Id: fixed32tofloat32.c,v 1.2 2002/08/12 21:40:40 jpsaman Exp $
|
||||
* $Id: fixed32tofloat32.c,v 1.3 2002/08/13 14:53:46 sam Exp $
|
||||
*
|
||||
* Authors: Jean-Paul Saman <jpsaman@wxs.nl>
|
||||
*
|
||||
|
|
@ -88,20 +88,24 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
|
|||
vlc_fixed_t * p_in = (vlc_fixed_t *)p_in_buf->p_buffer;
|
||||
float * p_out = (float *)p_out_buf->p_buffer;
|
||||
|
||||
for ( i = 0; i < p_in_buf->i_nb_samples * p_filter->input.i_channels; i++ )
|
||||
for ( i = p_in_buf->i_nb_samples * p_filter->input.i_channels ; i-- )
|
||||
{
|
||||
/* convert vlc_fixed_t into s32 */
|
||||
// s32 temp;
|
||||
// if ( *p_in >= 8 ) temp = 32767;
|
||||
// else if ( *p_in < -8 ) temp = -32768;
|
||||
// else temp = *p_in * (s32) 4096; // (32768/8);
|
||||
#if 0
|
||||
s32 temp;
|
||||
if ( *p_in >= 8 ) temp = 32767;
|
||||
else if ( *p_in < -8 ) temp = -32768;
|
||||
else temp = *p_in * (s32) 4096; // (32768/8);
|
||||
#endif
|
||||
|
||||
/* convert s32 into float */
|
||||
// if (temp >= 32768)
|
||||
// *p_out = (float) 1.0;
|
||||
// else if (temp <= -32768)
|
||||
// *p_out = (float) -1.0;
|
||||
// else *p_out = (float) (temp/32768.0);
|
||||
#if 0
|
||||
if (temp >= 32768)
|
||||
*p_out = (float) 1.0;
|
||||
else if (temp <= -32768)
|
||||
*p_out = (float) -1.0;
|
||||
else *p_out = (float) (temp/32768.0);
|
||||
#endif
|
||||
|
||||
/* combined conversion */
|
||||
if ( *p_in >= 8 ) *p_out = (float) 1.0;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/*****************************************************************************
|
||||
* fixed32tos16.c : converter from fised32 to signed 16 bits integer
|
||||
* fixed32tos16.c : converter from fixed32 to signed 16 bits integer
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2002 VideoLAN
|
||||
* $Id: fixed32tos16.c,v 1.1 2002/08/12 20:34:56 jpsaman Exp $
|
||||
* $Id: fixed32tos16.c,v 1.2 2002/08/13 14:53:46 sam Exp $
|
||||
*
|
||||
* Authors: Jean-Paul Saman <jpsaman@wxs.nl>
|
||||
*
|
||||
|
|
@ -201,7 +201,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
|
|||
s16 sample;
|
||||
// static struct audio_dither dither;
|
||||
|
||||
for ( i = 0; i < p_in_buf->i_nb_samples * p_filter->input.i_channels; i++ )
|
||||
for ( i = p_in_buf->i_nb_samples * p_filter->input.i_channels ; i-- )
|
||||
{
|
||||
/* Accurate scaling */
|
||||
// p_out = mpg321_s24_to_s16_pcm(16, *p_in++, &dither);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* esd.c : EsounD module
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2000, 2001 VideoLAN
|
||||
* $Id: esd.c,v 1.2 2002/08/13 11:59:36 sam Exp $
|
||||
* $Id: esd.c,v 1.3 2002/08/13 14:53:46 sam Exp $
|
||||
*
|
||||
* Authors: Samuel Hocevar <sam@zoy.org>
|
||||
*
|
||||
|
|
@ -36,8 +36,6 @@
|
|||
|
||||
#include <esd.h>
|
||||
|
||||
#define DEFAULT_FRAME_SIZE 2048*2
|
||||
|
||||
/*****************************************************************************
|
||||
* aout_sys_t: esd audio output method descriptor
|
||||
*****************************************************************************
|
||||
|
|
@ -49,6 +47,8 @@ struct aout_sys_t
|
|||
esd_format_t esd_format;
|
||||
int i_fd;
|
||||
vlc_bool_t b_initialized;
|
||||
|
||||
mtime_t latency;
|
||||
};
|
||||
|
||||
/*****************************************************************************
|
||||
|
|
@ -141,7 +141,17 @@ static int SetFormat( aout_instance_t *p_aout )
|
|||
}
|
||||
|
||||
p_aout->output.output.i_format = AOUT_FMT_S16_NE;
|
||||
p_aout->output.i_nb_samples = DEFAULT_FRAME_SIZE;
|
||||
p_aout->output.i_nb_samples = ESD_BUF_SIZE * 2;
|
||||
|
||||
/* ESD latency is calculated for 44100 Hz. We don't have any way to get the
|
||||
* number of buffered samples, so I assume ESD_BUF_SIZE/2 */
|
||||
p_sys->latency =
|
||||
(mtime_t)( esd_get_latency( esd_open_sound(NULL) ) + ESD_BUF_SIZE / 2
|
||||
* p_aout->output.output.i_rate / ESD_DEFAULT_RATE
|
||||
* aout_FormatTo( &p_aout->output.output, 1 ) )
|
||||
* (mtime_t)1000000
|
||||
/ (mtime_t)aout_FormatToByterate( &p_aout->output.output,
|
||||
p_aout->output.output.i_rate );
|
||||
|
||||
p_sys->b_initialized = VLC_TRUE;
|
||||
|
||||
|
|
@ -181,7 +191,6 @@ static int ESDThread( aout_instance_t * p_aout )
|
|||
while ( !p_aout->b_die )
|
||||
{
|
||||
aout_buffer_t * p_buffer;
|
||||
mtime_t next_date = 0;
|
||||
int i_tmp, i_size;
|
||||
byte_t * p_bytes;
|
||||
|
||||
|
|
@ -191,19 +200,9 @@ static int ESDThread( aout_instance_t * p_aout )
|
|||
continue;
|
||||
}
|
||||
|
||||
if ( p_aout->output.output.i_format != AOUT_FMT_SPDIF )
|
||||
{
|
||||
/* Get the presentation date of the next write() operation. It
|
||||
* is equal to the current date + esd latency */
|
||||
/* FIXME: wtf ? it works better with a - here */
|
||||
next_date = -(mtime_t)esd_get_latency(esd_open_sound(NULL))
|
||||
* 1000000
|
||||
/ aout_FormatToByterate( &p_aout->output.output,
|
||||
p_aout->output.output.i_rate );
|
||||
next_date += mdate();
|
||||
}
|
||||
|
||||
p_buffer = aout_OutputNextBuffer( p_aout, next_date );
|
||||
/* Get the presentation date of the next write() operation. It
|
||||
* is equal to the current date + buffered samples + esd latency */
|
||||
p_buffer = aout_OutputNextBuffer( p_aout, mdate() + p_sys->latency );
|
||||
|
||||
if ( p_buffer != NULL )
|
||||
{
|
||||
|
|
@ -214,7 +213,7 @@ static int ESDThread( aout_instance_t * p_aout )
|
|||
else
|
||||
{
|
||||
i_size = aout_FormatToSize( &p_aout->output.output,
|
||||
DEFAULT_FRAME_SIZE );
|
||||
ESD_BUF_SIZE * 2 );
|
||||
p_bytes = alloca( i_size );
|
||||
memset( p_bytes, 0, i_size );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,194 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* aout_ext-dec.c : exported fifo management functions
|
||||
*****************************************************************************
|
||||
* Copyright (C) 1999-2001 VideoLAN
|
||||
* $Id: aout_ext-dec.c,v 1.21 2002/08/12 09:34:15 sam Exp $
|
||||
*
|
||||
* Authors: Michel Kaempf <maxx@via.ecp.fr>
|
||||
* Cyril Deguet <asmax@via.ecp.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* 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.
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
* Preamble
|
||||
*****************************************************************************/
|
||||
#include <stdlib.h> /* calloc(), malloc(), free() */
|
||||
#include <string.h>
|
||||
|
||||
#include <vlc/vlc.h>
|
||||
|
||||
#include "audio_output.h"
|
||||
|
||||
/*****************************************************************************
|
||||
* aout_CreateFifo
|
||||
*****************************************************************************/
|
||||
aout_fifo_t * __aout_CreateFifo( vlc_object_t *p_this, int i_format,
|
||||
int i_channels, int i_rate, int i_frame_size,
|
||||
void *p_buffer )
|
||||
{
|
||||
aout_thread_t *p_aout;
|
||||
aout_fifo_t *p_fifo = NULL;
|
||||
int i_index;
|
||||
|
||||
/* Spawn an audio output if there is none */
|
||||
p_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
|
||||
|
||||
if( p_aout )
|
||||
{
|
||||
if( p_aout->fifo[0].i_format != i_format )
|
||||
{
|
||||
msg_Dbg( p_this, "changing aout type" );
|
||||
vlc_object_detach( p_aout );
|
||||
vlc_object_release( p_aout );
|
||||
aout_DestroyThread( p_aout );
|
||||
p_aout = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if( p_aout == NULL )
|
||||
{
|
||||
msg_Dbg( p_this, "no aout present, spawning one" );
|
||||
|
||||
p_aout = aout_CreateThread( p_this, i_channels, i_rate );
|
||||
/* Everything failed */
|
||||
if( p_aout == NULL )
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* temporary hack to switch output type (mainly for spdif)
|
||||
* FIXME: to be adapted when several output are available */
|
||||
/* Take the fifos lock */
|
||||
vlc_mutex_lock( &p_aout->fifos_lock );
|
||||
|
||||
/* Look for a free fifo structure */
|
||||
for( i_index = 0; i_index < AOUT_MAX_FIFOS; i_index++ )
|
||||
{
|
||||
if( p_aout->fifo[i_index].i_format == AOUT_FIFO_NONE )
|
||||
{
|
||||
p_fifo = &p_aout->fifo[i_index];
|
||||
p_fifo->i_fifo = i_index;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if( p_fifo == NULL )
|
||||
{
|
||||
msg_Err( p_aout, "no fifo available" );
|
||||
vlc_mutex_unlock( &p_aout->fifos_lock );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Initialize the new fifo structure */
|
||||
switch ( p_fifo->i_format = i_format )
|
||||
{
|
||||
case AOUT_FIFO_PCM:
|
||||
case AOUT_FIFO_SPDIF:
|
||||
p_fifo->b_die = 0;
|
||||
|
||||
p_fifo->i_channels = i_channels;
|
||||
p_fifo->i_rate = i_rate;
|
||||
p_fifo->i_frame_size = i_frame_size;
|
||||
|
||||
p_fifo->i_unit_limit = (AOUT_FIFO_SIZE + 1)
|
||||
* (i_frame_size / i_channels);
|
||||
|
||||
/* Allocate the memory needed to store the audio frames and their
|
||||
* dates. As the fifo is a rotative fifo, we must be able to find
|
||||
* out whether the fifo is full or empty, that's why we must in
|
||||
* fact allocate memory for (AOUT_FIFO_SIZE+1) audio frames. */
|
||||
p_fifo->date = malloc( ( sizeof(s16) * i_frame_size
|
||||
+ sizeof(mtime_t) )
|
||||
* ( AOUT_FIFO_SIZE + 1 ) );
|
||||
if ( p_fifo->date == NULL )
|
||||
{
|
||||
msg_Err( p_aout, "out of memory" );
|
||||
p_fifo->i_format = AOUT_FIFO_NONE;
|
||||
vlc_mutex_unlock( &p_aout->fifos_lock );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
p_fifo->buffer = (u8 *)p_fifo->date + sizeof(mtime_t)
|
||||
* ( AOUT_FIFO_SIZE + 1 );
|
||||
|
||||
/* Set the fifo's buffer as empty (the first frame that is to be
|
||||
* played is also the first frame that is not to be played) */
|
||||
p_fifo->i_start_frame = 0;
|
||||
/* p_fifo->i_next_frame = 0; */
|
||||
p_fifo->i_end_frame = 0;
|
||||
|
||||
/* Waiting for the audio decoder to compute enough frames to work
|
||||
* out the fifo's current rate (as soon as the decoder has decoded
|
||||
* enough frames, the members of the fifo structure that are not
|
||||
* initialized now will be calculated) */
|
||||
p_fifo->b_start_frame = 0;
|
||||
p_fifo->b_next_frame = 0;
|
||||
break;
|
||||
|
||||
default:
|
||||
msg_Err( p_aout, "unknown fifo type 0x%x", p_fifo->i_format );
|
||||
p_fifo->i_format = AOUT_FIFO_NONE;
|
||||
vlc_mutex_unlock( &p_aout->fifos_lock );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Release the fifos lock */
|
||||
vlc_mutex_unlock( &p_aout->fifos_lock );
|
||||
|
||||
msg_Dbg( p_aout, "fifo #%i allocated, %i channels, rate %li, "
|
||||
"frame size %i", p_fifo->i_fifo, p_fifo->i_channels,
|
||||
p_fifo->i_rate, p_fifo->i_frame_size );
|
||||
|
||||
/* Return the pointer to the fifo structure */
|
||||
return p_fifo;
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* aout_DestroyFifo
|
||||
*****************************************************************************/
|
||||
void aout_DestroyFifo( aout_fifo_t * p_fifo )
|
||||
{
|
||||
vlc_mutex_lock( &p_fifo->data_lock );
|
||||
p_fifo->b_die = 1;
|
||||
vlc_mutex_unlock( &p_fifo->data_lock );
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* aout_FreeFifo
|
||||
*****************************************************************************/
|
||||
void aout_FreeFifo( aout_fifo_t * p_fifo )
|
||||
{
|
||||
switch ( p_fifo->i_format )
|
||||
{
|
||||
case AOUT_FIFO_NONE:
|
||||
|
||||
break;
|
||||
|
||||
case AOUT_FIFO_PCM:
|
||||
case AOUT_FIFO_SPDIF:
|
||||
|
||||
free( p_fifo->date );
|
||||
p_fifo->i_format = AOUT_FIFO_NONE;
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue