/*****************************************************************************
* aout_internal.h : internal defines for audio output
*****************************************************************************
- * Copyright (C) 2002 the VideoLAN team
+ * Copyright (C) 2002 VLC authors and VideoLAN
* $Id$
*
* Authors: Christophe Massiot <massiot@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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
-# error This header file can only be included from LibVLC.
-#endif
+#ifndef LIBVLC_AOUT_INTERNAL_H
+# define LIBVLC_AOUT_INTERNAL_H 1
-#ifndef __LIBVLC_AOUT_INTERNAL_H
-# define __LIBVLC_AOUT_INTERNAL_H 1
+# include <vlc_atomic.h>
-aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds,
- aout_buffer_t *old_buffer);
+/* Max input rate factor (1/4 -> 4) */
+# define AOUT_MAX_INPUT_RATE (4)
+
+# define AOUT_MAX_FILTERS 10
+
+enum {
+ AOUT_RESAMPLING_NONE=0,
+ AOUT_RESAMPLING_UP,
+ AOUT_RESAMPLING_DOWN
+};
typedef struct
{
void *p_private;
} aout_request_vout_t;
-struct filter_owner_sys_t
-{
- aout_instance_t *p_aout;
- aout_input_t *p_input;
-};
-
-block_t *aout_FilterBufferNew( filter_t *, int );
+typedef struct aout_volume aout_volume_t;
-/** an input stream for the audio output */
-struct aout_input_t
+typedef struct
{
- /* When this lock is taken, the pipeline cannot be changed by a
- * third-party. */
- vlc_mutex_t lock;
-
- audio_sample_format_t input;
- aout_alloc_t input_alloc;
-
- /* pre-filters */
- filter_t * pp_filters[AOUT_MAX_FILTERS];
- int i_nb_filters;
-
- filter_t * p_playback_rate_filter;
+ vlc_mutex_t lock;
+ module_t *module; /**< Output plugin (or NULL if inactive) */
+ aout_volume_t *volume;
- /* resamplers */
- filter_t * pp_resamplers[AOUT_MAX_FILTERS];
- int i_nb_resamplers;
- int i_resampling_type;
- mtime_t i_resamp_start_date;
- int i_resamp_start_drift;
-
- /* Mixer information */
- audio_replay_gain_t replay_gain;
-
- /* If b_restart == 1, the input pipeline will be re-created. */
- bool b_restart;
-
- /* If b_error == 1, there is no input pipeline. */
- bool b_error;
-
- /* Did we just change the output format? (expect buffer inconsistencies) */
- bool b_changed;
+ struct
+ {
+ vlc_mutex_t lock;
+ char *device;
+ float volume;
+ char mute;
+ } req;
- /* last rate from input */
- int i_last_input_rate;
+ struct
+ {
+ mtime_t end; /**< Last seen PTS */
+ unsigned resamp_start_drift; /**< Resampler drift absolute value */
+ int resamp_type; /**< Resampler mode (FIXME: redundant / resampling) */
+ bool discontinuity;
+ } sync;
+
+ audio_sample_format_t input_format;
+ audio_sample_format_t mixer_format;
+
+ filter_t *rate_filter; /**< The filter adjusting samples count
+ (either the scaletempo filter or a resampler) */
+ filter_t *resampler; /**< The resampler */
+ int resampling; /**< Current resampling (Hz) */
+ unsigned nb_filters;
+ filter_t *filters[AOUT_MAX_FILTERS]; /**< Configured user filters
+ (e.g. equalization) and their conversions */
- /* */
- int i_buffer_lost;
+ aout_request_vout_t request_vout;
+ bool recycle_vout;
- /* */
- bool b_paused;
- mtime_t i_pause_date;
+ atomic_uint buffers_lost;
+ atomic_uchar restart;
+} aout_owner_t;
- /* */
- bool b_recycle_vout;
- aout_request_vout_t request_vout;
+typedef struct
+{
+ audio_output_t output;
+ aout_owner_t owner;
+} aout_instance_t;
- /* */
- aout_mixer_input_t mixer;
- };
+static inline aout_owner_t *aout_owner (audio_output_t *aout)
+{
+ return &((aout_instance_t *)aout)->owner;
+}
/****************************************************************************
* Prototypes
*****************************************************************************/
-/* From input.c : */
-int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_request_vout_t * );
-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,
- aout_buffer_t * p_buffer, int i_input_rate );
-void aout_InputCheckAndRestart( aout_instance_t * p_aout, aout_input_t * p_input );
-
/* From filters.c : */
-int aout_FiltersCreatePipeline ( aout_instance_t * p_aout, filter_t ** pp_filters, int * pi_nb_filters, const audio_sample_format_t * p_input_format, const audio_sample_format_t * p_output_format );
-void aout_FiltersDestroyPipeline ( aout_instance_t * p_aout, filter_t ** pp_filters, int i_nb_filters );
-void aout_FiltersPlay ( filter_t ** pp_filters, unsigned i_nb_filters, aout_buffer_t ** pp_input_buffer );
-void aout_FiltersHintBuffers( aout_instance_t * p_aout, filter_t ** pp_filters, int i_nb_filters, aout_alloc_t * p_first_alloc );
+int aout_FiltersNew(audio_output_t *, const audio_sample_format_t *,
+ const audio_sample_format_t *, const aout_request_vout_t *);
+void aout_FiltersDelete(audio_output_t *);
+bool aout_FiltersAdjustResampling(audio_output_t *, int);
+block_t *aout_FiltersPlay(audio_output_t *, block_t *, int rate);
/* From mixer.c : */
-int aout_MixerNew( aout_instance_t * p_aout );
-void aout_MixerDelete( aout_instance_t * p_aout );
-void aout_MixerRun( aout_instance_t * p_aout );
-int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier );
-int aout_MixerMultiplierGet( aout_instance_t * p_aout, float * pf_multiplier );
-
-/* From output.c : */
-int aout_OutputNew( aout_instance_t * p_aout,
- audio_sample_format_t * p_format );
-void aout_OutputPlay( aout_instance_t * p_aout, aout_buffer_t * p_buffer );
-void aout_OutputDelete( aout_instance_t * p_aout );
+aout_volume_t *aout_volume_New(vlc_object_t *, const audio_replay_gain_t *);
+#define aout_volume_New(o, g) aout_volume_New(VLC_OBJECT(o), g)
+int aout_volume_SetFormat(aout_volume_t *, vlc_fourcc_t);
+void aout_volume_SetVolume(aout_volume_t *, float);
+int aout_volume_Amplify(aout_volume_t *, block_t *);
+void aout_volume_Delete(aout_volume_t *);
-/* From common.c : */
-#define aout_New(a) __aout_New(VLC_OBJECT(a))
-/* Release with vlc_object_release() */
-aout_instance_t * __aout_New ( vlc_object_t * );
+/* From output.c : */
+audio_output_t *aout_New (vlc_object_t *);
+#define aout_New(a) aout_New(VLC_OBJECT(a))
+void aout_Destroy (audio_output_t *);
-void aout_FifoInit( aout_instance_t *, aout_fifo_t *, uint32_t );
-mtime_t aout_FifoNextStart( aout_instance_t *, aout_fifo_t * );
-void aout_FifoPush( aout_instance_t *, aout_fifo_t *, aout_buffer_t * );
-void aout_FifoSet( aout_instance_t *, aout_fifo_t *, mtime_t );
-void aout_FifoMoveDates( aout_instance_t *, aout_fifo_t *, mtime_t );
-void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo );
-void aout_FormatsPrint( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format1, const audio_sample_format_t * p_format2 );
+int aout_OutputNew(audio_output_t *, audio_sample_format_t *);
+int aout_OutputTimeGet(audio_output_t *, mtime_t *);
+void aout_OutputPlay(audio_output_t *, block_t *);
+void aout_OutputPause( audio_output_t * p_aout, bool, mtime_t );
+void aout_OutputFlush( audio_output_t * p_aout, bool );
+void aout_OutputDelete( audio_output_t * p_aout );
+void aout_OutputLock(audio_output_t *);
+void aout_OutputUnlock(audio_output_t *);
-/* From intf.c :*/
-int aout_VolumeSoftGet( aout_instance_t *, audio_volume_t * );
-int aout_VolumeSoftSet( aout_instance_t *, audio_volume_t );
-int aout_VolumeSoftInfos( aout_instance_t *, audio_volume_t * );
-int aout_VolumeNoneGet( aout_instance_t *, audio_volume_t * );
-int aout_VolumeNoneSet( aout_instance_t *, audio_volume_t );
-int aout_VolumeNoneInfos( aout_instance_t *, audio_volume_t * );
+/* From common.c : */
+void aout_FormatsPrint(vlc_object_t *, const char *,
+ const audio_sample_format_t *,
+ const audio_sample_format_t *);
+#define aout_FormatsPrint(o, t, a, b) \
+ aout_FormatsPrint(VLC_OBJECT(o), t, a, b)
+bool aout_ChangeFilterString( vlc_object_t *manager, vlc_object_t *aout,
+ const char *var, const char *name, bool b_add );
/* From dec.c */
-#define aout_DecNew(a, b, c, d, e) __aout_DecNew(VLC_OBJECT(a), b, c, d, e)
-aout_input_t * __aout_DecNew( vlc_object_t *, aout_instance_t **,
- audio_sample_format_t *, const audio_replay_gain_t *,
- const aout_request_vout_t * );
-int aout_DecDelete ( aout_instance_t *, aout_input_t * );
-aout_buffer_t * aout_DecNewBuffer( aout_input_t *, size_t );
-void aout_DecDeleteBuffer( aout_instance_t *, aout_input_t *, aout_buffer_t * );
-int aout_DecPlay( aout_instance_t *, aout_input_t *, aout_buffer_t *, int i_input_rate );
-int aout_DecGetResetLost( aout_instance_t *, aout_input_t * );
-void aout_DecChangePause( aout_instance_t *, aout_input_t *, bool b_paused, mtime_t i_date );
-void aout_DecFlush( aout_instance_t *, aout_input_t * );
-
-/* Audio output locking */
-
-#if !defined (NDEBUG) \
- && defined __linux__ && (defined (__i386__) || defined (__x86_64__))
-# define AOUT_DEBUG 1
-#endif
-
-#ifdef AOUT_DEBUG
-enum
-{
- MIXER_LOCK=1,
- INPUT_LOCK=2,
- INPUT_FIFO_LOCK=4,
- OUTPUT_FIFO_LOCK=8,
-};
-
-void aout_lock (unsigned);
-void aout_unlock (unsigned);
-
-#else
-# define aout_lock( i ) (void)0
-# define aout_unlock( i ) (void)0
-#endif
-
-static inline void aout_lock_mixer( aout_instance_t *p_aout )
-{
- aout_lock( MIXER_LOCK );
- vlc_mutex_lock( &p_aout->mixer_lock );
-}
-
-static inline void aout_unlock_mixer( aout_instance_t *p_aout )
+int aout_DecNew(audio_output_t *, const audio_sample_format_t *,
+ const audio_replay_gain_t *, const aout_request_vout_t *);
+void aout_DecDelete(audio_output_t *);
+block_t *aout_DecNewBuffer(audio_output_t *, size_t);
+void aout_DecDeleteBuffer(audio_output_t *, block_t *);
+int aout_DecPlay(audio_output_t *, block_t *, int i_input_rate);
+int aout_DecGetResetLost(audio_output_t *);
+void aout_DecChangePause(audio_output_t *, bool b_paused, mtime_t i_date);
+void aout_DecFlush(audio_output_t *);
+bool aout_DecIsEmpty(audio_output_t *);
+void aout_RequestRestart (audio_output_t *, unsigned);
+
+static inline void aout_InputRequestRestart(audio_output_t *aout)
{
- aout_unlock( MIXER_LOCK );
- vlc_mutex_unlock( &p_aout->mixer_lock );
-}
-
-static inline void aout_lock_input_fifos( aout_instance_t *p_aout )
-{
- aout_lock( INPUT_FIFO_LOCK );
- vlc_mutex_lock( &p_aout->input_fifos_lock );
-}
-
-static inline void aout_unlock_input_fifos( aout_instance_t *p_aout )
-{
- aout_unlock( INPUT_FIFO_LOCK );
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
-}
-
-static inline void aout_lock_output_fifo( aout_instance_t *p_aout )
-{
- aout_lock( OUTPUT_FIFO_LOCK );
- vlc_mutex_lock( &p_aout->output_fifo_lock );
-}
-
-static inline void aout_unlock_output_fifo( aout_instance_t *p_aout )
-{
- aout_unlock( OUTPUT_FIFO_LOCK );
- vlc_mutex_unlock( &p_aout->output_fifo_lock );
-}
-
-static inline void aout_lock_input( aout_instance_t *p_aout, aout_input_t * p_input )
-{
- (void)p_aout;
- aout_lock( INPUT_LOCK );
- vlc_mutex_lock( &p_input->lock );
-}
-
-static inline void aout_unlock_input( aout_instance_t *p_aout, aout_input_t * p_input )
-{
- (void)p_aout;
- aout_unlock( INPUT_LOCK );
- vlc_mutex_unlock( &p_input->lock );
-}
-
-
-/* Helpers */
-
-/**
- * This function will safely mark aout input to be restarted as soon as
- * possible to take configuration changes into account */
-static inline void AoutInputsMarkToRestart( aout_instance_t *p_aout )
-{
- int i;
- aout_lock_mixer( p_aout );
- for( i = 0; i < p_aout->i_nb_inputs; i++ )
- p_aout->pp_inputs[i]->b_restart = true;
- aout_unlock_mixer( p_aout );
-}
-
-/* This function will add or remove a a module from a string list (comma
- * separated). It will return true if there is a modification
- * In case p_aout is NULL, we will use configuration instead of variable */
-static inline bool AoutChangeFilterString( vlc_object_t *p_obj, aout_instance_t * p_aout,
- const char* psz_variable,
- const char *psz_name, bool b_add )
-{
- char *psz_val;
- char *psz_parser;
-
- if( *psz_name == '\0' )
- return false;
-
- if( p_aout )
- psz_val = var_GetString( p_aout, psz_variable );
- else
- {
- psz_val = var_CreateGetString( p_obj->p_libvlc, "audio-filter" );
- var_Destroy( p_obj->p_libvlc, "audio-filter" );
- }
-
- if( !psz_val )
- psz_val = strdup( "" );
-
- psz_parser = strstr( psz_val, psz_name );
-
- if( ( b_add && psz_parser ) || ( !b_add && !psz_parser ) )
- {
- /* Nothing to do */
- free( psz_val );
- return false;
- }
-
- if( b_add )
- {
- char *psz_old = psz_val;
- if( *psz_old )
- {
- if( asprintf( &psz_val, "%s:%s", psz_old, psz_name ) == -1 )
- psz_val = NULL;
- }
- else
- psz_val = strdup( psz_name );
- free( psz_old );
- }
- else
- {
- const int i_name = strlen( psz_name );
- const char *psz_next;
-
- psz_next = &psz_parser[i_name];
- if( *psz_next == ':' )
- psz_next++;
-
- memmove( psz_parser, psz_next, strlen(psz_next)+1 );
- }
-
- if( p_aout )
- var_SetString( p_aout, psz_variable, psz_val );
- else
- config_PutPsz( p_obj, psz_variable, psz_val );
- free( psz_val );
- return true;
+ aout_RequestRestart(aout, AOUT_RESTART_FILTERS);
}
-#endif /* !__LIBVLC_AOUT_INTERNAL_H */
+#endif /* !LIBVLC_AOUT_INTERNAL_H */
projects / vlc / blobdiff