* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
#ifdef HAVE_CONFIG_H
# 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 "vlcpulse.h"
+#if !PA_CHECK_VERSION(0,9,22)
+# include <vlc_xlib.h>
+#endif
-/*****************************************************************************
- * aout_sys_t: Pulseaudio output method descriptor
- *****************************************************************************
- * This structure is part of the audio output thread descriptor.
- * It describes the specific properties of an audio device.
- *****************************************************************************/
-struct aout_sys_t
-{
- struct pa_stream *stream; /**< PulseAudio playback stream object */
- struct pa_context *context; /**< PulseAudio connection context */
- struct pa_threaded_mainloop *mainloop; /**< PulseAudio event loop */
- size_t buffer_size;
- mtime_t start_date;
-};
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static void Play ( aout_instance_t * );
-
-static void context_state_cb(pa_context *c, void *userdata);
-static void stream_state_cb(pa_stream *s, void * userdata);
-static void stream_request_cb(pa_stream *s, size_t length, void *userdata);
-static void success_cb(pa_stream *s, int sucess, void *userdata);
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
vlc_module_begin ()
set_shortname( "PulseAudio" )
set_description( N_("Pulseaudio audio output") )
set_callbacks( Open, Close )
vlc_module_end ()
-/*****************************************************************************
- * Open: open the audio device
- *****************************************************************************/
-static int Open ( vlc_object_t *p_this )
+/* NOTE:
+ * Be careful what you do when the PulseAudio mainloop is held, which is to say
+ * 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. */
+
+struct aout_sys_t
+{
+ 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 */
+ mtime_t pts; /**< Play time of buffer write offset */
+ mtime_t desync; /**< Measured desynchronization */
+ 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 *);
+
+/*** Context ***/
+static void context_cb(pa_context *ctx, pa_subscription_event_type_t type,
+ uint32_t idx, void *userdata)
+{
+ audio_output_t *aout = userdata;
+ aout_sys_t *sys = aout->sys;
+ pa_operation *op;
+
+ 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 */
+
+ /* Gee... PA will not provide the infos directly in the event. */
+ switch (type & PA_SUBSCRIPTION_EVENT_TYPE_MASK)
+ {
+ case PA_SUBSCRIPTION_EVENT_REMOVE:
+ msg_Err(aout, "sink input killed!");
+ break;
+
+ default:
+ op = pa_context_get_sink_input_info(ctx, idx, sink_input_info_cb,
+ aout);
+ if (likely(op != NULL))
+ pa_operation_unref(op);
+ break;
+ }
+ break;
+
+ default: /* unsubscribed facility?! */
+ assert(0);
+ }
+}
+
+
+/*** Sink ***/
+static void sink_list_cb(pa_context *c, const pa_sink_info *i, int eol,
+ void *userdata)
+{
+ audio_output_t *aout = userdata;
+ vlc_value_t val, text;
+
+ if (eol)
+ return;
+ (void) c;
+
+ msg_Dbg(aout, "listing sink %s (%"PRIu32"): %s", i->name, i->index,
+ 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,
+ void *userdata)
+{
+ audio_output_t *aout = userdata;
+ aout_sys_t *sys = aout->sys;
+
+ if (eol)
+ return;
+ (void) c;
+
+ /* PulseAudio flat volume NORM / 100% / 0dB corresponds to no software
+ * amplification and maximum hardware amplification.
+ * VLC maps DEFAULT / 100% to no gain at all (software/hardware).
+ * Thus we need to use the sink base_volume as a multiplier,
+ * if and only if flat volume is active for our current sink. */
+ if (i->flags & PA_SINK_FLAT_VOLUME)
+ sys->base_volume = i->base_volume;
+ else
+ sys->base_volume = PA_VOLUME_NORM;
+ msg_Dbg(aout, "base volume: %"PRIu32, sys->base_volume);
+}
+
+
+/*** Latency management and lip synchronization ***/
+static void stream_reset_sync(pa_stream *s, audio_output_t *aout)
+{
+ aout_sys_t *sys = aout->sys;
+ const unsigned rate = aout->format.i_rate;
+
+ sys->pts = VLC_TS_INVALID;
+ sys->desync = 0;
+ pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL);
+ if (unlikely(op == NULL))
+ return;
+ pa_operation_unref(op);
+ 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
+ * in order to minimize desync and resampling during early playback.
+ * @note PulseAudio lock required.
+ */
+static void stream_resync(audio_output_t *aout, pa_stream *s)
+{
+ aout_sys_t *sys = aout->sys;
+ mtime_t delta;
+
+ 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)) {
+ msg_Dbg(aout, "cannot synchronize start");
+ delta = 0; /* screwed */
+ }
+
+ delta = (sys->pts - mdate()) - delta;
+ if (delta > 0) {
+ 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);
+ stream_start(s, aout);
+ }
+}
+
+static void stream_latency_cb(pa_stream *s, void *userdata)
+{
+ audio_output_t *aout = userdata;
+ aout_sys_t *sys = aout->sys;
+ mtime_t delta, change;
+
+ 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);
+ if (delta == VLC_TS_INVALID)
+ return;
+
+ delta = (sys->pts - mdate()) - delta;
+ change = delta - sys->desync;
+ sys->desync = delta;
+ //msg_Dbg(aout, "desync: %+"PRId64" us (variation: %+"PRId64" us)",
+ // delta, change);
+
+ const unsigned inrate = aout->format.i_rate;
+ unsigned outrate = sys->rate;
+ bool sync = false;
+
+ if (delta < -AOUT_MAX_PTS_DELAY)
+ msg_Warn(aout, "too late by %"PRId64" us", -delta);
+ else if (delta > +AOUT_MAX_PTS_ADVANCE)
+ msg_Warn(aout, "too early by %"PRId64" us", delta);
+ else if (outrate == inrate)
+ return; /* In sync, do not add unnecessary disturbance! */
+ else
+ sync = true;
+
+ /* Compute playback sample rate */
+ /* This is empirical (especially the shift values).
+ * Feel free to define something smarter. */
+ int adj = sync ? (outrate - inrate)
+ : 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;
+ /* However, to improve stability and try to converge, closing to the
+ * nominal rate is favored over drifting from it. */
+ if ((adj > 0) == (sys->rate > inrate))
+ limit *= 2;
+ if (adj > +limit)
+ adj = +limit;
+ if (adj < -limit)
+ adj = -limit;
+ outrate -= adj;
+
+ /* This keeps the effective rate within specified range
+ * (+/-AOUT_MAX_RESAMPLING% - see <vlc_aout.h>) of the nominal rate. */
+ limit = inrate * AOUT_MAX_RESAMPLING / 100;
+ if (outrate > inrate + limit)
+ outrate = inrate + limit;
+ if (outrate < inrate - limit)
+ outrate = inrate - limit;
+
+ /* Apply adjusted sample rate */
+ if (outrate == sys->rate)
+ return;
+ pa_operation *op = pa_stream_update_sample_rate(s, outrate, NULL, NULL);
+ if (unlikely(op == NULL)) {
+ vlc_pa_error(aout, "cannot change sample rate", sys->context);
+ return;
+ }
+ pa_operation_unref(op);
+ msg_Dbg(aout, "changed sample rate to %u Hz",outrate);
+ sys->rate = outrate;
+}
+
+
+/*** 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:
+ pa_threaded_mainloop_signal(mainloop, 0);
+ default:
+ break;
+ }
+}
+
+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)
+{
+ audio_output_t *aout = userdata;
+ aout_sys_t *sys = aout->sys;
+ pa_operation *op;
+ uint32_t idx = pa_stream_get_device_index(s);
+
+ msg_Dbg(aout, "connected to sink %"PRIu32": %s", idx,
+ pa_stream_get_device_name(s));
+ op = pa_context_get_sink_info_by_index(sys->context, idx,
+ sink_info_cb, aout);
+ if (likely(op != NULL))
+ pa_operation_unref(op);
+
+ /* 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, 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)
+{
+ audio_output_t *aout = userdata;
+
+ msg_Dbg(aout, "started");
+ (void) s;
+}
+
+static void stream_suspended_cb(pa_stream *s, void *userdata)
+{
+ audio_output_t *aout = userdata;
+
+ msg_Dbg(aout, "suspended");
+ stream_reset_sync(s, aout);
+}
+
+static void stream_underflow_cb(pa_stream *s, void *userdata)
+{
+ audio_output_t *aout = userdata;
+
+ msg_Warn(aout, "underflow");
+ stream_stop(s, aout);
+ stream_reset_sync(s, aout);
+}
+
+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;
+ pa_threaded_mainloop_wait(mainloop);
+ }
+ return 0;
+}
+
+
+/*** Sink input ***/
+static void sink_input_info_cb(pa_context *ctx, const pa_sink_input_info *i,
+ int eol, void *userdata)
+{
+ audio_output_t *aout = userdata;
+ aout_sys_t *sys = aout->sys;
+
+ if (eol)
+ return;
+ (void) ctx;
+
+ 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);
+}
+
+
+/*** VLC audio output callbacks ***/
+
+/* Memory free callback. The block_t address is in front of the data. */
+static void data_free(void *data)
+{
+ block_t **pp = data, *block;
+
+ memcpy(&block, pp - 1, sizeof (block));
+ block_Release(block);
+}
+
+static void *data_convert(block_t **pp)
+{
+ block_t *block = *pp;
+ /* In most cases, there is enough head room, and this is really cheap: */
+ block = block_Realloc(block, sizeof (block), block->i_buffer);
+ *pp = block;
+ if (unlikely(block == NULL))
+ return NULL;
+
+ memcpy(block->p_buffer, &block, sizeof (block));
+ block->p_buffer += sizeof (block);
+ block->i_buffer -= sizeof (block);
+ return block->p_buffer;
+}
+
+/**
+ * Queue one audio frame to the playback stream
+ */
+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;
+
+ size_t len = block->i_buffer;
+ mtime_t pts = block->i_pts + block->i_length;
+
+ /* Note: The core already holds the output FIFO lock at this point.
+ * Therefore we must not under any circumstances (try to) acquire the
+ * 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. */
+ pa_threaded_mainloop_lock(sys->mainloop);
+
+ sys->pts = pts;
+ if (pa_stream_is_corked(s) > 0)
+ stream_resync(aout, s);
+
+#if 0 /* Fault injector to test underrun recovery */
+ static volatile unsigned u = 0;
+ if ((++u % 1000) == 0) {
+ msg_Err(aout, "fault injection");
+ pa_operation_unref(pa_stream_flush(s, NULL, NULL));
+ }
+#endif
+
+ if (pa_stream_write(s, ptr, len, data_free, 0, PA_SEEK_RELATIVE) < 0) {
+ vlc_pa_error(aout, "cannot write", sys->context);
+ block_Release(block);
+ }
+
+ pa_threaded_mainloop_unlock(sys->mainloop);
+ (void) drift;
+}
+
+/**
+ * Cork or uncork the playback stream
+ */
+static void Pause(audio_output_t *aout, bool paused, mtime_t date)
+{
+ aout_sys_t *sys = aout->sys;
+ pa_stream *s = sys->stream;
+
+ pa_threaded_mainloop_lock(sys->mainloop);
+
+ if (paused) {
+ sys->paused = date;
+ stream_stop(s, aout);
+ } else {
+ assert (sys->paused != VLC_TS_INVALID);
+ date -= sys->paused;
+ msg_Dbg(aout, "resuming after %"PRId64" us", date);
+ sys->paused = VLC_TS_INVALID;
+ sys->pts += date;
+ stream_resync(aout, s);
+ }
+
+ pa_threaded_mainloop_unlock(sys->mainloop);
+}
+
+/**
+ * Flush or drain the playback stream
+ */
+static void Flush(audio_output_t *aout, bool wait)
+{
+ aout_sys_t *sys = aout->sys;
+ pa_stream *s = sys->stream;
+ pa_operation *op;
+
+ pa_threaded_mainloop_lock(sys->mainloop);
+
+ if (wait)
+ op = pa_stream_drain(s, NULL, NULL);
+ /* TODO: wait for drain completion*/
+ else
+ op = pa_stream_flush(s, NULL, NULL);
+ if (op != NULL)
+ pa_operation_unref(op);
+ pa_threaded_mainloop_unlock(sys->mainloop);
+}
+
+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);
+
+ /* 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;
+ 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));
+
+ 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);
+ pa_threaded_mainloop_unlock(sys->mainloop);
+
+ return 0;
+}
+
+static int StreamMove(vlc_object_t *obj, const char *varname, vlc_value_t old,
+ vlc_value_t val, void *userdata)
{
- aout_instance_t *p_aout = (aout_instance_t *)p_this;
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = aout->sys;
+ pa_stream *s = userdata;
+ pa_operation *op;
+ uint32_t idx = pa_stream_get_index(s);
+ uint32_t sink_idx = val.i_int;
+
+ (void) varname; (void) old;
+
+ 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)) {
+ pa_operation_unref(op);
+ msg_Dbg(aout, "moving to sink %"PRIu32, sink_idx);
+ } else
+ vlc_pa_error(obj, "cannot move sink", sys->context);
+ pa_threaded_mainloop_unlock(sys->mainloop);
+
+ return (op != NULL) ? VLC_SUCCESS : VLC_EGENERIC;
+}
+
+
+/**
+ * Create a PulseAudio playback stream, a.k.a. a sink input.
+ */
+static int Open(vlc_object_t *obj)
+{
+#if !PA_CHECK_VERSION(0,9,22)
+ if (!vlc_xlib_init(obj))
+ return VLC_EGENERIC;
+#endif
+
+ audio_output_t *aout = (audio_output_t *)obj;
+ pa_operation *op;
/* 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(p_aout->output.output.i_format)
+ switch(format)
{
case VLC_CODEC_F64B:
- p_aout->output.output.i_format = VLC_CODEC_F32B;
+ format = VLC_CODEC_F32B;
case VLC_CODEC_F32B:
ss.format = PA_SAMPLE_FLOAT32BE;
break;
case VLC_CODEC_F64L:
- p_aout->output.output.i_format = VLC_CODEC_F32L;
+ format = VLC_CODEC_F32L;
case VLC_CODEC_F32L:
ss.format = PA_SAMPLE_FLOAT32LE;
break;
- case VLC_CODEC_FI32:
- p_aout->output.output.i_format = VLC_CODEC_FL32;
- ss.format = PA_SAMPLE_FLOAT32NE;
- break;
case VLC_CODEC_S32B:
ss.format = PA_SAMPLE_S32BE;
break;
ss.format = PA_SAMPLE_S16LE;
break;
case VLC_CODEC_S8:
- p_aout->output.output.i_format = VLC_CODEC_U8;
+ format = VLC_CODEC_U8;
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)
{
- p_aout->output.output.i_format = VLC_CODEC_FL32;
+ format = VLC_CODEC_FL32;
ss.format = PA_SAMPLE_FLOAT32NE;
}
else
{
- p_aout->output.output.i_format = VLC_CODEC_S16N;
+ format = VLC_CODEC_S16N;
ss.format = PA_SAMPLE_S16NE;
}
break;
}
- ss.rate = p_aout->output.output.i_rate;
- ss.channels = aout_FormatNbChannels(&p_aout->output.output);
+ ss.rate = aout->format.i_rate;
+ ss.channels = aout_FormatNbChannels(&aout->format);
if (!pa_sample_spec_valid(&ss)) {
- msg_Err(p_aout, "unsupported sample specification");
+ msg_Err(aout, "unsupported sample specification");
return VLC_EGENERIC;
}
- /* Channel mapping */
+ /* Channel mapping (order defined in vlc_aout.h) */
struct pa_channel_map map;
map.channels = 0;
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_CENTER)
+ if (aout->format.i_physical_channels & AOUT_CHAN_LEFT)
+ map.map[map.channels++] = PA_CHANNEL_POSITION_FRONT_LEFT;
+ if (aout->format.i_physical_channels & AOUT_CHAN_RIGHT)
+ map.map[map.channels++] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+ if (aout->format.i_physical_channels & AOUT_CHAN_MIDDLELEFT)
+ map.map[map.channels++] = PA_CHANNEL_POSITION_SIDE_LEFT;
+ if (aout->format.i_physical_channels & AOUT_CHAN_MIDDLERIGHT)
+ map.map[map.channels++] = PA_CHANNEL_POSITION_SIDE_RIGHT;
+ if (aout->format.i_physical_channels & AOUT_CHAN_REARLEFT)
+ map.map[map.channels++] = PA_CHANNEL_POSITION_REAR_LEFT;
+ if (aout->format.i_physical_channels & AOUT_CHAN_REARRIGHT)
+ map.map[map.channels++] = PA_CHANNEL_POSITION_REAR_RIGHT;
+ if (aout->format.i_physical_channels & AOUT_CHAN_REARCENTER)
+ map.map[map.channels++] = PA_CHANNEL_POSITION_REAR_CENTER;
+ if (aout->format.i_physical_channels & AOUT_CHAN_CENTER)
{
if (ss.channels == 1)
map.map[map.channels++] = PA_CHANNEL_POSITION_MONO;
else
map.map[map.channels++] = PA_CHANNEL_POSITION_FRONT_CENTER;
}
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_LEFT)
- map.map[map.channels++] = PA_CHANNEL_POSITION_FRONT_LEFT;
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_RIGHT)
- map.map[map.channels++] = PA_CHANNEL_POSITION_FRONT_RIGHT;
-
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_REARCENTER)
- map.map[map.channels++] = PA_CHANNEL_POSITION_REAR_CENTER;
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_REARLEFT)
- map.map[map.channels++] = PA_CHANNEL_POSITION_REAR_LEFT;
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_REARRIGHT)
- map.map[map.channels++] = PA_CHANNEL_POSITION_REAR_RIGHT;
-
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_MIDDLELEFT)
- map.map[map.channels++] = PA_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER;
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_MIDDLERIGHT)
- map.map[map.channels++] = PA_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER;
-
- if (p_aout->output.output.i_physical_channels & AOUT_CHAN_LFE)
+ if (aout->format.i_physical_channels & AOUT_CHAN_LFE)
map.map[map.channels++] = PA_CHANNEL_POSITION_LFE;
for (unsigned i = 0; map.channels < ss.channels; i++) {
map.map[map.channels++] = PA_CHANNEL_POSITION_AUX0 + i;
- msg_Warn(p_aout, "mapping channel %"PRIu8" to AUX%u", map.channels, i);
+ msg_Warn(aout, "mapping channel %"PRIu8" to AUX%u", map.channels, i);
}
if (!pa_channel_map_valid(&map)) {
- msg_Err(p_aout, "unsupported channel map");
+ msg_Err(aout, "unsupported channel map");
return VLC_EGENERIC;
} else {
- const char *name = pa_channel_map_to_pretty_name(&map);
- msg_Dbg(p_aout, "using %s channel map", (name != NULL) ? name : "?");
+ const char *name = pa_channel_map_to_name(&map);
+ msg_Dbg(aout, "using %s channel map", (name != NULL) ? name : "?");
}
- const pa_stream_flags_t flags = PA_STREAM_INTERPOLATE_TIMING
+ /* 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_ADJUST_LATENCY;
+ | PA_STREAM_VARIABLE_RATE;
struct pa_buffer_attr attr;
- /* Reduce overall latency to 100mS to reduce audible clicks
- * Also minreq and internal buffers are now 100ms to reduce resampling.
- * But it still should not drop samples even with USB sound cards. */
- attr.tlength = pa_bytes_per_second(&ss)/10;
- attr.maxlength = attr.tlength * 2;
- attr.prebuf = -1;
+ attr.maxlength = -1;
+ /* PulseAudio assumes that tlength bytes are available in the buffer. Thus
+ * we need to be conservative and set the minimum value that the VLC
+ * audio decoder thread warrants. Otherwise, PulseAudio buffers will
+ * underrun on hardware with large buffers. VLC keeps at least
+ * AOUT_MIN_PREPARE and at most AOUT_MAX_PREPARE worth of audio buffers.
+ * TODO? tlength could be adaptively increased to reduce wakeups. */
+ attr.tlength = pa_usec_to_bytes(AOUT_MIN_PREPARE_TIME, &ss);
+ attr.prebuf = 0; /* trigger manually */
attr.minreq = -1;
attr.fragsize = 0; /* not used for output */
/* Allocate structures */
- struct aout_sys_t *sys = malloc(sizeof(*sys));
+ aout_sys_t *sys = malloc(sizeof(*sys));
if (unlikely(sys == NULL))
return VLC_ENOMEM;
- sys->stream = NULL;
- sys->start_date = VLC_TS_INVALID;
-
- sys->mainloop = pa_threaded_mainloop_new();
- if (unlikely(sys->mainloop == NULL)) {
- free(sys);
- return VLC_ENOMEM;
- }
-
- char *ua = var_InheritString(p_aout, "user-agent");
- sys->context = pa_context_new(
- pa_threaded_mainloop_get_api(sys->mainloop), ua);
- free(ua);
- if (unlikely(sys->context == NULL)) {
- pa_threaded_mainloop_free(sys->mainloop);
- free(sys);
- return VLC_ENOMEM;
+ pa_context *ctx = vlc_pa_connect(obj, &sys->mainloop);
+ if (ctx == NULL)
+ {
+ free (sys);
+ return VLC_EGENERIC;
}
- p_aout->output.p_sys = sys;
- pa_context_set_state_callback(sys->context, context_state_cb, sys);
- if (pa_context_connect(sys->context, NULL, 0, NULL) < 0) {
-connect_fail:
- msg_Err(p_aout, "cannot connect to server: %s",
- pa_strerror(pa_context_errno(sys->context)));
- goto fail;
+ 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;
+
+ /* Channel volume */
+ sys->base_volume = PA_VOLUME_NORM;
+ pa_cvolume_set(&sys->cvolume, ss.channels, PA_VOLUME_NORM);
+
+#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++;
}
- if (pa_threaded_mainloop_start(sys->mainloop) < 0) {
- msg_Err(p_aout, "cannot start main loop");
- goto fail;
- }
+ /* 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);
- /* Wait until the context is ready */
- while (pa_context_get_state(sys->context) != PA_CONTEXT_READY) {
- if (pa_context_get_state(sys->context) == PA_CONTEXT_FAILED)
- goto connect_fail;
- pa_threaded_mainloop_wait(sys->mainloop);
- }
+ s = pa_stream_new_extended(ctx, "audio stream", formatv, formatc, props);
+ if (likely(props != NULL))
+ pa_proplist_free(props);
- /* Create a stream */
- sys->stream = pa_stream_new(sys->context, "audio stream", &ss, &map);
- if (sys->stream == NULL) {
- msg_Err(p_aout, "cannot create stream: %s",
- pa_strerror(pa_context_errno(sys->context)));
- goto unlock_and_fail;
- }
- pa_stream_set_state_callback(sys->stream, stream_state_cb, sys);
- pa_stream_set_write_callback(sys->stream, stream_request_cb, p_aout);
- if (pa_stream_connect_playback(sys->stream, NULL, &attr,
- flags, NULL, NULL) < 0) {
-stream_fail:
- msg_Err(p_aout, "cannot connect stream: %s",
- pa_strerror(pa_context_errno(sys->context)));
- goto unlock_and_fail;
+ 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;
}
-
- while (pa_stream_get_state(sys->stream) != PA_STREAM_READY) {
- if (pa_stream_get_state(sys->stream) == PA_STREAM_FAILED)
- goto stream_fail;
- pa_threaded_mainloop_wait(sys->mainloop);
+ sys->stream = s;
+ 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_started_callback(s, stream_started_cb, aout);
+ pa_stream_set_suspended_callback(s, stream_suspended_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, sys->mainloop)) {
+ vlc_pa_error(obj, "stream connection failure", ctx);
+ goto fail;
}
- msg_Dbg(p_aout, "Connected to device %s (%u, %ssuspended).",
- pa_stream_get_device_name(sys->stream),
- pa_stream_get_device_index(sys->stream),
- pa_stream_is_suspended(sys->stream) ? "" : "not ");
+#if PA_CHECK_VERSION(1,0,0)
+ if (encoding != PA_ENCODING_INVALID) {
+ const pa_format_info *info = pa_stream_get_format_info(s);
- const struct pa_buffer_attr *pba = pa_stream_get_buffer_attr(sys->stream);
+ 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
- p_aout->output.i_nb_samples = pba->minreq / pa_frame_size(&ss);
- /* Set buffersize from pulseaudio defined minrequest */
- sys->buffer_size = pba->minreq;
- msg_Dbg(p_aout, "using buffer metrics: maxlength=%u, tlength=%u, "
+ 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",
pba->maxlength, pba->tlength, pba->prebuf, pba->minreq);
- {
- char sst[PA_SAMPLE_SPEC_SNPRINT_MAX];
- msg_Dbg(p_aout, "using sample specification: %s",
- pa_sample_spec_snprint(sst, sizeof(sst),
- pa_stream_get_sample_spec(sys->stream)));
- }
- {
- char cmt[PA_CHANNEL_MAP_SNPRINT_MAX];
- msg_Dbg(p_aout, "using channel map: %s",
- pa_channel_map_snprint(cmt, sizeof(cmt),
- pa_stream_get_channel_map(sys->stream)));
- }
+
+ var_Create(aout, "audio-device", VLC_VAR_INTEGER|VLC_VAR_HASCHOICE);
+ var_Change(aout, "audio-device", VLC_VAR_SETTEXT,
+ &(vlc_value_t){ .psz_string = (char *)_("Audio device") },
+ NULL);
+ var_AddCallback (aout, "audio-device", StreamMove, s);
+ op = pa_context_get_sink_info_list(ctx, sink_list_cb, aout);
+ /* We may need to wait for completion... once LibVLC supports this */
+ if (op != NULL)
+ pa_operation_unref(op);
+ stream_moved_cb(s, aout);
+
+ /* 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);
- p_aout->output.pf_play = Play;
- aout_VolumeSoftInit(p_aout);
+ aout->format.i_format = format;
+ aout->pf_play = Play;
+ aout->pf_pause = Pause;
+ aout->pf_flush = Flush;
+ aout->volume_set = VolumeSet;
+ aout->mute_set = MuteSet;
return VLC_SUCCESS;
-unlock_and_fail:
- pa_threaded_mainloop_unlock(sys->mainloop);
fail:
- Close(p_this);
- return VLC_EGENERIC;
-}
-
-/*****************************************************************************
- * Play: play a sound samples buffer
- *****************************************************************************/
-static void Play(aout_instance_t * aout)
-{
- struct aout_sys_t *sys = aout->output.p_sys;
-
- if (likely(sys->start_date != VLC_TS_INVALID))
- return;
- pa_threaded_mainloop_lock(sys->mainloop);
- sys->start_date = aout_FifoFirstDate(aout, &aout->output.fifo);
pa_threaded_mainloop_unlock(sys->mainloop);
+ Close(obj);
+ return VLC_EGENERIC;
}
-/*****************************************************************************
- * Close: close the audio device
- *****************************************************************************/
+/**
+ * Removes a PulseAudio playback stream
+ */
static void Close (vlc_object_t *obj)
{
- aout_instance_t *aout = (aout_instance_t *)obj;
- struct aout_sys_t *sys = aout->output.p_sys;
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = aout->sys;
+ pa_context *ctx = sys->context;
+ pa_stream *s = sys->stream;
- if (sys->stream) {
- pa_operation *o;
+ if (s != NULL) {
+ /* The callback takes mainloop lock, so it CANNOT be held here! */
+ var_DelCallback (aout, "audio-device", StreamMove, s);
+ var_Destroy (aout, "audio-device");
pa_threaded_mainloop_lock(sys->mainloop);
- pa_stream_set_write_callback(sys->stream, NULL, NULL);
-
- o = pa_stream_flush(sys->stream, success_cb, sys);
- if (o != NULL) {
- while (pa_operation_get_state(o) == PA_OPERATION_RUNNING)
- pa_threaded_mainloop_wait(sys->mainloop);
- pa_operation_unref(o);
- }
-
- o = pa_stream_drain(sys->stream, success_cb, sys);
- if (o != NULL) {
- while (pa_operation_get_state(o) == PA_OPERATION_RUNNING)
- pa_threaded_mainloop_wait(sys->mainloop);
- pa_operation_unref(o);
- }
-
+ if (unlikely(sys->trigger != NULL))
+ vlc_pa_rttime_free(sys->mainloop, sys->trigger);
+ pa_stream_disconnect(s);
+
+ /* 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_unref(s);
pa_threaded_mainloop_unlock(sys->mainloop);
}
- pa_threaded_mainloop_stop(sys->mainloop);
- if (sys->stream) {
- pa_stream_disconnect(sys->stream);
- pa_stream_unref(sys->stream);
- }
- pa_context_disconnect(sys->context);
- pa_context_unref(sys->context);
- pa_threaded_mainloop_free(sys->mainloop);
+ vlc_pa_disconnect(obj, ctx, sys->mainloop);
free(sys);
}
-
-static void context_state_cb(pa_context *c, void *userdata)
-{
- struct aout_sys_t *sys = userdata;
-
- switch (pa_context_get_state(c)) {
- case PA_CONTEXT_READY:
- case PA_CONTEXT_FAILED:
- pa_threaded_mainloop_signal(sys->mainloop, 0);
- default:
- break;
- }
-}
-
-static void stream_state_cb(pa_stream *s, void *userdata)
-{
- struct aout_sys_t *sys = userdata;
-
- switch (pa_stream_get_state(s)) {
- case PA_STREAM_READY:
- case PA_STREAM_FAILED:
- pa_threaded_mainloop_signal(sys->mainloop, 0);
- default:
- break;
- }
-}
-
-/* Memory free callback. The block_t address is in front of the data. */
-static void block_free_cb(void *data)
-{
- block_t **pp = data, *block;
-
- memcpy(&block, pp - 1, sizeof (block));
- block_Release(block);
-}
-
-static void stream_request_cb(pa_stream *s, size_t length, void *userdata)
-{
- aout_instance_t *aout = userdata;
- struct aout_sys_t *sys = aout->output.p_sys;
- size_t buffer_size = sys->buffer_size;
-
- do {
- block_t *block = NULL;
-
- if (sys->start_date != VLC_TS_INVALID) {
- pa_usec_t latency;
- int negative;
-
- if (pa_stream_get_latency(s, &latency, &negative) < 0){
- if (pa_context_errno(sys->context) != PA_ERR_NODATA) {
- msg_Err(aout, "cannot determine latency: %s",
- pa_strerror(pa_context_errno(sys->context)));
- }
- latency = 0;
-
- }
-
- //msg_Dbg(p_aout, "latency=%"PRId64, latency);
- mtime_t next_date = mdate() + latency;
-
- if (sys->start_date < next_date + AOUT_PTS_TOLERANCE)
- block = aout_OutputNextBuffer(aout, next_date, 0);
- }
-
- if (block != NULL)
- /* PA won't let us pass a reference to the buffer meta data... */
- block = block_Realloc (block, sizeof (block), block->i_buffer);
- if (block != NULL) {
- memcpy(block->p_buffer, &block, sizeof (block));
- block->p_buffer += sizeof (block);
- block->i_buffer -= sizeof (block);
-
- length -= block->i_buffer;
- pa_stream_write(s, block->p_buffer, block->i_buffer,
- block_free_cb, 0, PA_SEEK_RELATIVE);
- } else {
- void *data = pa_xmalloc(length);
- memset(data, 0, length);
- pa_stream_write(s, data, length, pa_xfree, 0, PA_SEEK_RELATIVE);
- length = 0;
- }
- } while (length > buffer_size);
-}
-
-static void success_cb(pa_stream *s, int sucess, void *userdata)
-{
- struct aout_sys_t *sys = userdata;
-
- (void) s;
- (void) sucess;
- pa_threaded_mainloop_signal(sys->mainloop, 0);
-}