/*****************************************************************************
* dec.c : audio output API towards decoders
*****************************************************************************
- * Copyright (C) 2002-2004 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* calloc(), malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
-#include "audio_output.h"
+#include <vlc_aout.h>
+#include <vlc_input.h>
+
#include "aout_internal.h"
-#include <vlc/input.h> /* for input_thread_t and i_pts_delay */
-/*
- * Creation/Deletion
- */
+/** FIXME: Ugly but needed to access the counters */
+#include "input/input_internal.h"
/*****************************************************************************
* aout_DecNew : create a decoder
*****************************************************************************/
static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
- audio_sample_format_t * p_format )
+ audio_sample_format_t *p_format,
+ audio_replay_gain_t *p_replay_gain )
{
aout_input_t * p_input;
input_thread_t * p_input_thread;
- vlc_value_t val;
+
+ /* Sanitize audio format */
+ if( p_format->i_channels > 32 )
+ {
+ msg_Err( p_aout, "too many audio channels (%u)",
+ p_format->i_channels );
+ return NULL;
+ }
+ if( p_format->i_channels <= 0 )
+ {
+ msg_Err( p_aout, "no audio channels" );
+ return NULL;
+ }
+
+ if( p_format->i_rate > 192000 )
+ {
+ msg_Err( p_aout, "excessive audio sample frequency (%u)",
+ p_format->i_rate );
+ return NULL;
+ }
+ if( p_format->i_rate < 4000 )
+ {
+ msg_Err( p_aout, "too low audio sample frequency (%u)",
+ p_format->i_rate );
+ return NULL;
+ }
/* We can only be called by the decoder, so no need to lock
* p_input->lock. */
if ( p_aout->i_nb_inputs >= AOUT_MAX_INPUTS )
{
msg_Err( p_aout, "too many inputs already (%d)", p_aout->i_nb_inputs );
- return NULL;
+ goto error;
}
p_input = malloc(sizeof(aout_input_t));
if ( p_input == NULL )
- {
- msg_Err( p_aout, "out of memory" );
- return NULL;
- }
+ goto error;
+ memset( p_input, 0, sizeof(aout_input_t) );
- vlc_mutex_init( p_aout, &p_input->lock );
+ vlc_mutex_init( &p_input->lock );
p_input->b_changed = 0;
p_input->b_error = 1;
+
aout_FormatPrepare( p_format );
+
memcpy( &p_input->input, p_format,
sizeof(audio_sample_format_t) );
+ if( p_replay_gain )
+ p_input->replay_gain = *p_replay_gain;
p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input;
p_aout->i_nb_inputs++;
if ( aout_MixerNew( p_aout ) == -1 )
{
aout_OutputDelete( p_aout );
- vlc_mutex_unlock( &p_aout->mixer_lock );
- return NULL;
+ goto error;
}
aout_InputNew( p_aout, p_input );
vlc_mutex_unlock( &p_aout->mixer_lock );
-
- var_Create( p_this, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, "audio-desync", &val );
- p_input->i_desync = val.i_int * 1000;
+ p_input->i_desync = var_CreateGetInteger( p_this, "audio-desync" ) * 1000;
p_input_thread = (input_thread_t *)vlc_object_find( p_this,
VLC_OBJECT_INPUT, FIND_PARENT );
}
return p_input;
+
+error:
+ vlc_mutex_unlock( &p_aout->mixer_lock );
+ return NULL;
}
aout_input_t * __aout_DecNew( vlc_object_t * p_this,
aout_instance_t ** pp_aout,
- audio_sample_format_t * p_format )
+ audio_sample_format_t * p_format,
+ audio_replay_gain_t *p_replay_gain )
{
- if ( *pp_aout == NULL )
+ aout_instance_t *p_aout = *pp_aout;
+ if ( p_aout == NULL )
{
- /* Create an audio output if there is none. */
- *pp_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ msg_Dbg( p_this, "no aout present, spawning one" );
+ p_aout = aout_New( p_this );
- if( *pp_aout == NULL )
- {
- msg_Dbg( p_this, "no aout present, spawning one" );
+ /* Everything failed, I'm a loser, I just wanna die */
+ if( p_aout == NULL )
+ return NULL;
- *pp_aout = aout_New( p_this );
- /* Everything failed, I'm a loser, I just wanna die */
- if( *pp_aout == NULL )
- {
- return NULL;
- }
- vlc_object_attach( *pp_aout, p_this->p_vlc );
- }
- else
- {
- vlc_object_release( *pp_aout );
- }
+ vlc_object_attach( p_aout, p_this );
+ *pp_aout = p_aout;
}
- return DecNew( p_this, *pp_aout, p_format );
+ return DecNew( p_this, p_aout, p_format, p_replay_gain );
}
/*****************************************************************************
/*****************************************************************************
* aout_DecNewBuffer : ask for a new empty buffer
*****************************************************************************/
-aout_buffer_t * aout_DecNewBuffer( aout_instance_t * p_aout,
- aout_input_t * p_input,
+aout_buffer_t * aout_DecNewBuffer( aout_input_t * p_input,
size_t i_nb_samples )
{
aout_buffer_t * p_buffer;
/* This necessarily allocates in the heap. */
aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer );
- p_buffer->i_nb_samples = i_nb_samples;
- p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame
- / p_input->input.i_frame_length;
+ if( p_buffer != NULL )
+ p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame
+ / p_input->input.i_frame_length;
/* Suppose the decoder doesn't have more than one buffered buffer */
p_input->b_changed = 0;
vlc_mutex_unlock( &p_input->lock );
- if ( p_buffer == NULL )
- {
- msg_Err( p_aout, "NULL buffer !" );
- }
- else
- {
- p_buffer->start_date = p_buffer->end_date = 0;
- }
+ if( p_buffer == NULL )
+ return NULL;
+ p_buffer->i_nb_samples = i_nb_samples;
+ p_buffer->start_date = p_buffer->end_date = 0;
return p_buffer;
}
void aout_DecDeleteBuffer( aout_instance_t * p_aout, aout_input_t * p_input,
aout_buffer_t * p_buffer )
{
+ (void)p_aout; (void)p_input;
aout_BufferFree( p_buffer );
}
* aout_DecPlay : filter & mix the decoded buffer
*****************************************************************************/
int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
- aout_buffer_t * p_buffer )
+ aout_buffer_t * p_buffer, int i_input_rate )
{
if ( p_buffer->start_date == 0 )
{
return -1;
}
+#ifndef FIXME
+ /* This hack for #transcode{acodec=...}:display to work -- Courmisch */
+ if( i_input_rate == 0 )
+ i_input_rate = INPUT_RATE_DEFAULT;
+#endif
+ 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;
+ }
+
/* Apply the desynchronisation requested by the user */
p_buffer->start_date += p_input->i_desync;
p_buffer->end_date += p_input->i_desync;
if ( p_buffer->start_date > mdate() + p_input->i_pts_delay +
AOUT_MAX_ADVANCE_TIME )
{
- msg_Warn( p_aout, "received buffer in the future ("I64Fd")",
+ msg_Warn( p_aout, "received buffer in the future (%"PRId64")",
p_buffer->start_date - mdate());
if( p_input->p_input_thread )
{
- vlc_mutex_lock( &p_input->p_input_thread->counters.counters_lock);
+ vlc_mutex_lock( &p_input->p_input_thread->p->counters.counters_lock);
stats_UpdateInteger( p_aout,
- p_input->p_input_thread->counters.p_lost_abuffers,
+ p_input->p_input_thread->p->counters.p_lost_abuffers,
1, NULL );
- vlc_mutex_unlock( &p_input->p_input_thread->counters.counters_lock);
+ vlc_mutex_unlock( &p_input->p_input_thread->p->counters.counters_lock);
}
aout_BufferFree( p_buffer );
return -1;
}
p_buffer->end_date = p_buffer->start_date
- + (mtime_t)(p_buffer->i_nb_samples * 1000000)
+ + (mtime_t)p_buffer->i_nb_samples * 1000000
/ p_input->input.i_rate;
vlc_mutex_lock( &p_input->lock );
/ p_input->input.i_rate;
aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_new_buffer );
- p_aout->p_vlc->pf_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
- p_buffer->i_nb_bytes );
+ vlc_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
+ p_buffer->i_nb_bytes );
p_new_buffer->i_nb_samples = p_buffer->i_nb_samples;
p_new_buffer->i_nb_bytes = p_buffer->i_nb_bytes;
p_new_buffer->start_date = p_buffer->start_date;
/* If the buffer is too early, wait a while. */
mwait( p_buffer->start_date - AOUT_MAX_PREPARE_TIME );
- if ( aout_InputPlay( p_aout, p_input, p_buffer ) == -1 )
+ if ( aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate ) == -1 )
{
vlc_mutex_unlock( &p_input->lock );
return -1;
aout_MixerRun( p_aout );
if( p_input->p_input_thread )
{
- vlc_mutex_lock( &p_input->p_input_thread->counters.counters_lock);
+ vlc_mutex_lock( &p_input->p_input_thread->p->counters.counters_lock);
stats_UpdateInteger( p_aout,
- p_input->p_input_thread->counters.p_lost_abuffers,
+ p_input->p_input_thread->p->counters.p_played_abuffers,
1, NULL );
- vlc_mutex_unlock( &p_input->p_input_thread->counters.counters_lock);
+ vlc_mutex_unlock( &p_input->p_input_thread->p->counters.counters_lock);
}
vlc_mutex_unlock( &p_aout->mixer_lock );
projects / vlc / blobdiff