# include "config.h"
#endif
+#include <math.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_cpu.h>
#include <pulse/pulseaudio.h>
-#include <vlc_pulse.h>
+#include "vlcpulse.h"
#if !PA_CHECK_VERSION(0,9,22)
# include <vlc_xlib.h>
#endif
set_callbacks( Open, Close )
vlc_module_end ()
-/* TODO:
- * - pause input on policy event
- * - resample to compensate for long term drift
- * - select music or video stream property correctly (?)
- * - set further appropriate stream properties
- * - update output devices list dynamically
- */
-
/* NOTE:
* Be careful what you do when the PulseAudio mainloop is held, which is to say
- * within PulseAudio callbacks, or after vlc_pa_lock().
+ * within PulseAudio callbacks, or after pa_threaded_mainloop_lock().
* In particular, a VLC variable callback cannot be triggered nor deleted with
* the PulseAudio mainloop lock held, if the callback acquires the lock. */
{
pa_stream *stream; /**< PulseAudio playback stream object */
pa_context *context; /**< PulseAudio connection context */
+ pa_threaded_mainloop *mainloop; /**< PulseAudio thread */
+ pa_time_event *trigger; /**< Deferred stream trigger */
pa_volume_t base_volume; /**< 0dB reference volume */
pa_cvolume cvolume; /**< actual sink input volume */
mtime_t paused; /**< Time when (last) paused */
unsigned rate; /**< Current stream sample rate */
};
+static void sink_list_cb(pa_context *, const pa_sink_info *, int, void *);
static void sink_input_info_cb(pa_context *, const pa_sink_input_info *,
int, void *);
switch (type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK)
{
+ case PA_SUBSCRIPTION_EVENT_SINK:
+ switch (type & PA_SUBSCRIPTION_EVENT_TYPE_MASK)
+ {
+ case PA_SUBSCRIPTION_EVENT_NEW:
+ case PA_SUBSCRIPTION_EVENT_CHANGE:
+ op = pa_context_get_sink_info_by_index(ctx, idx, sink_list_cb, aout);
+ if (likely(op != NULL))
+ pa_operation_unref(op);
+ break;
+
+ case PA_SUBSCRIPTION_EVENT_REMOVE:
+ var_Change(aout, "audio-device", VLC_VAR_DELCHOICE,
+ &(vlc_value_t){ .i_int = idx }, NULL);
+ break;
+ }
+ break;
+
case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
if (idx != pa_stream_get_index(sys->stream))
break; /* only interested in our sink input */
i->description);
val.i_int = i->index;
text.psz_string = (char *)i->description;
+ /* FIXME: There is no way to replace a choice explicitly. */
+ var_Change(aout, "audio-device", VLC_VAR_DELCHOICE, &val, NULL);
var_Change(aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text);
+ /* FIXME: var_Change() can change the variable value if we remove the
+ * current value from the choice list, or if we add a choice while there
+ * was none. So force the correct value back. */
+ val.i_int = pa_stream_get_device_index(aout->sys->stream);
+ var_Change(aout, "audio-device", VLC_VAR_SETVALUE, &val, NULL);
}
static void sink_info_cb(pa_context *c, const pa_sink_info *i, int eol,
/*** Latency management and lip synchronization ***/
-static mtime_t vlc_pa_get_latency(audio_output_t *aout,
- pa_context *ctx, pa_stream *s)
-{
- pa_usec_t latency;
- int negative;
-
- if (pa_stream_get_latency(s, &latency, &negative)) {
- vlc_pa_error(aout, "unknown latency", ctx);
- return VLC_TS_INVALID;
- }
- return negative ? -latency : +latency;
-}
-
static void stream_reset_sync(pa_stream *s, audio_output_t *aout)
{
aout_sys_t *sys = aout->sys;
sys->rate = rate;
}
+static void stream_start(pa_stream *s, audio_output_t *aout)
+{
+ aout_sys_t *sys = aout->sys;
+ pa_operation *op;
+
+ assert (sys->trigger == NULL);
+
+ op = pa_stream_cork(s, 0, NULL, NULL);
+ if (op != NULL)
+ pa_operation_unref(op);
+ op = pa_stream_trigger(s, NULL, NULL);
+ if (likely(op != NULL))
+ pa_operation_unref(op);
+}
+
+static void stream_stop(pa_stream *s, audio_output_t *aout)
+{
+ aout_sys_t *sys = aout->sys;
+ pa_operation *op;
+
+ if (sys->trigger != NULL) {
+ vlc_pa_rttime_free(sys->mainloop, sys->trigger);
+ sys->trigger = NULL;
+ }
+
+ op = pa_stream_cork(s, 1, NULL, NULL);
+ if (op != NULL)
+ pa_operation_unref(op);
+}
+
+static void stream_trigger_cb(pa_mainloop_api *api, pa_time_event *e,
+ const struct timeval *tv, void *userdata)
+{
+ audio_output_t *aout = userdata;
+ aout_sys_t *sys = aout->sys;
+
+ assert (sys->trigger == e);
+
+ msg_Dbg(aout, "starting deferred");
+ vlc_pa_rttime_free(sys->mainloop, sys->trigger);
+ sys->trigger = NULL;
+ stream_start(sys->stream, aout);
+ (void) api; (void) e; (void) tv;
+}
+
/**
* Starts or resumes the playback stream.
* Tries start playing back audio samples at the most accurate time
static void stream_resync(audio_output_t *aout, pa_stream *s)
{
aout_sys_t *sys = aout->sys;
- pa_operation *op;
mtime_t delta;
- assert (pa_stream_is_corked(s) > 0);
assert (sys->pts != VLC_TS_INVALID);
+ if (sys->trigger != NULL) {
+ vlc_pa_rttime_free(sys->mainloop, sys->trigger);
+ sys->trigger = NULL;
+ }
+
delta = vlc_pa_get_latency(aout, sys->context, s);
- if (unlikely(delta == VLC_TS_INVALID))
+ if (unlikely(delta == VLC_TS_INVALID)) {
+ msg_Dbg(aout, "cannot synchronize start");
delta = 0; /* screwed */
+ }
delta = (sys->pts - mdate()) - delta;
-
- /* TODO: adjust prebuf instead of padding? */
if (delta > 0) {
- size_t nb = (delta * sys->rate) / CLOCK_FREQ;
- size_t size = aout->format.i_bytes_per_frame;
- float *zeroes = calloc (nb, size);
-
- msg_Dbg(aout, "starting with %zu zeroes (%"PRId64" us)", nb,
- delta);
-#if 0 /* Fault injector: add delay */
- pa_stream_write(s, zeroes, nb * size, NULL, 0, PA_SEEK_RELATIVE);
- pa_stream_write(s, zeroes, nb * size, NULL, 0, PA_SEEK_RELATIVE);
-#endif
- if (likely(zeroes != NULL))
- if (pa_stream_write(s, zeroes, nb * size, free, 0,
- PA_SEEK_RELATIVE) < 0)
- free(zeroes);
- } else
+ msg_Dbg(aout, "deferring start (%"PRId64" us)", delta);
+ delta += pa_rtclock_now();
+ sys->trigger = pa_context_rttime_new(sys->context, delta,
+ stream_trigger_cb, aout);
+ } else {
msg_Warn(aout, "starting late (%"PRId64" us)", delta);
-
- op = pa_stream_cork(s, 0, NULL, NULL);
- if (op != NULL)
- pa_operation_unref(op);
- op = pa_stream_trigger(s, NULL, NULL);
- if (op != NULL)
- pa_operation_unref(op);
+ stream_start(s, aout);
+ }
}
static void stream_latency_cb(pa_stream *s, void *userdata)
aout_sys_t *sys = aout->sys;
mtime_t delta, change;
- if (pa_stream_is_corked(s))
- return;
- if (sys->pts == VLC_TS_INVALID)
- {
+ if (sys->paused != VLC_TS_INVALID)
+ return; /* nothing to do while paused */
+ if (sys->pts == VLC_TS_INVALID) {
msg_Dbg(aout, "missing latency from input");
return;
}
+ if (pa_stream_is_corked(s) > 0) {
+ stream_resync(aout, s);
+ return;
+ }
/* Compute lip desynchronization */
delta = vlc_pa_get_latency(aout, sys->context, s);
sync = true;
/* Compute playback sample rate */
- /* This is empirical. Feel free to define something smarter. */
+ /* This is empirical (especially the shift values).
+ * Feel free to define something smarter. */
int adj = sync ? (outrate - inrate)
- : outrate * (delta + change) / (CLOCK_FREQ << 4);
+ : outrate * ((delta >> 4) + change) / (CLOCK_FREQ << 2);
/* This avoids too quick rate variation. It sounds really bad and
* causes unstability (e.g. oscillation around the correct rate). */
int limit = inrate >> 10;
/*** Stream helpers ***/
static void stream_state_cb(pa_stream *s, void *userdata)
{
+ pa_threaded_mainloop *mainloop = userdata;
+
switch (pa_stream_get_state(s)) {
case PA_STREAM_READY:
case PA_STREAM_FAILED:
case PA_STREAM_TERMINATED:
- vlc_pa_signal(0);
+ pa_threaded_mainloop_signal(mainloop, 0);
default:
break;
}
- (void) userdata;
+}
+
+static void stream_event_cb(pa_stream *s, const char *name, pa_proplist *pl,
+ void *userdata)
+{
+ audio_output_t *aout = userdata;
+
+ if (!strcmp(name, PA_STREAM_EVENT_REQUEST_CORK))
+ aout_PolicyReport(aout, true);
+ else
+ if (!strcmp(name, PA_STREAM_EVENT_REQUEST_UNCORK))
+ aout_PolicyReport(aout, false);
+ else
+#if PA_CHECK_VERSION(1,0,0)
+ /* FIXME: expose aout_Restart() directly */
+ if (!strcmp(name, PA_STREAM_EVENT_FORMAT_LOST)) {
+ vlc_value_t dummy = { .i_int = 0 };
+
+ msg_Dbg (aout, "format lost");
+ aout_ChannelsRestart (VLC_OBJECT(aout), "audio-device",
+ dummy, dummy, NULL);
+ } else
+#endif
+ msg_Warn (aout, "unhandled stream event \"%s\"", name);
+ (void) s;
+ (void) pl;
}
static void stream_moved_cb(pa_stream *s, void *userdata)
/* Update the variable if someone else moved our stream */
var_Change(aout, "audio-device", VLC_VAR_SETVALUE,
&(vlc_value_t){ .i_int = idx }, NULL);
+
+ /* Sink unknown as yet, create stub choice for it */
+ if (var_GetInteger(aout, "audio-device") != idx)
+ {
+ var_Change(aout, "audio-device", VLC_VAR_ADDCHOICE,
+ &(vlc_value_t){ .i_int = idx },
+ &(vlc_value_t){ .psz_string = (char *)"?" });
+ var_Change(aout, "audio-device", VLC_VAR_SETVALUE,
+ &(vlc_value_t){ .i_int = idx }, NULL);
+ }
}
static void stream_overflow_cb(pa_stream *s, void *userdata)
{
audio_output_t *aout = userdata;
+ pa_operation *op;
- msg_Err(aout, "overflow");
- (void) s;
+ msg_Err(aout, "overflow, flushing");
+ op = pa_stream_flush(s, NULL, NULL);
+ if (likely(op != NULL))
+ pa_operation_unref(op);
+ stream_reset_sync(s, aout);
}
static void stream_started_cb(pa_stream *s, void *userdata)
static void stream_underflow_cb(pa_stream *s, void *userdata)
{
audio_output_t *aout = userdata;
- pa_operation *op;
msg_Warn(aout, "underflow");
- op = pa_stream_cork(s, 1, NULL, NULL);
- if (op != NULL)
- pa_operation_unref(op);
+ stream_stop(s, aout);
stream_reset_sync(s, aout);
}
-static int stream_wait(pa_stream *stream)
+static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop)
{
pa_stream_state_t state;
while ((state = pa_stream_get_state(stream)) != PA_STREAM_READY) {
if (state == PA_STREAM_FAILED || state == PA_STREAM_TERMINATED)
return -1;
- vlc_pa_wait();
+ pa_threaded_mainloop_wait(mainloop);
}
return 0;
}
-#ifdef LIBPULSE_GETS_A_CLUE
-static void stream_success_cb(pa_stream *s, int success, void *userdata)
-{
- vlc_pa_signal(0);
- (void) s; (void) success; (void) userdata;
-}
-#else
-# define stream_success_cb NULL
-#endif
-
/*** Sink input ***/
static void sink_input_info_cb(pa_context *ctx, const pa_sink_input_info *i,
{
audio_output_t *aout = userdata;
aout_sys_t *sys = aout->sys;
- float volume;
if (eol)
return;
(void) ctx;
- sys->cvolume = i->volume;
- volume = pa_cvolume_max(&i->volume) / (float)PA_VOLUME_NORM;
- aout_VolumeHardSet(aout, volume, i->mute);
+ sys->cvolume = i->volume; /* cache volume for balance preservation */
+
+ pa_volume_t volume = pa_cvolume_max(&i->volume);
+ volume = pa_sw_volume_divide(volume, sys->base_volume);
+ aout_VolumeReport(aout, (float)volume / PA_VOLUME_NORM);
+ aout_MuteReport(aout, i->mute);
}
}
/**
- * Queue one audio frame to the playabck stream
+ * Queue one audio frame to the playback stream
*/
-static void Play(audio_output_t *aout, block_t *block)
+static void Play(audio_output_t *aout, block_t *block, mtime_t *restrict drift)
{
aout_sys_t *sys = aout->sys;
pa_stream *s = sys->stream;
+ assert (sys->paused == VLC_TS_INVALID);
+
const void *ptr = data_convert(&block);
if (unlikely(ptr == NULL))
return;
* output FIFO lock while the PulseAudio threaded main loop lock is held
* (including from PulseAudio stream callbacks). Otherwise lock inversion
* will take place, and sooner or later a deadlock. */
- vlc_pa_lock();
+ pa_threaded_mainloop_lock(sys->mainloop);
sys->pts = pts;
if (pa_stream_is_corked(s) > 0)
block_Release(block);
}
- vlc_pa_unlock();
+ pa_threaded_mainloop_unlock(sys->mainloop);
+ (void) drift;
}
/**
{
aout_sys_t *sys = aout->sys;
pa_stream *s = sys->stream;
- pa_operation *op;
- vlc_pa_lock();
+ pa_threaded_mainloop_lock(sys->mainloop);
if (paused) {
sys->paused = date;
- op = pa_stream_cork(s, paused, NULL, NULL);
- if (op != NULL)
- pa_operation_unref(op);
+ stream_stop(s, aout);
} else {
assert (sys->paused != VLC_TS_INVALID);
date -= sys->paused;
stream_resync(aout, s);
}
- vlc_pa_unlock();
+ pa_threaded_mainloop_unlock(sys->mainloop);
}
/**
pa_stream *s = sys->stream;
pa_operation *op;
- vlc_pa_lock();
+ pa_threaded_mainloop_lock(sys->mainloop);
if (wait)
op = pa_stream_drain(s, NULL, NULL);
op = pa_stream_flush(s, NULL, NULL);
if (op != NULL)
pa_operation_unref(op);
- vlc_pa_unlock();
+ pa_threaded_mainloop_unlock(sys->mainloop);
}
-static int VolumeSet(audio_output_t *aout, float vol, bool mute)
+static int VolumeSet(audio_output_t *aout, float vol)
{
aout_sys_t *sys = aout->sys;
pa_operation *op;
uint32_t idx = pa_stream_get_index(sys->stream);
- pa_cvolume cvolume = sys->cvolume;
- pa_volume_t volume = sys->base_volume;
-
- pa_cvolume_scale(&cvolume, PA_VOLUME_NORM); /* preserve balance */
-
/* VLC provides the software volume so convert directly to PulseAudio
* software volume, pa_volume_t. This is not a linear amplification factor
* so do not use PulseAudio linear amplification! */
vol *= PA_VOLUME_NORM;
if (unlikely(vol >= PA_VOLUME_MAX))
vol = PA_VOLUME_MAX;
- volume = pa_sw_volume_multiply(volume, lround(vol));
+ pa_volume_t volume = pa_sw_volume_multiply(lround(vol), sys->base_volume);
+
+ /* Preserve the balance (VLC does not support it). */
+ pa_cvolume cvolume = sys->cvolume;
+ pa_cvolume_scale(&cvolume, PA_VOLUME_NORM);
pa_sw_cvolume_multiply_scalar(&cvolume, &cvolume, volume);
assert(pa_cvolume_valid(&cvolume));
- vlc_pa_lock();
+ pa_threaded_mainloop_lock(sys->mainloop);
op = pa_context_set_sink_input_volume(sys->context, idx, &cvolume, NULL, NULL);
if (likely(op != NULL))
pa_operation_unref(op);
+ pa_threaded_mainloop_unlock(sys->mainloop);
+
+ return 0;
+}
+
+static int MuteSet(audio_output_t *aout, bool mute)
+{
+ aout_sys_t *sys = aout->sys;
+ pa_operation *op;
+ uint32_t idx = pa_stream_get_index(sys->stream);
+
+ pa_threaded_mainloop_lock(sys->mainloop);
op = pa_context_set_sink_input_mute(sys->context, idx, mute, NULL, NULL);
if (likely(op != NULL))
pa_operation_unref(op);
- vlc_pa_unlock();
+ pa_threaded_mainloop_unlock(sys->mainloop);
return 0;
}
(void) varname; (void) old;
- vlc_pa_lock();
+ pa_threaded_mainloop_lock(sys->mainloop);
op = pa_context_move_sink_input_by_index(sys->context, idx, sink_idx,
NULL, NULL);
if (likely(op != NULL)) {
msg_Dbg(aout, "moving to sink %"PRIu32, sink_idx);
} else
vlc_pa_error(obj, "cannot move sink", sys->context);
- vlc_pa_unlock();
+ pa_threaded_mainloop_unlock(sys->mainloop);
return (op != NULL) ? VLC_SUCCESS : VLC_EGENERIC;
}
/* Sample format specification */
struct pa_sample_spec ss;
vlc_fourcc_t format = aout->format.i_format;
+#if PA_CHECK_VERSION(1,0,0)
+ pa_encoding_t encoding = PA_ENCODING_INVALID;
+#endif
switch(format)
{
case VLC_CODEC_F32L:
ss.format = PA_SAMPLE_FLOAT32LE;
break;
- case VLC_CODEC_FI32:
- format = VLC_CODEC_FL32;
- ss.format = PA_SAMPLE_FLOAT32NE;
- break;
case VLC_CODEC_S32B:
ss.format = PA_SAMPLE_S32BE;
break;
case VLC_CODEC_U8:
ss.format = PA_SAMPLE_U8;
break;
+#if PA_CHECK_VERSION(1,0,0)
+ case VLC_CODEC_A52:
+ format = VLC_CODEC_SPDIFL;
+ encoding = PA_ENCODING_AC3_IEC61937;
+ ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+ break;
+ /*case VLC_CODEC_EAC3:
+ format = VLC_CODEC_SPDIFL FIXME;
+ encoding = PA_ENCODING_EAC3_IEC61937;
+ ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+ break;
+ case VLC_CODEC_MPGA:
+ format = VLC_CODEC_SPDIFL FIXME;
+ encoding = PA_ENCODING_MPEG_IEC61937;
+ ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+ break;*/
+ case VLC_CODEC_DTS:
+ format = VLC_CODEC_SPDIFL;
+ encoding = PA_ENCODING_DTS_IEC61937;
+ ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+ break;
+#endif
default:
if (HAVE_FPU)
{
/* Stream parameters */
const pa_stream_flags_t flags = PA_STREAM_START_CORKED
//| PA_STREAM_INTERPOLATE_TIMING
+ | PA_STREAM_NOT_MONOTONIC
| PA_STREAM_AUTO_TIMING_UPDATE
| PA_STREAM_VARIABLE_RATE;
if (unlikely(sys == NULL))
return VLC_ENOMEM;
- pa_context *ctx = vlc_pa_connect (obj);
+ pa_context *ctx = vlc_pa_connect(obj, &sys->mainloop);
if (ctx == NULL)
{
free (sys);
aout->sys = sys;
sys->stream = NULL;
sys->context = ctx;
+ sys->trigger = NULL;
sys->paused = VLC_TS_INVALID;
sys->pts = VLC_TS_INVALID;
sys->desync = 0;
sys->rate = ss.rate;
- /* Context events */
- const pa_subscription_mask_t mask = PA_SUBSCRIPTION_MASK_SINK_INPUT;
-
- pa_context_set_subscribe_callback(ctx, context_cb, aout);
- op = pa_context_subscribe(ctx, mask, NULL, NULL);
- if (likely(op != NULL))
- pa_operation_unref(op);
-
/* Channel volume */
sys->base_volume = PA_VOLUME_NORM;
pa_cvolume_set(&sys->cvolume, ss.channels, PA_VOLUME_NORM);
- vlc_pa_lock();
+#if PA_CHECK_VERSION(1,0,0)
+ pa_format_info *formatv[2];
+ unsigned formatc = 0;
+
+ /* Favor digital pass-through if available*/
+ if (encoding != PA_ENCODING_INVALID) {
+ formatv[formatc] = pa_format_info_new();
+ formatv[formatc]->encoding = encoding;
+ pa_format_info_set_rate(formatv[formatc], ss.rate);
+ pa_format_info_set_channels(formatv[formatc], ss.channels);
+ pa_format_info_set_channel_map(formatv[formatc], &map);
+ formatc++;
+ }
+
+ /* Fallback to PCM */
+ formatv[formatc] = pa_format_info_new();
+ formatv[formatc]->encoding = PA_ENCODING_PCM;
+ pa_format_info_set_sample_format(formatv[formatc], ss.format);
+ pa_format_info_set_rate(formatv[formatc], ss.rate);
+ pa_format_info_set_channels(formatv[formatc], ss.channels);
+ pa_format_info_set_channel_map(formatv[formatc], &map);
+ formatc++;
+
/* Create a playback stream */
+ pa_stream *s;
+ pa_proplist *props = pa_proplist_new();
+ if (likely(props != NULL))
+ /* TODO: set other stream properties */
+ pa_proplist_sets (props, PA_PROP_MEDIA_ROLE, "video");
+
+ pa_threaded_mainloop_lock(sys->mainloop);
+ s = pa_stream_new_extended(ctx, "audio stream", formatv, formatc, props);
+ if (likely(props != NULL))
+ pa_proplist_free(props);
+
+ for (unsigned i = 0; i < formatc; i++)
+ pa_format_info_free(formatv[i]);
+#else
+ pa_threaded_mainloop_lock(sys->mainloop);
pa_stream *s = pa_stream_new(ctx, "audio stream", &ss, &map);
+#endif
if (s == NULL) {
vlc_pa_error(obj, "stream creation failure", ctx);
goto fail;
}
sys->stream = s;
- pa_stream_set_state_callback(s, stream_state_cb, NULL);
+ pa_stream_set_state_callback(s, stream_state_cb, sys->mainloop);
+ pa_stream_set_event_callback(s, stream_event_cb, aout);
pa_stream_set_latency_update_callback(s, stream_latency_cb, aout);
pa_stream_set_moved_callback(s, stream_moved_cb, aout);
pa_stream_set_overflow_callback(s, stream_overflow_cb, aout);
pa_stream_set_underflow_callback(s, stream_underflow_cb, aout);
if (pa_stream_connect_playback(s, NULL, &attr, flags, NULL, NULL) < 0
- || stream_wait(s)) {
+ || stream_wait(s, sys->mainloop)) {
vlc_pa_error(obj, "stream connection failure", ctx);
goto fail;
}
+#if PA_CHECK_VERSION(1,0,0)
+ if (encoding != PA_ENCODING_INVALID) {
+ const pa_format_info *info = pa_stream_get_format_info(s);
+
+ assert (info != NULL);
+ if (pa_format_info_is_pcm (info)) {
+ msg_Dbg(aout, "digital pass-through not available");
+ format = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N;
+ } else {
+ msg_Dbg(aout, "digital pass-through enabled");
+ pa_stream_set_latency_update_callback(s, NULL, NULL);
+ }
+ }
+#endif
+
const struct pa_buffer_attr *pba = pa_stream_get_buffer_attr(s);
msg_Dbg(aout, "using buffer metrics: maxlength=%u, tlength=%u, "
"prebuf=%u, minreq=%u",
if (op != NULL)
pa_operation_unref(op);
stream_moved_cb(s, aout);
- vlc_pa_unlock();
+
+ /* Context events */
+ const pa_subscription_mask_t mask = PA_SUBSCRIPTION_MASK_SINK
+ | PA_SUBSCRIPTION_MASK_SINK_INPUT;
+ pa_context_set_subscribe_callback(ctx, context_cb, aout);
+ op = pa_context_subscribe(ctx, mask, NULL, NULL);
+ if (likely(op != NULL))
+ pa_operation_unref(op);
+ pa_threaded_mainloop_unlock(sys->mainloop);
aout->format.i_format = format;
aout->pf_play = Play;
aout->pf_pause = Pause;
aout->pf_flush = Flush;
- aout_VolumeHardInit (aout, VolumeSet);
+ aout->volume_set = VolumeSet;
+ aout->mute_set = MuteSet;
return VLC_SUCCESS;
fail:
- vlc_pa_unlock();
+ pa_threaded_mainloop_unlock(sys->mainloop);
Close(obj);
return VLC_EGENERIC;
}
/* The callback takes mainloop lock, so it CANNOT be held here! */
var_DelCallback (aout, "audio-device", StreamMove, s);
var_Destroy (aout, "audio-device");
- }
- vlc_pa_lock();
- if (s != NULL) {
- pa_operation *op;
+ pa_threaded_mainloop_lock(sys->mainloop);
+ if (unlikely(sys->trigger != NULL))
+ vlc_pa_rttime_free(sys->mainloop, sys->trigger);
+ pa_stream_disconnect(s);
- if (pa_stream_is_corked(s) > 0)
- /* Stream paused: discard all buffers */
- op = pa_stream_flush(s, stream_success_cb, NULL);
- else
- /* Stream playing: wait until buffers are played */
- op = pa_stream_drain(s, stream_success_cb, NULL);
- if (likely(op != NULL)) {
-#ifdef LIBPULSE_GETS_A_CLUE
- while (pa_operation_get_state(op) == PA_OPERATION_RUNNING)
- vlc_pa_wait();
-#endif
- pa_operation_unref(op);
- }
+ /* Clear all callbacks */
+ pa_stream_set_state_callback(s, NULL, NULL);
+ pa_stream_set_event_callback(s, NULL, NULL);
+ pa_stream_set_latency_update_callback(s, NULL, NULL);
+ pa_stream_set_moved_callback(s, NULL, NULL);
+ pa_stream_set_overflow_callback(s, NULL, NULL);
+ pa_stream_set_started_callback(s, NULL, NULL);
+ pa_stream_set_suspended_callback(s, NULL, NULL);
+ pa_stream_set_underflow_callback(s, NULL, NULL);
+ pa_context_set_subscribe_callback(ctx, NULL, NULL);
- pa_stream_disconnect(s);
pa_stream_unref(s);
+ pa_threaded_mainloop_unlock(sys->mainloop);
}
- vlc_pa_unlock();
- vlc_pa_disconnect(obj, ctx);
+ vlc_pa_disconnect(obj, ctx, sys->mainloop);
free(sys);
}
projects / vlc / blobdiff