# include "config.h"
#endif
+#include <limits.h>
#include <assert.h>
#include <vlc_common.h>
#include <vlc_aout.h>
+#include <vlc_modules.h>
#include "aout_internal.h"
#include "libvlc.h"
* Instances management (internal and external)
*/
-#define AOUT_ASSERT_FIFO_LOCKED aout_assert_fifo_locked(p_aout, p_fifo)
-static inline void aout_assert_fifo_locked( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
-{
-#ifndef NDEBUG
- if( p_fifo == &p_aout->output.fifo )
- vlc_assert_locked( &p_aout->output_fifo_lock );
- else
- {
- int i;
- for( i = 0; i < p_aout->i_nb_inputs; i++ )
- {
- if( p_fifo == &p_aout->pp_inputs[i]->fifo)
- {
- vlc_assert_locked( &p_aout->input_fifos_lock );
- break;
- }
- }
- if( i == p_aout->i_nb_inputs )
- vlc_assert_locked( &p_aout->mixer_lock );
- }
-#else
- (void)p_aout;
- (void)p_fifo;
-#endif
-}
-
/* Local functions */
static void aout_Destructor( vlc_object_t * p_this );
+#undef aout_New
/*****************************************************************************
* aout_New: initialize aout structure
*****************************************************************************/
-aout_instance_t * __aout_New( vlc_object_t * p_parent )
+audio_output_t *aout_New( vlc_object_t * p_parent )
{
- aout_instance_t * p_aout;
- vlc_value_t val;
+ audio_output_t *aout = vlc_custom_create (p_parent,
+ sizeof (aout_instance_t),
+ "audio output");
+ if (unlikely(aout == NULL))
+ return NULL;
- /* Allocate descriptor. */
- p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
- if( p_aout == NULL )
+ aout_owner_t *owner = aout_owner (aout);
+
+ vlc_mutex_init (&owner->lock);
+ owner->module = NULL;
+ owner->input = NULL;
+ vlc_mutex_init (&owner->volume.lock);
+ owner->volume.multiplier = 1.0;
+ owner->volume.mixer = NULL;
+
+ aout_VolumeNoneInit (aout);
+ vlc_object_set_destructor (aout, aout_Destructor);
+
+ /*
+ * Persistent audio output variables
+ */
+ vlc_value_t val, text;
+ char *str;
+
+ var_Create (aout, "intf-change", VLC_VAR_VOID);
+
+ /* Visualizations */
+ var_Create (aout, "visual", VLC_VAR_STRING | VLC_VAR_HASCHOICE);
+ text.psz_string = _("Visualizations");
+ var_Change (aout, "visual", VLC_VAR_SETTEXT, &text, NULL);
+ val.psz_string = (char *)"";
+ text.psz_string = _("Disable");
+ var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+ val.psz_string = (char *)"spectrometer";
+ text.psz_string = _("Spectrometer");
+ var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+ val.psz_string = (char *)"scope";
+ text.psz_string = _("Scope");
+ var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+ val.psz_string = (char *)"spectrum";
+ text.psz_string = _("Spectrum");
+ var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+ val.psz_string = (char *)"vuMeter";
+ text.psz_string = _("Vu meter");
+ var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+ /* Look for goom plugin */
+ if (module_exists ("goom"))
{
- return NULL;
+ val.psz_string = (char *)"goom";
+ text.psz_string = (char *)"Goom";
+ var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+ }
+ /* Look for libprojectM plugin */
+ if (module_exists ("projectm"))
+ {
+ val.psz_string = (char *)"projectm";
+ text.psz_string = (char*)"projectM";
+ var_Change (aout, "visual", VLC_VAR_ADDCHOICE, &val, &text);
+ }
+ str = var_GetNonEmptyString (aout, "effect-list");
+ if (str != NULL)
+ {
+ var_SetString (aout, "visual", str);
+ free (str);
}
- /* Initialize members. */
- vlc_mutex_init( &p_aout->input_fifos_lock );
- vlc_mutex_init( &p_aout->mixer_lock );
- vlc_mutex_init( &p_aout->output_fifo_lock );
- p_aout->i_nb_inputs = 0;
- p_aout->mixer.f_multiplier = 1.0;
- p_aout->mixer.b_error = 1;
- p_aout->output.b_error = 1;
- p_aout->output.b_starving = 1;
+ /* Equalizer */
+ var_Create (aout, "equalizer", VLC_VAR_STRING | VLC_VAR_HASCHOICE);
+ text.psz_string = _("Equalizer");
+ var_Change (aout, "equalizer", VLC_VAR_SETTEXT, &text, NULL);
+ val.psz_string = (char*)"";
+ text.psz_string = _("Disable");
+ var_Change (aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text);
+ {
+ module_config_t *cfg = config_FindConfig (VLC_OBJECT(aout),
+ "equalizer-preset");
+ if (cfg != NULL)
+ for (int i = 0; i < cfg->i_list; i++)
+ {
+ val.psz_string = (char *)cfg->ppsz_list[i];
+ text.psz_string = (char *)cfg->ppsz_list_text[i];
+ var_Change (aout, "equalizer", VLC_VAR_ADDCHOICE, &val, &text);
+ }
+ }
+
+
+ var_Create (aout, "audio-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+ text.psz_string = _("Audio filters");
+ var_Change (aout, "audio-filter", VLC_VAR_SETTEXT, &text, NULL);
- var_Create( p_aout, "intf-change", VLC_VAR_BOOL );
- val.b_bool = true;
- var_Set( p_aout, "intf-change", val );
- vlc_object_set_destructor( p_aout, aout_Destructor );
+ var_Create (aout, "audio-visual", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
+ text.psz_string = _("Audio visualizations");
+ var_Change (aout, "audio-visual", VLC_VAR_SETTEXT, &text, NULL);
- return p_aout;
+
+ /* Replay gain */
+ var_Create (aout, "audio-replay-gain-mode",
+ VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ text.psz_string = _("Replay gain");
+ var_Change (aout, "audio-replay-gain-mode", VLC_VAR_SETTEXT, &text, NULL);
+ {
+ module_config_t *cfg = config_FindConfig (VLC_OBJECT(aout),
+ "audio-replay-gain-mode");
+ if( cfg != NULL )
+ for (int i = 0; i < cfg->i_list; i++)
+ {
+ val.psz_string = (char *)cfg->ppsz_list[i];
+ text.psz_string = (char *)cfg->ppsz_list_text[i];
+ var_Change (aout, "audio-replay-gain-mode", VLC_VAR_ADDCHOICE,
+ &val, &text);
+ }
+ }
+
+
+ return aout;
}
/*****************************************************************************
* aout_Destructor: destroy aout structure
*****************************************************************************/
-static void aout_Destructor( vlc_object_t * p_this )
+static void aout_Destructor (vlc_object_t *obj)
{
- aout_instance_t * p_aout = (aout_instance_t *)p_this;
- vlc_mutex_destroy( &p_aout->input_fifos_lock );
- vlc_mutex_destroy( &p_aout->mixer_lock );
- vlc_mutex_destroy( &p_aout->output_fifo_lock );
-}
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_owner_t *owner = aout_owner (aout);
+ vlc_mutex_destroy (&owner->volume.lock);
+ vlc_mutex_destroy (&owner->lock);
+}
-/*
- * Formats management (internal and external)
- */
+#ifdef AOUT_DEBUG
+/* Lock debugging */
+static __thread unsigned aout_locks = 0;
-/*****************************************************************************
- * aout_FormatNbChannels : return the number of channels
- *****************************************************************************/
-unsigned int aout_FormatNbChannels( const audio_sample_format_t * p_format )
+void aout_lock_check (unsigned i)
{
- static const uint32_t pi_channels[] =
- { AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
- AOUT_CHAN_REARCENTER, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
- AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, AOUT_CHAN_LFE };
- unsigned int i_nb = 0, i;
+ unsigned allowed;
+ switch (i)
+ {
+ case VOLUME_LOCK:
+ allowed = 0;
+ break;
+ case OUTPUT_LOCK:
+ allowed = VOLUME_LOCK;
+ break;
+ default:
+ abort ();
+ }
- for ( i = 0; i < sizeof(pi_channels)/sizeof(uint32_t); i++ )
+ if (aout_locks & ~allowed)
{
- if ( p_format->i_physical_channels & pi_channels[i] ) i_nb++;
+ fprintf (stderr, "Illegal audio lock transition (%x -> %x)\n",
+ aout_locks, aout_locks|i);
+ vlc_backtrace ();
+ abort ();
}
+ aout_locks |= i;
+}
- return i_nb;
+void aout_unlock_check (unsigned i)
+{
+ assert (aout_locks & i);
+ aout_locks &= ~i;
}
+#endif
+
+/*
+ * Formats management (internal and external)
+ */
/*****************************************************************************
* aout_BitsPerSample : get the number of bits per sample
*****************************************************************************/
unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
{
- switch( i_format )
+ switch( vlc_fourcc_GetCodec( AUDIO_ES, i_format ) )
{
- case VLC_FOURCC('u','8',' ',' '):
- case VLC_FOURCC('s','8',' ',' '):
+ case VLC_CODEC_U8:
+ case VLC_CODEC_S8:
return 8;
- case VLC_FOURCC('u','1','6','l'):
- case VLC_FOURCC('s','1','6','l'):
- case VLC_FOURCC('u','1','6','b'):
- case VLC_FOURCC('s','1','6','b'):
+ case VLC_CODEC_U16L:
+ case VLC_CODEC_S16L:
+ case VLC_CODEC_U16B:
+ case VLC_CODEC_S16B:
return 16;
- case VLC_FOURCC('u','2','4','l'):
- case VLC_FOURCC('s','2','4','l'):
- case VLC_FOURCC('u','2','4','b'):
- case VLC_FOURCC('s','2','4','b'):
+ case VLC_CODEC_U24L:
+ case VLC_CODEC_S24L:
+ case VLC_CODEC_U24B:
+ case VLC_CODEC_S24B:
return 24;
- case VLC_FOURCC('s','3','2','l'):
- case VLC_FOURCC('s','3','2','b'):
- case VLC_FOURCC('f','l','3','2'):
- case VLC_FOURCC('f','i','3','2'):
+ case VLC_CODEC_S32L:
+ case VLC_CODEC_S32B:
+ case VLC_CODEC_F32L:
+ case VLC_CODEC_F32B:
+ case VLC_CODEC_FI32:
return 32;
- case VLC_FOURCC('f','l','6','4'):
+ case VLC_CODEC_F64L:
+ case VLC_CODEC_F64B:
return 64;
default:
*****************************************************************************/
void aout_FormatPrepare( audio_sample_format_t * p_format )
{
+ p_format->i_channels = aout_FormatNbChannels( p_format );
p_format->i_bitspersample = aout_BitsPerSample( p_format->i_format );
if( p_format->i_bitspersample > 0 )
{
{
switch ( p_format->i_physical_channels & AOUT_CHAN_PHYSMASK )
{
+ case AOUT_CHAN_LEFT:
+ case AOUT_CHAN_RIGHT:
case AOUT_CHAN_CENTER:
if ( (p_format->i_original_channels & AOUT_CHAN_CENTER)
|| (p_format->i_original_channels
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
return "2F2R";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT:
+ return "2F2M";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
return "3F2R";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT:
+ return "3F2M";
case AOUT_CHAN_CENTER | AOUT_CHAN_LFE:
if ( (p_format->i_original_channels & AOUT_CHAN_CENTER)
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE:
return "2F2R/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_LFE:
+ return "2F2M/LFE";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE:
return "3F2R/LFE";
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_LFE:
+ return "3F2M/LFE";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT
| AOUT_CHAN_MIDDLERIGHT:
return "ERROR";
}
-/*****************************************************************************
- * aout_FormatPrint : print a format in a human-readable form
- *****************************************************************************/
-void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text,
- const audio_sample_format_t * p_format )
+#undef aout_FormatPrint
+/**
+ * Prints an audio sample format in a human-readable form.
+ */
+void aout_FormatPrint( vlc_object_t *obj, const char *psz_text,
+ const audio_sample_format_t *p_format )
{
- msg_Dbg( p_aout, "%s '%4.4s' %d Hz %s frame=%d samples/%d bytes", psz_text,
+ msg_Dbg( obj, "%s '%4.4s' %d Hz %s frame=%d samples/%d bytes", psz_text,
(char *)&p_format->i_format, p_format->i_rate,
aout_FormatPrintChannels( p_format ),
p_format->i_frame_length, p_format->i_bytes_per_frame );
}
-/*****************************************************************************
- * aout_FormatsPrint : print two formats in a human-readable form
- *****************************************************************************/
-void aout_FormatsPrint( aout_instance_t * p_aout, const char * psz_text,
+#undef aout_FormatsPrint
+/**
+ * Prints two formats in a human-readable form
+ */
+void aout_FormatsPrint( vlc_object_t *obj, const char * psz_text,
const audio_sample_format_t * p_format1,
const audio_sample_format_t * p_format2 )
{
- msg_Dbg( p_aout, "%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s",
+ msg_Dbg( obj, "%s '%4.4s'->'%4.4s' %d Hz->%d Hz %s->%s",
psz_text,
(char *)&p_format1->i_format, (char *)&p_format2->i_format,
p_format1->i_rate, p_format2->i_rate,
* before calling any of these functions.
*/
+#undef aout_FifoInit
/*****************************************************************************
* aout_FifoInit : initialize the members of a FIFO
*****************************************************************************/
-void aout_FifoInit( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
- uint32_t i_rate )
+void aout_FifoInit( vlc_object_t *obj, aout_fifo_t * p_fifo, uint32_t i_rate )
{
- AOUT_ASSERT_FIFO_LOCKED;
-
- if( i_rate == 0 )
- {
- msg_Err( p_aout, "initialising fifo with zero divider" );
- }
+ if( unlikely(i_rate == 0) )
+ msg_Err( obj, "initialising fifo with zero divider" );
p_fifo->p_first = NULL;
p_fifo->pp_last = &p_fifo->p_first;
- aout_DateInit( &p_fifo->end_date, i_rate );
+ date_Init( &p_fifo->end_date, i_rate, 1 );
+ date_Set( &p_fifo->end_date, VLC_TS_INVALID );
}
/*****************************************************************************
* aout_FifoPush : push a packet into the FIFO
*****************************************************************************/
-void aout_FifoPush( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
- aout_buffer_t * p_buffer )
+void aout_FifoPush( aout_fifo_t * p_fifo, aout_buffer_t * p_buffer )
{
- (void)p_aout;
- AOUT_ASSERT_FIFO_LOCKED;
-
*p_fifo->pp_last = p_buffer;
p_fifo->pp_last = &p_buffer->p_next;
*p_fifo->pp_last = NULL;
/* Enforce the continuity of the stream. */
- if ( aout_DateGet( &p_fifo->end_date ) )
+ if( date_Get( &p_fifo->end_date ) != VLC_TS_INVALID )
{
- p_buffer->start_date = aout_DateGet( &p_fifo->end_date );
- p_buffer->end_date = aout_DateIncrement( &p_fifo->end_date,
- p_buffer->i_nb_samples );
+ p_buffer->i_pts = date_Get( &p_fifo->end_date );
+ p_buffer->i_length = date_Increment( &p_fifo->end_date,
+ p_buffer->i_nb_samples );
+ p_buffer->i_length -= p_buffer->i_pts;
}
else
{
- aout_DateSet( &p_fifo->end_date, p_buffer->end_date );
+ date_Set( &p_fifo->end_date, p_buffer->i_pts + p_buffer->i_length );
}
}
/*****************************************************************************
- * aout_FifoSet : set end_date and trash all buffers (because they aren't
- * properly dated)
+ * aout_FifoReset: trash all buffers
*****************************************************************************/
-void aout_FifoSet( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
- mtime_t date )
+void aout_FifoReset( aout_fifo_t * p_fifo )
{
aout_buffer_t * p_buffer;
- (void)p_aout;
- AOUT_ASSERT_FIFO_LOCKED;
- aout_DateSet( &p_fifo->end_date, date );
+ date_Set( &p_fifo->end_date, VLC_TS_INVALID );
p_buffer = p_fifo->p_first;
while ( p_buffer != NULL )
{
/*****************************************************************************
* aout_FifoMoveDates : Move forwards or backwards all dates in the FIFO
*****************************************************************************/
-void aout_FifoMoveDates( aout_instance_t * p_aout, aout_fifo_t * p_fifo,
- mtime_t difference )
+void aout_FifoMoveDates( aout_fifo_t *fifo, mtime_t difference )
{
- aout_buffer_t * p_buffer;
- (void)p_aout;
- AOUT_ASSERT_FIFO_LOCKED;
-
- aout_DateMove( &p_fifo->end_date, difference );
- p_buffer = p_fifo->p_first;
- while ( p_buffer != NULL )
+ if( date_Get( &fifo->end_date ) == VLC_TS_INVALID )
{
- p_buffer->start_date += difference;
- p_buffer->end_date += difference;
- p_buffer = p_buffer->p_next;
+ assert( fifo->p_first == NULL );
+ return;
}
-}
-
-/*****************************************************************************
- * aout_FifoNextStart : return the current end_date
- *****************************************************************************/
-mtime_t aout_FifoNextStart( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
-{
- (void)p_aout;
- AOUT_ASSERT_FIFO_LOCKED;
- return aout_DateGet( &p_fifo->end_date );
-}
-/*****************************************************************************
- * aout_FifoFirstDate : return the playing date of the first buffer in the
- * FIFO
- *****************************************************************************/
-mtime_t aout_FifoFirstDate( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
-{
- (void)p_aout;
- AOUT_ASSERT_FIFO_LOCKED;
- return p_fifo->p_first ? p_fifo->p_first->start_date : 0;
+ date_Move( &fifo->end_date, difference );
+ for( block_t *block = fifo->p_first; block != NULL; block = block->p_next )
+ block->i_pts += difference;
}
/*****************************************************************************
* aout_FifoPop : get the next buffer out of the FIFO
*****************************************************************************/
-aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
+aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo )
{
- aout_buffer_t * p_buffer;
- (void)p_aout;
- AOUT_ASSERT_FIFO_LOCKED;
-
- p_buffer = p_fifo->p_first;
- if ( p_buffer == NULL ) return NULL;
- p_fifo->p_first = p_buffer->p_next;
- if ( p_fifo->p_first == NULL )
+ aout_buffer_t *p_buffer = p_fifo->p_first;
+ if( p_buffer != NULL )
{
- p_fifo->pp_last = &p_fifo->p_first;
+ p_fifo->p_first = p_buffer->p_next;
+ if( p_fifo->p_first == NULL )
+ p_fifo->pp_last = &p_fifo->p_first;
}
-
return p_buffer;
}
/*****************************************************************************
* aout_FifoDestroy : destroy a FIFO and its buffers
*****************************************************************************/
-void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
+void aout_FifoDestroy( aout_fifo_t * p_fifo )
{
aout_buffer_t * p_buffer;
- (void)p_aout;
- AOUT_ASSERT_FIFO_LOCKED;
p_buffer = p_fifo->p_first;
while ( p_buffer != NULL )
p_fifo->pp_last = &p_fifo->p_first;
}
-
-/*
- * Date management (internal and external)
- */
-
-/*****************************************************************************
- * aout_DateInit : set the divider of an audio_date_t
- *****************************************************************************/
-void aout_DateInit( audio_date_t * p_date, uint32_t i_divider )
-{
- assert (i_divider);
- p_date->date = 0;
- p_date->i_divider = i_divider;
- p_date->i_remainder = 0;
-}
-
-/*****************************************************************************
- * aout_DateSet : set the date of an audio_date_t
- *****************************************************************************/
-void aout_DateSet( audio_date_t * p_date, mtime_t new_date )
-{
- p_date->date = new_date;
- p_date->i_remainder = 0;
-}
-
-/*****************************************************************************
- * aout_DateMove : move forwards or backwards the date of an audio_date_t
- *****************************************************************************/
-void aout_DateMove( audio_date_t * p_date, mtime_t difference )
-{
- p_date->date += difference;
-}
-
-/*****************************************************************************
- * aout_DateGet : get the date of an audio_date_t
- *****************************************************************************/
-mtime_t aout_DateGet( const audio_date_t * p_date )
-{
- return p_date->date;
-}
-
-/*****************************************************************************
- * aout_DateIncrement : increment the date and return the result, taking
- * into account rounding errors
- *****************************************************************************/
-mtime_t aout_DateIncrement( audio_date_t * p_date, uint32_t i_nb_samples )
-{
- mtime_t i_dividend = INT64_C(1000000) * i_nb_samples;
- assert (p_date->i_divider); /* uninitialized audio_data_t ? */
- p_date->date += i_dividend / p_date->i_divider;
- p_date->i_remainder += (int)(i_dividend % p_date->i_divider);
- if ( p_date->i_remainder >= p_date->i_divider )
- {
- /* This is Bresenham algorithm. */
- p_date->date++;
- p_date->i_remainder -= p_date->i_divider;
- }
- return p_date->date;
-}
-
/*****************************************************************************
* aout_CheckChannelReorder : Check if we need to do some channel re-ordering
*****************************************************************************/
}
}
}
+
+/*****************************************************************************
+ * aout_ChannelExtract:
+ *****************************************************************************/
+static inline void ExtractChannel( uint8_t *pi_dst, int i_dst_channels,
+ const uint8_t *pi_src, int i_src_channels,
+ int i_sample_count,
+ const int *pi_selection, int i_bytes )
+{
+ for( int i = 0; i < i_sample_count; i++ )
+ {
+ for( int j = 0; j < i_dst_channels; j++ )
+ memcpy( &pi_dst[j * i_bytes], &pi_src[pi_selection[j] * i_bytes], i_bytes );
+ pi_dst += i_dst_channels * i_bytes;
+ pi_src += i_src_channels * i_bytes;
+ }
+}
+
+void aout_ChannelExtract( void *p_dst, int i_dst_channels,
+ const void *p_src, int i_src_channels,
+ int i_sample_count, const int *pi_selection, int i_bits_per_sample )
+{
+ /* It does not work in place */
+ assert( p_dst != p_src );
+
+ /* Force the compiler to inline for the specific cases so it can optimize */
+ if( i_bits_per_sample == 8 )
+ ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 1 );
+ else if( i_bits_per_sample == 16 )
+ ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 2 );
+ else if( i_bits_per_sample == 24 )
+ ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 3 );
+ else if( i_bits_per_sample == 32 )
+ ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 4 );
+ else if( i_bits_per_sample == 64 )
+ ExtractChannel( p_dst, i_dst_channels, p_src, i_src_channels, i_sample_count, pi_selection, 8 );
+}
+
+bool aout_CheckChannelExtraction( int *pi_selection,
+ uint32_t *pi_layout, int *pi_channels,
+ const uint32_t pi_order_dst[AOUT_CHAN_MAX],
+ const uint32_t *pi_order_src, int i_channels )
+{
+ const uint32_t pi_order_dual_mono[] = { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT };
+ uint32_t i_layout = 0;
+ int i_out = 0;
+ int pi_index[AOUT_CHAN_MAX];
+
+ /* */
+ if( !pi_order_dst )
+ pi_order_dst = pi_vlc_chan_order_wg4;
+
+ /* Detect special dual mono case */
+ if( i_channels == 2 &&
+ pi_order_src[0] == AOUT_CHAN_CENTER && pi_order_src[1] == AOUT_CHAN_CENTER )
+ {
+ i_layout |= AOUT_CHAN_DUALMONO;
+ pi_order_src = pi_order_dual_mono;
+ }
+
+ /* */
+ for( int i = 0; i < i_channels; i++ )
+ {
+ /* Ignore unknown or duplicated channels or not present in output */
+ if( !pi_order_src[i] || (i_layout & pi_order_src[i]) )
+ continue;
+
+ for( int j = 0; j < AOUT_CHAN_MAX; j++ )
+ {
+ if( pi_order_dst[j] == pi_order_src[i] )
+ {
+ assert( i_out < AOUT_CHAN_MAX );
+ pi_index[i_out++] = i;
+ i_layout |= pi_order_src[i];
+ break;
+ }
+ }
+ }
+
+ /* */
+ for( int i = 0, j = 0; i < AOUT_CHAN_MAX; i++ )
+ {
+ for( int k = 0; k < i_out; k++ )
+ {
+ if( pi_order_dst[i] == pi_order_src[pi_index[k]] )
+ {
+ pi_selection[j++] = pi_index[k];
+ break;
+ }
+ }
+ }
+
+ *pi_layout = i_layout;
+ *pi_channels = i_out;
+
+ for( int i = 0; i < i_out; i++ )
+ {
+ if( pi_selection[i] != i )
+ return true;
+ }
+ return i_out == i_channels;
+}
+
+/* Return the order in which filters should be inserted */
+static int FilterOrder( const char *psz_name )
+{
+ static const struct {
+ const char *psz_name;
+ int i_order;
+ } filter[] = {
+ { "equalizer", 0 },
+ { NULL, INT_MAX },
+ };
+ for( int i = 0; filter[i].psz_name; i++ )
+ {
+ if( !strcmp( filter[i].psz_name, psz_name ) )
+ return filter[i].i_order;
+ }
+ return INT_MAX;
+}
+
+/* This function will add or remove a a module from a string list (colon
+ * separated). It will return true if there is a modification
+ * In case p_aout is NULL, we will use configuration instead of variable */
+bool aout_ChangeFilterString( vlc_object_t *p_obj, vlc_object_t *p_aout,
+ const char *psz_variable,
+ const char *psz_name, bool b_add )
+{
+ if( *psz_name == '\0' )
+ return false;
+
+ char *psz_list;
+ if( p_aout )
+ {
+ psz_list = var_GetString( p_aout, psz_variable );
+ }
+ else
+ {
+ psz_list = var_CreateGetString( p_obj->p_libvlc, psz_variable );
+ var_Destroy( p_obj->p_libvlc, psz_variable );
+ }
+
+ /* Split the string into an array of filters */
+ int i_count = 1;
+ for( char *p = psz_list; p && *p; p++ )
+ i_count += *p == ':';
+ i_count += b_add;
+
+ const char **ppsz_filter = calloc( i_count, sizeof(*ppsz_filter) );
+ if( !ppsz_filter )
+ {
+ free( psz_list );
+ return false;
+ }
+ bool b_present = false;
+ i_count = 0;
+ for( char *p = psz_list; p && *p; )
+ {
+ char *psz_end = strchr(p, ':');
+ if( psz_end )
+ *psz_end++ = '\0';
+ else
+ psz_end = p + strlen(p);
+ if( *p )
+ {
+ b_present |= !strcmp( p, psz_name );
+ ppsz_filter[i_count++] = p;
+ }
+ p = psz_end;
+ }
+ if( b_present == b_add )
+ {
+ free( ppsz_filter );
+ free( psz_list );
+ return false;
+ }
+
+ if( b_add )
+ {
+ int i_order = FilterOrder( psz_name );
+ int i;
+ for( i = 0; i < i_count; i++ )
+ {
+ if( FilterOrder( ppsz_filter[i] ) > i_order )
+ break;
+ }
+ if( i < i_count )
+ memmove( &ppsz_filter[i+1], &ppsz_filter[i], (i_count - i) * sizeof(*ppsz_filter) );
+ ppsz_filter[i] = psz_name;
+ i_count++;
+ }
+ else
+ {
+ for( int i = 0; i < i_count; i++ )
+ {
+ if( !strcmp( ppsz_filter[i], psz_name ) )
+ ppsz_filter[i] = "";
+ }
+ }
+ size_t i_length = 0;
+ for( int i = 0; i < i_count; i++ )
+ i_length += 1 + strlen( ppsz_filter[i] );
+
+ char *psz_new = malloc( i_length + 1 );
+ *psz_new = '\0';
+ for( int i = 0; i < i_count; i++ )
+ {
+ if( *ppsz_filter[i] == '\0' )
+ continue;
+ if( *psz_new )
+ strcat( psz_new, ":" );
+ strcat( psz_new, ppsz_filter[i] );
+ }
+ free( ppsz_filter );
+ free( psz_list );
+
+ if( p_aout )
+ var_SetString( p_aout, psz_variable, psz_new );
+ else
+ config_PutPsz( p_obj, psz_variable, psz_new );
+ free( psz_new );
+
+ return true;
+}
+
+
+
projects / vlc / blobdiff