# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <assert.h>
+
+#include <vlc_common.h>
#include <vlc_aout.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 );
val.b_bool = true;
var_Set( p_aout, "intf-change", val );
- vlc_object_set_destructor( p_parent, aout_Destructor );
+ vlc_object_set_destructor( p_aout, aout_Destructor );
return p_aout;
}
}
/*****************************************************************************
- * aout_FormatPrepare : compute the number of bytes per frame & frame length
+ * aout_BitsPerSample : get the number of bits per sample
*****************************************************************************/
-void aout_FormatPrepare( audio_sample_format_t * p_format )
+unsigned int aout_BitsPerSample( vlc_fourcc_t i_format )
{
- int i_result;
-
- switch ( p_format->i_format )
+ switch( i_format )
{
case VLC_FOURCC('u','8',' ',' '):
case VLC_FOURCC('s','8',' ',' '):
- i_result = 1;
- break;
+ 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'):
- i_result = 2;
- break;
+ 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'):
- i_result = 3;
- break;
+ 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'):
- i_result = 4;
- break;
-
- case VLC_FOURCC('s','p','d','i'):
- case VLC_FOURCC('s','p','d','b'): /* Big endian spdif output */
- case VLC_FOURCC('a','5','2',' '):
- case VLC_FOURCC('d','t','s',' '):
- case VLC_FOURCC('m','p','g','a'):
- case VLC_FOURCC('m','p','g','3'):
+ return 32;
+
+ case VLC_FOURCC('f','l','6','4'):
+ return 64;
+
default:
/* For these formats the caller has to indicate the parameters
* by hand. */
- return;
+ return 0;
}
+}
- p_format->i_bytes_per_frame = i_result * aout_FormatNbChannels( p_format );
- p_format->i_frame_length = 1;
+/*****************************************************************************
+ * aout_FormatPrepare : compute the number of bytes per frame & frame length
+ *****************************************************************************/
+void aout_FormatPrepare( audio_sample_format_t * p_format )
+{
+ p_format->i_bitspersample = aout_BitsPerSample( p_format->i_format );
+ if( p_format->i_bitspersample > 0 )
+ {
+ p_format->i_bytes_per_frame = ( p_format->i_bitspersample / 8 )
+ * aout_FormatNbChannels( p_format );
+ p_format->i_frame_length = 1;
+ }
}
/*****************************************************************************
void aout_FifoInit( aout_instance_t * p_aout, 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" );
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;
{
aout_buffer_t * p_buffer;
(void)p_aout;
+ AOUT_ASSERT_FIFO_LOCKED;
aout_DateSet( &p_fifo->end_date, date );
p_buffer = p_fifo->p_first;
{
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;
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 );
}
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;
}
{
aout_buffer_t * p_buffer;
(void)p_aout;
+ AOUT_ASSERT_FIFO_LOCKED;
p_buffer = p_fifo->p_first;
if ( p_buffer == NULL ) return NULL;
{
aout_buffer_t * p_buffer;
(void)p_aout;
+ AOUT_ASSERT_FIFO_LOCKED;
p_buffer = p_fifo->p_first;
while ( p_buffer != NULL )
*****************************************************************************/
mtime_t aout_DateIncrement( audio_date_t * p_date, uint32_t i_nb_samples )
{
- mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000;
+ mtime_t i_dividend = INT64_C(1000000) * i_nb_samples;
+ assert( p_date->i_divider > 0 ); /* 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 )
bool b_chan_reorder = false;
int i, j, k, l;
- if( i_channels > AOUT_CHAN_MAX ) return false;
+ if( i_channels > AOUT_CHAN_MAX )
+ return false;
+
+ if( pi_chan_order_in == NULL )
+ pi_chan_order_in = pi_vlc_chan_order_wg4;
+ if( pi_chan_order_out == NULL )
+ pi_chan_order_out = pi_vlc_chan_order_wg4;
for( i = 0, j = 0; pi_chan_order_in[i]; i++ )
{
projects / vlc / blobdiff