#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <assert.h>
#include <stddef.h>
+#include <math.h>
+
#include <vlc_common.h>
#include <libvlc.h>
#include <vlc_modules.h>
-
#include <vlc_aout.h>
+#include <vlc_aout_mixer.h>
#include "aout_internal.h"
-/*****************************************************************************
- * aout_MixerNew: prepare a mixer plug-in
- *****************************************************************************
- * Please note that you must hold the mixer lock.
- *****************************************************************************/
-int aout_MixerNew( aout_instance_t * p_aout )
-{
- assert( !p_aout->p_mixer );
- vlc_assert_locked( &p_aout->input_fifos_lock );
-
- aout_mixer_t *p_mixer = vlc_object_create( p_aout, sizeof(*p_mixer) );
- if( !p_mixer )
- return VLC_EGENERIC;
- p_mixer->fmt = p_aout->mixer_format;
- p_mixer->input = &p_aout->p_input->mixer;
- p_mixer->mix = NULL;
- p_mixer->sys = NULL;
-
- p_mixer->module = module_need( p_mixer, "audio mixer", NULL, false );
- if( !p_mixer->module )
+#undef aout_MixerNew
+/**
+ * Creates a software amplifier.
+ */
+audio_mixer_t *aout_MixerNew(vlc_object_t *obj, vlc_fourcc_t format)
+{
+ audio_mixer_t *mixer = vlc_custom_create(obj, sizeof (*mixer), "mixer");
+ if (unlikely(mixer == NULL))
+ return NULL;
+
+ mixer->format = format;
+ mixer->mix = NULL;
+ mixer->module = module_need(mixer, "audio mixer", NULL, false);
+ if (mixer->module == NULL)
{
- msg_Err( p_mixer, "no suitable audio mixer" );
- vlc_object_release( p_mixer );
- return VLC_EGENERIC;
+ vlc_object_release(mixer);
+ mixer = NULL;
}
-
- /* */
- p_aout->p_mixer = p_mixer;
- return VLC_SUCCESS;
+ return mixer;
}
-/*****************************************************************************
- * aout_MixerDelete: delete the mixer
- *****************************************************************************
- * Please note that you must hold the mixer lock.
- *****************************************************************************/
-void aout_MixerDelete( aout_instance_t * p_aout )
+/**
+ * Destroys a software amplifier.
+ */
+void aout_MixerDelete(audio_mixer_t *mixer)
{
- if( !p_aout->p_mixer )
+ if (mixer == NULL)
return;
- module_unneed( p_aout->p_mixer, p_aout->p_mixer->module );
-
- vlc_object_release( p_aout->p_mixer );
-
- /* */
- p_aout->p_mixer = NULL;
+ module_unneed(mixer, mixer->module);
+ vlc_object_release(mixer);
}
-/*****************************************************************************
- * MixBuffer: try to prepare one output buffer
- *****************************************************************************
- * Please note that you must hold the mixer lock.
- *****************************************************************************/
-static int MixBuffer( aout_instance_t * p_aout, float volume )
+/**
+ * Applies replay gain and software volume to an audio buffer.
+ */
+void aout_MixerRun(audio_mixer_t *mixer, block_t *block, float amp)
{
- aout_mixer_t *p_mixer = p_aout->p_mixer;
- aout_mixer_input_t *p_input = p_mixer->input;
- aout_fifo_t *p_fifo = &p_input->fifo;
- mtime_t now = mdate();
-
- aout_lock_input_fifos( p_aout );
- aout_lock_output_fifo( p_aout );
-
- /* Retrieve the date of the next buffer. */
- date_t exact_start_date = p_aout->output.fifo.end_date;
- mtime_t start_date = date_Get( &exact_start_date );
-
- if( start_date != 0 && start_date < now )
- {
- /* The output is _very_ late. This can only happen if the user
- * pauses the stream (or if the decoder is buggy, which cannot
- * happen :). */
- msg_Warn( p_mixer, "output PTS is out of range (%"PRId64"), clearing out",
- mdate() - start_date );
- aout_FifoSet( &p_aout->output.fifo, 0 );
- date_Set( &exact_start_date, 0 );
- start_date = 0;
- }
-
- aout_unlock_output_fifo( p_aout );
-
- /* See if we have enough data to prepare a new buffer for the audio
- * output. First : start date. */
- if ( !start_date )
- {
- /* Find the latest start date available. */
- aout_buffer_t *p_buffer;
- for( ;; )
- {
- p_buffer = p_fifo->p_first;
- if( p_buffer == NULL )
- goto giveup;
- if( p_buffer->i_pts >= now )
- break;
-
- msg_Warn( p_mixer, "input PTS is out of range (%"PRId64"), "
- "trashing", now - p_buffer->i_pts );
- aout_BufferFree( aout_FifoPop( p_fifo ) );
- p_input->begin = NULL;
- }
-
- date_Set( &exact_start_date, p_buffer->i_pts );
- start_date = p_buffer->i_pts;
- }
-
- date_Increment( &exact_start_date, p_aout->output.i_nb_samples );
- mtime_t end_date = date_Get( &exact_start_date );
-
- /* Check that start_date is available. */
- aout_buffer_t *p_buffer = p_fifo->p_first;
- mtime_t prev_date;
-
- for( ;; )
- {
- if( p_buffer == NULL )
- goto giveup;
-
- /* Check for the continuity of start_date */
- prev_date = p_buffer->i_pts + p_buffer->i_length;
- if( prev_date >= start_date - 1 )
- break;
- /* We authorize a +-1 because rounding errors get compensated
- * regularly. */
- msg_Warn( p_mixer, "the mixer got a packet in the past (%"PRId64")",
- start_date - prev_date );
- aout_BufferFree( aout_FifoPop( p_fifo ) );
- p_input->begin = NULL;
- p_buffer = p_fifo->p_first;
- }
-
- /* Check that we have enough samples. */
- while( prev_date < end_date )
- {
- p_buffer = p_buffer->p_next;
- if( p_buffer == NULL )
- goto giveup;
-
- /* Check that all buffers are contiguous. */
- if( prev_date != p_buffer->i_pts )
- {
- msg_Warn( p_mixer,
- "buffer hole, dropping packets (%"PRId64")",
- p_buffer->i_pts - prev_date );
-
- aout_buffer_t *p_deleted;
- while( (p_deleted = p_fifo->p_first) != p_buffer )
- aout_BufferFree( aout_FifoPop( p_fifo ) );
- }
-
- prev_date = p_buffer->i_pts + p_buffer->i_length;
- }
+ mixer->mix(mixer, block, amp);
+}
- p_buffer = p_fifo->p_first;
- if( !AOUT_FMT_NON_LINEAR( &p_mixer->fmt ) )
- {
- /* Additionally check that p_first_byte_to_mix is well located. */
- mtime_t i_buffer = (start_date - p_buffer->i_pts)
- * p_mixer->fmt.i_bytes_per_frame
- * p_mixer->fmt.i_rate
- / p_mixer->fmt.i_frame_length
- / CLOCK_FREQ;
- if( p_input->begin == NULL )
- p_input->begin = p_buffer->p_buffer;
-
- ptrdiff_t bytes = p_input->begin - p_buffer->p_buffer;
- if( !((i_buffer + p_mixer->fmt.i_bytes_per_frame > bytes)
- && (i_buffer < p_mixer->fmt.i_bytes_per_frame + bytes)) )
+/*** Replay gain ***/
+float (aout_ReplayGainSelect)(vlc_object_t *obj, const char *str,
+ const audio_replay_gain_t *replay_gain)
+{
+ float gain = 0.;
+ unsigned mode = AUDIO_REPLAY_GAIN_MAX;
+
+ if (likely(str != NULL))
+ { /* Find selectrf mode */
+ if (!strcmp (str, "track"))
+ mode = AUDIO_REPLAY_GAIN_TRACK;
+ else
+ if (!strcmp (str, "album"))
+ mode = AUDIO_REPLAY_GAIN_ALBUM;
+
+ /* If the selectrf mode is not available, prefer the other one */
+ if (mode != AUDIO_REPLAY_GAIN_MAX && !replay_gain->pb_gain[mode])
{
- msg_Warn( p_mixer, "mixer start is not output start (%"PRId64")",
- i_buffer - bytes );
-
- /* Round to the nearest multiple */
- i_buffer /= p_mixer->fmt.i_bytes_per_frame;
- i_buffer *= p_mixer->fmt.i_bytes_per_frame;
- if( i_buffer < 0 )
- {
- /* Is it really the best way to do it ? */
- aout_lock_output_fifo( p_aout );
- aout_FifoSet( &p_aout->output.fifo, 0 );
- date_Set( &exact_start_date, 0 );
- aout_unlock_output_fifo( p_aout );
- goto giveup;
- }
- p_input->begin = p_buffer->p_buffer + i_buffer;
+ if (replay_gain->pb_gain[!mode])
+ mode = !mode;
}
}
- /* Run the mixer. */
- p_buffer = p_mixer->mix( p_mixer, p_aout->output.i_nb_samples, volume );
- aout_unlock_input_fifos( p_aout );
+ /* */
+ if (mode == AUDIO_REPLAY_GAIN_MAX)
+ return 1.;
- if( unlikely(p_buffer == NULL) )
- return -1;
+ if (replay_gain->pb_gain[mode])
+ gain = replay_gain->pf_gain[mode]
+ + var_InheritFloat (obj, "audio-replay-gain-preamp");
+ else
+ gain = var_InheritFloat (obj, "audio-replay-gain-default");
- p_buffer->i_pts = start_date;
- p_buffer->i_length = end_date - start_date;
- aout_OutputPlay( p_aout, p_buffer );
- return 0;
+ float multiplier = pow (10., gain / 20.);
-giveup:
- /* Interrupted before the end... We can't run. */
- aout_unlock_input_fifos( p_aout );
- return -1;
-}
+ if (replay_gain->pb_peak[mode]
+ && var_InheritBool (obj, "audio-replay-gain-peak-protection")
+ && replay_gain->pf_peak[mode] * multiplier > 1.0)
+ multiplier = 1.0f / replay_gain->pf_peak[mode];
-/*****************************************************************************
- * aout_MixerRun: entry point for the mixer & post-filters processing
- *****************************************************************************
- * Please note that you must hold the mixer lock.
- *****************************************************************************/
-void aout_MixerRun( aout_instance_t * p_aout, float volume )
-{
- while( MixBuffer( p_aout, volume ) != -1 );
+ return multiplier;
}
projects / vlc / blobdiff