aout_input_t *p_input;
};
-block_t *aout_FilterBufferNew( filter_t *, int );
-
/** an input stream for the audio output */
struct aout_input_t
{
- audio_sample_format_t input;
- float multiplier; /**< Replay gain multiplier */
+ unsigned samplerate; /**< Input sample rate */
/* pre-filters */
filter_t * pp_filters[AOUT_MAX_FILTERS];
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;
-
/* last rate from input */
int i_last_input_rate;
/* */
bool b_recycle_vout;
aout_request_vout_t request_vout;
-
- /* */
- date_t date;
};
typedef struct
{
+ vlc_mutex_t lock;
module_t *module; /**< Output plugin (or NULL if inactive) */
aout_input_t *input;
+ struct
+ {
+ date_t date;
+ } sync;
+
struct
{
vlc_mutex_t lock;
float multiplier; /**< Software volume amplification multiplier */
struct audio_mixer *mixer; /**< Software volume plugin */
- } volume; /**< Volume and gain management (FIXME: input manager?) */
+ } volume;
+
+ struct
+ {
+ vlc_atomic_t multiplier;
+ audio_replay_gain_t data;
+ } gain;
audio_sample_format_t mixer_format;
+ audio_sample_format_t input_format;
/* Filters between mixer and output */
filter_t *filters[AOUT_MAX_FILTERS];
int nb_filters;
+
+ vlc_atomic_t restart;
} aout_owner_t;
typedef struct
*****************************************************************************/
/* From input.c : */
-int aout_InputNew( audio_output_t * p_aout, aout_input_t * p_input, const aout_request_vout_t * );
+aout_input_t *aout_InputNew(audio_output_t *, const audio_sample_format_t *,
+ const audio_sample_format_t *,
+ const aout_request_vout_t *);
int aout_InputDelete( audio_output_t * p_aout, aout_input_t * p_input );
block_t *aout_InputPlay( audio_output_t *p_aout, aout_input_t *p_input,
- block_t *p_buffer, int i_input_rate );
-void aout_InputCheckAndRestart( audio_output_t * p_aout, aout_input_t * p_input );
+ block_t *p_buffer, int i_input_rate, date_t * );
/* From filters.c : */
-int aout_FiltersCreatePipeline( audio_output_t *, filter_t **, int *,
+int aout_FiltersCreatePipeline( vlc_object_t *, filter_t **, int *,
const audio_sample_format_t *, const audio_sample_format_t * );
+#define aout_FiltersCreatePipeline(o, pv, pc, inf, outf) \
+ aout_FiltersCreatePipeline(VLC_OBJECT(o), pv, pc, inf, outf)
void aout_FiltersDestroyPipeline( filter_t *const *, unsigned );
void aout_FiltersPlay( filter_t *const *, unsigned, aout_buffer_t ** );
#define aout_MixerNew(o, f) aout_MixerNew(VLC_OBJECT(o), f)
void aout_MixerDelete(struct audio_mixer *);
void aout_MixerRun(struct audio_mixer *, block_t *, float);
+float aout_ReplayGainSelect(vlc_object_t *, const char *,
+ const audio_replay_gain_t *);
+#define aout_ReplayGainSelect(o, s, g) \
+ aout_ReplayGainSelect(VLC_OBJECT(o), s, g)
+
+static inline void aout_ReplayGainInit(audio_replay_gain_t *restrict d,
+ const audio_replay_gain_t *restrict s)
+{
+ if (s != NULL)
+ *d = *s;
+ else
+ memset (d, 0, sizeof (*d));
+}
+
/* From output.c : */
int aout_OutputNew( audio_output_t * p_aout,
/* From common.c : */
-/* Release with vlc_object_release() */
-audio_output_t *aout_New ( vlc_object_t * );
+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( vlc_object_t *, aout_fifo_t *, uint32_t );
+mtime_t aout_FifoFirstDate( const aout_fifo_t * ) VLC_USED;
#define aout_FifoInit(o, f, r) aout_FifoInit(VLC_OBJECT(o), f, r)
-//void aout_FifoPush( aout_fifo_t *, aout_buffer_t * );
+void aout_FifoPush( aout_fifo_t *, aout_buffer_t * );
+aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo ) VLC_USED;
void aout_FifoReset( aout_fifo_t * );
void aout_FifoMoveDates( aout_fifo_t *, mtime_t );
void aout_FifoDestroy( aout_fifo_t * p_fifo );
-void aout_FormatsPrint( audio_output_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format1, const audio_sample_format_t * p_format2 );
-bool aout_ChangeFilterString( vlc_object_t *, audio_output_t *, const char *psz_variable, const char *psz_name, bool b_add );
+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 */
-aout_input_t *aout_DecNew( audio_output_t *, audio_sample_format_t *,
- const audio_replay_gain_t *, const aout_request_vout_t * );
-void aout_DecDelete ( audio_output_t *, aout_input_t * );
-aout_buffer_t * aout_DecNewBuffer( aout_input_t *, size_t );
-void aout_DecDeleteBuffer( audio_output_t *, aout_input_t *, aout_buffer_t * );
-int aout_DecPlay( audio_output_t *, aout_input_t *, aout_buffer_t *, int i_input_rate );
-int aout_DecGetResetLost( audio_output_t *, aout_input_t * );
-void aout_DecChangePause( audio_output_t *, aout_input_t *, bool b_paused, mtime_t i_date );
-void aout_DecFlush( audio_output_t *, aout_input_t * );
-bool aout_DecIsEmpty( audio_output_t * p_aout, aout_input_t * p_input );
+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_InputRequestRestart(audio_output_t *);
+void aout_RequestRestart(audio_output_t *);
+void aout_Shutdown (audio_output_t *);
/* Audio output locking */
static inline void aout_lock( audio_output_t *p_aout )
{
aout_lock_check( OUTPUT_LOCK );
- vlc_mutex_lock( &p_aout->lock );
+ vlc_mutex_lock( &aout_owner(p_aout)->lock );
}
static inline void aout_unlock( audio_output_t *p_aout )
{
aout_unlock_check( OUTPUT_LOCK );
- vlc_mutex_unlock( &p_aout->lock );
+ vlc_mutex_unlock( &aout_owner(p_aout)->lock );
}
static inline void aout_lock_volume( audio_output_t *p_aout )
vlc_mutex_unlock( &aout_owner(p_aout)->volume.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( audio_output_t *p_aout )
-{
- aout_lock( p_aout );
- if( aout_owner(p_aout)->input != NULL )
- aout_owner(p_aout)->input->b_restart = true;
- aout_unlock( p_aout );
-}
+#define aout_assert_locked( aout ) \
+ vlc_assert_locked( &aout_owner(aout)->lock )
#endif /* !LIBVLC_AOUT_INTERNAL_H */
projects / vlc / blobdiff