# include "config.h"
#endif
+#include <math.h>
+
#include <assert.h>
#include <vlc_common.h>
#include <vlc_aout.h>
{
aout_owner_t *owner = aout_owner (p_aout);
- vlc_assert_locked( &p_aout->lock );
+ aout_assert_locked( p_aout );
p_aout->format = *p_format;
/* Retrieve user defaults. */
aout_FormatPrepare( &p_aout->format );
aout_FormatPrint( p_aout, "output", &p_aout->format );
- /* Prepare FIFO. */
- aout_FifoInit (p_aout, &p_aout->fifo, p_aout->format.i_rate);
- aout_FifoInit (p_aout, &owner->partial, p_aout->format.i_rate);
- owner->pause_date = VLC_TS_INVALID;
- owner->b_starving = true;
-
/* Choose the mixer format. */
owner->mixer_format = p_aout->format;
if (AOUT_FMT_NON_LINEAR(&p_aout->format))
{
aout_owner_t *owner = aout_owner (p_aout);
- vlc_assert_locked( &p_aout->lock );
+ aout_assert_locked( p_aout );
if (owner->module == NULL)
return;
aout_VolumeNoneInit( p_aout ); /* clear volume callback */
owner->module = NULL;
aout_FiltersDestroyPipeline (owner->filters, owner->nb_filters);
- aout_FifoDestroy (&p_aout->fifo);
- aout_FifoDestroy (&owner->partial);
}
-static block_t *aout_OutputSlice( audio_output_t *, aout_fifo_t * );
-
/*****************************************************************************
* aout_OutputPlay : play a buffer
*****************************************************************************
* This function is entered with the mixer lock.
*****************************************************************************/
-void aout_OutputPlay( audio_output_t * p_aout, aout_buffer_t * p_buffer )
+void aout_OutputPlay (audio_output_t *aout, block_t *block)
{
- aout_owner_t *owner = aout_owner (p_aout);
+ aout_owner_t *owner = aout_owner (aout);
- vlc_assert_locked( &p_aout->lock );
+ aout_assert_locked (aout);
- aout_FiltersPlay (owner->filters, owner->nb_filters, &p_buffer);
- if( !p_buffer )
+ aout_FiltersPlay (owner->filters, owner->nb_filters, &block);
+ if (block == NULL)
return;
- if( p_buffer->i_buffer == 0 )
+ if (block->i_buffer == 0)
{
- block_Release( p_buffer );
+ block_Release (block);
return;
}
- aout_FifoPush (&owner->partial, p_buffer );
-
- while ((p_buffer = aout_OutputSlice (p_aout, &owner->partial)) != NULL)
- p_aout->pf_play (p_aout, p_buffer);
+ aout->pf_play (aout, block);
}
/**
*/
void aout_OutputPause( audio_output_t *aout, bool pause, mtime_t date )
{
- vlc_assert_locked( &aout->lock );
+ aout_assert_locked( aout );
if( aout->pf_pause != NULL )
aout->pf_pause( aout, pause, date );
-
- aout_owner_t *owner = aout_owner (aout);
- if (pause)
- {
- owner->pause_date = date;
- }
- else
- {
- assert (owner->pause_date != VLC_TS_INVALID);
-
- mtime_t duration = date - owner->pause_date;
-
- owner->pause_date = VLC_TS_INVALID;
- aout_FifoMoveDates (&owner->partial, duration);
- aout_FifoMoveDates (&aout->fifo, duration);
- }
}
/**
*/
void aout_OutputFlush( audio_output_t *aout, bool wait )
{
- vlc_assert_locked( &aout->lock );
+ aout_assert_locked( aout );
if( aout->pf_flush != NULL )
aout->pf_flush( aout, wait );
-
- aout_owner_t *owner = aout_owner (aout);
- aout_FifoReset (&aout->fifo);
- aout_FifoReset (&owner->partial);
}
{
/* aout_New() -safely- calls this function without the lock, before any
* other thread knows of this audio output instance.
- vlc_assert_locked (&aout->lock); */
+ aout_assert_locked (aout); */
aout->pf_volume_set = aout_VolumeNoneSet;
+ var_Destroy (aout, "volume");
+ var_Destroy (aout, "mute");
}
/**
{
aout_owner_t *owner = aout_owner (aout);
- vlc_assert_locked (&aout->lock);
+ aout_assert_locked (aout);
/* Cubic mapping from software volume to amplification factor.
* This provides a good tradeoff between low and high volume ranges.
audio_volume_t volume = var_InheritInteger (aout, "volume");
bool mute = var_InheritBool (aout, "mute");
- vlc_assert_locked (&aout->lock);
+ aout_assert_locked (aout);
aout->pf_volume_set = aout_VolumeSoftSet;
aout_VolumeSoftSet (aout, volume / (float)AOUT_VOLUME_DEFAULT, mute);
}
*/
void aout_VolumeHardInit (audio_output_t *aout, aout_volume_cb setter)
{
- vlc_assert_locked (&aout->lock);
+ aout_assert_locked (aout);
aout->pf_volume_set = setter;
+ var_Create (aout, "volume", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
+ var_Create (aout, "mute", VLC_VAR_BOOL|VLC_VAR_DOINHERIT);
}
/**
* @param setter volume setter callback
* @param volume current custom volume
* @param mute current mute flag
- * @note Audio output plugins that cannot apply the volume
- * should call this function during activation.
+ *
+ * @warning The caller (i.e. the audio output plug-in) is responsible for
+ * interlocking and synchronizing call to this function and to the
+ * audio_output_t.pf_volume_set callback. This ensures that VLC gets correct
+ * volume information (possibly with a latency).
*/
void aout_VolumeHardSet (audio_output_t *aout, float volume, bool mute)
{
-#warning FIXME
- /* REVISIT: This is tricky. We cannot acquire the volume lock as this gets
- * called from the audio output (it would cause a lock inversion).
- * We also should not override the input manager volume, but only the
- * volume of the current audio output... FIXME */
- msg_Err (aout, "%s(%f, %u)", __func__, volume, (unsigned)mute);
+ audio_volume_t vol = lroundf (volume * (float)AOUT_VOLUME_DEFAULT);
+
+ /* We cannot acquire the volume lock as this gets called from the audio
+ * output plug-in (it would cause a lock inversion). */
+ var_SetInteger (aout, "volume", vol);
+ var_SetBool (aout, "mute", mute);
+ var_TriggerCallback (aout, "intf-change");
}
-/*** Buffer management ***/
+/*** Packet-oriented audio output support ***/
+
+static inline aout_packet_t *aout_packet (audio_output_t *aout)
+{
+ return (aout_packet_t *)(aout->sys);
+}
+
+void aout_PacketInit (audio_output_t *aout, aout_packet_t *p, unsigned samples)
+{
+ assert (p == aout_packet (aout));
+
+ vlc_mutex_init (&p->lock);
+ aout_FifoInit (aout, &p->partial, aout->format.i_rate);
+ aout_FifoInit (aout, &p->fifo, aout->format.i_rate);
+ p->pause_date = VLC_TS_INVALID;
+ p->samples = samples;
+ p->starving = true;
+}
+
+void aout_PacketDestroy (audio_output_t *aout)
+{
+ aout_packet_t *p = aout_packet (aout);
+
+ aout_FifoDestroy (&p->partial);
+ aout_FifoDestroy (&p->fifo);
+ vlc_mutex_destroy (&p->lock);
+}
+
+static block_t *aout_OutputSlice (audio_output_t *);
+
+void aout_PacketPlay (audio_output_t *aout, block_t *block)
+{
+ aout_packet_t *p = aout_packet (aout);
+
+ vlc_mutex_lock (&p->lock);
+ aout_FifoPush (&p->partial, block);
+ while ((block = aout_OutputSlice (aout)) != NULL)
+ aout_FifoPush (&p->fifo, block);
+ vlc_mutex_unlock (&p->lock);
+}
+
+void aout_PacketPause (audio_output_t *aout, bool pause, mtime_t date)
+{
+ aout_packet_t *p = aout_packet (aout);
+
+ if (pause)
+ {
+ assert (p->pause_date == VLC_TS_INVALID);
+ p->pause_date = date;
+ }
+ else
+ {
+ assert (p->pause_date != VLC_TS_INVALID);
+
+ mtime_t duration = date - p->pause_date;
+
+ p->pause_date = VLC_TS_INVALID;
+ vlc_mutex_lock (&p->lock);
+ aout_FifoMoveDates (&p->partial, duration);
+ aout_FifoMoveDates (&p->fifo, duration);
+ vlc_mutex_unlock (&p->lock);
+ }
+}
+
+void aout_PacketFlush (audio_output_t *aout, bool drain)
+{
+ aout_packet_t *p = aout_packet (aout);
+
+ vlc_mutex_lock (&p->lock);
+ aout_FifoReset (&p->partial);
+ aout_FifoReset (&p->fifo);
+ vlc_mutex_unlock (&p->lock);
+
+ (void) drain; /* TODO */
+}
+
/**
* Rearranges audio blocks in correct number of samples.
* @note (FIXME) This is left here for historical reasons. It belongs in the
* output code. Besides, this operation should be avoided if possible.
*/
-static block_t *aout_OutputSlice (audio_output_t *p_aout, aout_fifo_t *p_fifo)
+static block_t *aout_OutputSlice (audio_output_t *p_aout)
{
- const unsigned samples = p_aout->i_nb_samples;
- /* FIXME: Remove this silly constraint. Just pass buffers as they come to
- * "smart" audio outputs. */
+ aout_packet_t *p = aout_packet (p_aout);
+ aout_fifo_t *p_fifo = &p->partial;
+ const unsigned samples = p->samples;
assert( samples > 0 );
- vlc_assert_locked( &p_aout->lock );
+ vlc_assert_locked( &p->lock );
/* Retrieve the date of the next buffer. */
- date_t exact_start_date = p_aout->fifo.end_date;
+ date_t exact_start_date = p->fifo.end_date;
mtime_t start_date = date_Get( &exact_start_date );
/* See if we have enough data to prepare a new buffer for the audio output. */
if( delta < 0 )
{
/* Is it really the best way to do it ? */
- aout_FifoReset( &p_aout->fifo );
+ aout_FifoReset (&p->fifo);
return NULL;
}
if( delta > 0 )
mtime_t start_date,
bool b_can_sleek )
{
- aout_owner_t *owner = aout_owner (p_aout);
- aout_fifo_t *p_fifo = &p_aout->fifo;
- aout_buffer_t * p_buffer;
+ aout_packet_t *p = aout_packet (p_aout);
+ aout_fifo_t *p_fifo = &p->fifo;
+ aout_buffer_t *p_buffer = NULL;
mtime_t now = mdate();
- aout_lock( p_aout );
+ vlc_mutex_lock( &p->lock );
+ if( p->pause_date != VLC_TS_INVALID )
+ goto out;
/* Drop the audio sample if the audio output is really late.
* In the case of b_can_sleek, we don't use a resampler so we need to be
* to deal with this kind of starvation. */
/* Set date to 0, to allow the mixer to send a new buffer ASAP */
- aout_FifoReset( &p_aout->fifo );
- if ( !p_aout->b_starving )
+ aout_FifoReset( &p->fifo );
+ if ( !p->starving )
msg_Dbg( p_aout,
"audio output is starving (no input), playing silence" );
- p_aout->b_starving = true;
+ p_aout->starving = true;
#endif
goto out;
}
*/
if ( 0 > delta + p_buffer->i_length )
{
- if (!owner->b_starving)
+ if (!p->starving)
msg_Dbg( p_aout, "audio output is starving (%"PRId64"), "
"playing silence", -delta );
- owner->b_starving = true;
+ p->starving = true;
p_buffer = NULL;
goto out;
}
- owner->b_starving = false;
+ p->starving = false;
p_buffer = aout_FifoPop( p_fifo );
if( !b_can_sleek
msg_Warn( p_aout, "output date isn't PTS date, requesting "
"resampling (%"PRId64")", delta );
- aout_FifoMoveDates (&owner->partial, delta);
+ aout_FifoMoveDates (&p->partial, delta);
aout_FifoMoveDates (p_fifo, delta);
+#warning FIXME: feed back to input for resampling!!!
}
out:
- aout_unlock( p_aout );
+ vlc_mutex_unlock( &p->lock );
return p_buffer;
}
projects / vlc / blobdiff