#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <assert.h>
#include <stddef.h>
+#include <math.h>
+
#include <vlc_common.h>
#include <libvlc.h>
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
+#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->allocation = p_aout->mixer_allocation;
- p_mixer->multiplier = p_aout->mixer_multiplier;
- p_mixer->input_count = p_aout->i_nb_inputs;
- p_mixer->input = calloc( p_mixer->input_count, sizeof(*p_mixer->input) );
- for( int i = 0; i < p_aout->i_nb_inputs; i++ )
- p_mixer->input[i] = &p_aout->pp_inputs[i]->mixer;
- p_mixer->mix = NULL;
- p_mixer->sys = NULL;
-
- vlc_object_attach( p_mixer, p_aout );
-
- 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_aout, "no suitable audio mixer" );
- vlc_object_detach( p_mixer );
- free( p_mixer->input );
- 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;
- vlc_object_detach( p_aout->p_mixer );
-
- module_unneed( p_aout->p_mixer, p_aout->p_mixer->module );
-
- free( p_aout->p_mixer->input );
- 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 )
+/**
+ * Applies replay gain and software volume to an audio buffer.
+ */
+void aout_MixerRun(audio_mixer_t *mixer, block_t *block, float amp)
{
- int i, i_first_input = 0;
- aout_buffer_t * p_output_buffer;
- mtime_t start_date, end_date;
- date_t exact_start_date;
-
- if( !p_aout->p_mixer )
- {
- /* Free all incoming buffers. */
- aout_lock_input_fifos( p_aout );
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- aout_input_t * p_input = p_aout->pp_inputs[i];
- aout_buffer_t * p_buffer = p_input->mixer.fifo.p_first;
- if ( p_input->b_error ) continue;
- while ( p_buffer != NULL )
- {
- aout_buffer_t * p_next = p_buffer->p_next;
- aout_BufferFree( p_buffer );
- p_buffer = p_next;
- }
- }
- aout_unlock_input_fifos( p_aout );
- return -1;
- }
-
-
- aout_lock_output_fifo( p_aout );
- aout_lock_input_fifos( p_aout );
-
- /* Retrieve the date of the next buffer. */
- exact_start_date = p_aout->output.fifo.end_date;
- start_date = date_Get( &exact_start_date );
-
- if ( start_date != 0 && start_date < mdate() )
- {
- /* 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_aout, "output PTS is out of range (%"PRId64"), clearing out",
- mdate() - start_date );
- aout_FifoSet( p_aout, &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. */
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- aout_input_t * p_input = p_aout->pp_inputs[i];
- aout_fifo_t * p_fifo = &p_input->mixer.fifo;
- aout_buffer_t * p_buffer;
-
- if ( p_input->b_error || p_input->b_paused )
- continue;
-
- p_buffer = p_fifo->p_first;
- while ( p_buffer != NULL && p_buffer->start_date < mdate() )
- {
- msg_Warn( p_aout, "input PTS is out of range (%"PRId64"), "
- "trashing", mdate() - p_buffer->start_date );
- p_buffer = aout_FifoPop( p_aout, p_fifo );
- aout_BufferFree( p_buffer );
- p_buffer = p_fifo->p_first;
- p_input->mixer.begin = NULL;
- }
-
- if ( p_buffer == NULL )
- {
- break;
- }
-
- if ( !start_date || start_date < p_buffer->start_date )
- {
- date_Set( &exact_start_date, p_buffer->start_date );
- start_date = p_buffer->start_date;
- }
- }
-
- if ( i < p_aout->i_nb_inputs )
- {
- /* Interrupted before the end... We can't run. */
- aout_unlock_input_fifos( p_aout );
- return -1;
- }
- }
- date_Increment( &exact_start_date, p_aout->output.i_nb_samples );
- end_date = date_Get( &exact_start_date );
-
- /* Check that start_date and end_date are available for all input
- * streams. */
- for ( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- aout_input_t * p_input = p_aout->pp_inputs[i];
- aout_fifo_t * p_fifo = &p_input->mixer.fifo;
- aout_buffer_t * p_buffer;
- mtime_t prev_date;
- bool b_drop_buffers;
-
- p_input->mixer.is_invalid = p_input->b_error || p_input->b_paused;
- if ( p_input->mixer.is_invalid )
- {
- if ( i_first_input == i ) i_first_input++;
- continue;
- }
-
- p_buffer = p_fifo->p_first;
- if ( p_buffer == NULL )
- {
- break;
- }
-
- /* Check for the continuity of start_date */
- while ( p_buffer != NULL && p_buffer->end_date < start_date - 1 )
- {
- /* We authorize a +-1 because rounding errors get compensated
- * regularly. */
- aout_buffer_t * p_next = p_buffer->p_next;
- msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")",
- start_date - p_buffer->end_date );
- aout_BufferFree( p_buffer );
- p_fifo->p_first = p_buffer = p_next;
- p_input->mixer.begin = NULL;
- }
- if ( p_buffer == NULL )
- {
- p_fifo->pp_last = &p_fifo->p_first;
- break;
- }
-
- /* Check that we have enough samples. */
- for ( ; ; )
- {
- p_buffer = p_fifo->p_first;
- if ( p_buffer == NULL ) break;
- if ( p_buffer->end_date >= end_date ) break;
-
- /* Check that all buffers are contiguous. */
- prev_date = p_fifo->p_first->end_date;
- p_buffer = p_buffer->p_next;
- b_drop_buffers = 0;
- for ( ; p_buffer != NULL; p_buffer = p_buffer->p_next )
- {
- if ( prev_date != p_buffer->start_date )
- {
- msg_Warn( p_aout,
- "buffer hole, dropping packets (%"PRId64")",
- p_buffer->start_date - prev_date );
- b_drop_buffers = 1;
- break;
- }
- if ( p_buffer->end_date >= end_date ) break;
- prev_date = p_buffer->end_date;
- }
- if ( b_drop_buffers )
- {
- aout_buffer_t * p_deleted = p_fifo->p_first;
- while ( p_deleted != NULL && p_deleted != p_buffer )
- {
- aout_buffer_t * p_next = p_deleted->p_next;
- aout_BufferFree( p_deleted );
- p_deleted = p_next;
- }
- p_fifo->p_first = p_deleted; /* == p_buffer */
- }
- else break;
- }
- if ( p_buffer == NULL ) break;
+ mixer->mix(mixer, block, amp);
+}
- p_buffer = p_fifo->p_first;
- if ( !AOUT_FMT_NON_LINEAR( &p_aout->p_mixer->fmt ) )
+/*** 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])
{
- /* Additionally check that p_first_byte_to_mix is well
- * located. */
- mtime_t i_nb_bytes = (start_date - p_buffer->start_date)
- * p_aout->p_mixer->fmt.i_bytes_per_frame
- * p_aout->p_mixer->fmt.i_rate
- / p_aout->p_mixer->fmt.i_frame_length
- / 1000000;
- ptrdiff_t mixer_nb_bytes;
-
- if ( p_input->mixer.begin == NULL )
- {
- p_input->mixer.begin = p_buffer->p_buffer;
- }
- mixer_nb_bytes = p_input->mixer.begin - p_buffer->p_buffer;
-
- if ( !((i_nb_bytes + p_aout->p_mixer->fmt.i_bytes_per_frame
- > mixer_nb_bytes) &&
- (i_nb_bytes < p_aout->p_mixer->fmt.i_bytes_per_frame
- + mixer_nb_bytes)) )
- {
- msg_Warn( p_aout, "mixer start isn't output start (%"PRId64")",
- i_nb_bytes - mixer_nb_bytes );
-
- /* Round to the nearest multiple */
- i_nb_bytes /= p_aout->p_mixer->fmt.i_bytes_per_frame;
- i_nb_bytes *= p_aout->p_mixer->fmt.i_bytes_per_frame;
- if( i_nb_bytes < 0 )
- {
- /* Is it really the best way to do it ? */
- aout_lock_output_fifo( p_aout );
- aout_FifoSet( p_aout, &p_aout->output.fifo, 0 );
- date_Set( &exact_start_date, 0 );
- aout_unlock_output_fifo( p_aout );
- break;
- }
-
- p_input->mixer.begin = p_buffer->p_buffer + i_nb_bytes;
- }
+ if (replay_gain->pb_gain[!mode])
+ mode = !mode;
}
}
- if ( i < p_aout->i_nb_inputs || i_first_input == p_aout->i_nb_inputs )
- {
- /* Interrupted before the end... We can't run. */
- aout_unlock_input_fifos( p_aout );
- return -1;
- }
-
- /* Run the mixer. */
- aout_BufferAlloc( &p_aout->p_mixer->allocation,
- ((uint64_t)p_aout->output.i_nb_samples * 1000000)
- / p_aout->output.output.i_rate,
- /* This is a bit kludgy, but is actually only used
- * for the S/PDIF dummy mixer : */
- p_aout->pp_inputs[i_first_input]->mixer.fifo.p_first,
- p_output_buffer );
- if ( p_output_buffer == NULL )
- {
- aout_unlock_input_fifos( p_aout );
- return -1;
- }
- /* This is again a bit kludgy - for the S/PDIF mixer. */
- if ( p_aout->p_mixer->allocation.i_alloc_type != AOUT_ALLOC_NONE )
- {
- p_output_buffer->i_nb_samples = p_aout->output.i_nb_samples;
- p_output_buffer->i_nb_bytes = p_aout->output.i_nb_samples
- * p_aout->p_mixer->fmt.i_bytes_per_frame
- / p_aout->p_mixer->fmt.i_frame_length;
- }
- p_output_buffer->start_date = start_date;
- p_output_buffer->end_date = end_date;
-
- p_aout->p_mixer->mix( p_aout->p_mixer, p_output_buffer );
-
- aout_unlock_input_fifos( p_aout );
-
- aout_OutputPlay( p_aout, p_output_buffer );
-
- return 0;
-}
-
-/*****************************************************************************
- * 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 )
-{
- while( MixBuffer( p_aout ) != -1 );
-}
-
-/*****************************************************************************
- * aout_MixerMultiplierSet: set p_aout->mixer.f_multiplier
- *****************************************************************************
- * Please note that we assume that you own the mixer lock when entering this
- * function. This function returns -1 on error.
- *****************************************************************************/
-int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier )
-{
- float f_old = p_aout->mixer_multiplier;
- bool b_new_mixer = false;
+ /* */
+ if (mode == AUDIO_REPLAY_GAIN_MAX)
+ return 1.;
- if ( p_aout->p_mixer )
- {
- aout_MixerDelete( p_aout );
- b_new_mixer = true;
- }
+ 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_aout->mixer_multiplier = f_multiplier;
+ float multiplier = pow (10., gain / 20.);
- if ( b_new_mixer && aout_MixerNew( p_aout ) )
- {
- p_aout->mixer_multiplier = f_old;
- aout_MixerNew( 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];
- return 0;
+ return multiplier;
}
-
-/*****************************************************************************
- * aout_MixerMultiplierGet: get p_aout->mixer.f_multiplier
- *****************************************************************************
- * Please note that we assume that you own the mixer lock when entering this
- * function. This function returns -1 on error.
- *****************************************************************************/
-int aout_MixerMultiplierGet( aout_instance_t * p_aout, float * pf_multiplier )
-{
- *pf_multiplier = p_aout->mixer_multiplier;
- return 0;
-}
-
projects / vlc / blobdiff