* In particular, a VLC variable callback cannot be triggered nor deleted with
* the PulseAudio mainloop lock held, if the callback acquires the lock. */
+struct sink
+{
+ struct sink *next;
+ char *description;
+ uint32_t index;
+ char name[1];
+};
+
struct aout_sys_t
{
pa_stream *stream; /**< PulseAudio playback stream object */
pa_cvolume cvolume; /**< actual sink input volume */
mtime_t first_pts; /**< Play time of buffer start */
mtime_t paused; /**< Time when (last) paused */
+
+ pa_stream_flags_t flags_force; /**< Forced flags (stream must be NULL) */
+ char *sink_force; /**< Forced sink name (stream must be NULL) */
+
+ struct sink *sinks; /**< Locally-cached list of sinks */
};
-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)
+/*** Sink ***/
+static void sink_add_cb(pa_context *ctx, const pa_sink_info *i, int eol,
+ 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 (sys->stream == NULL || idx != pa_stream_get_index(sys->stream))
- break; /* only interested in our sink input */
+ if (eol)
+ return;
+ (void) ctx;
- /* 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;
+ msg_Dbg(aout, "listing sink %s (%"PRIu32"): %s", i->name, i->index,
+ i->description);
- 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;
+ size_t namelen = strlen(i->name);
+ struct sink *sink = malloc(sizeof (*sink) + namelen);
+ if (unlikely(sink == NULL))
+ return;
- default: /* unsubscribed facility?! */
- assert(0);
- }
+ sink->next = sys->sinks;
+ sink->index = i->index;
+ sink->description = strdup(i->description);
+ memcpy(sink->name, i->name, namelen + 1);
+ sys->sinks = sink;
}
-
-/*** Sink ***/
-static void sink_list_cb(pa_context *c, const pa_sink_info *i, int eol,
- void *userdata)
+static void sink_mod_cb(pa_context *ctx, const pa_sink_info *i, int eol,
+ void *userdata)
{
audio_output_t *aout = userdata;
aout_sys_t *sys = aout->sys;
- vlc_value_t val, text;
if (eol)
return;
- (void) c;
+ (void) ctx;
- 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. */
- if (sys->stream != NULL)
+ for (struct sink *sink = sys->sinks; sink != NULL; sink = sink->next)
+ if (sink->index == i->index)
+ {
+ free(sink->description);
+ sink->description = strdup(i->description);
+ }
+}
+
+static void sink_del(uint32_t index, audio_output_t *aout)
+{
+ aout_sys_t *sys = aout->sys;
+ struct sink **pp = &sys->sinks, *sink;
+
+ while ((sink = *pp) != NULL)
+ if (sink->index == index)
+ {
+ *pp = sink->next;
+ free(sink->description);
+ free(sink);
+ }
+ else
+ pp = &sink->next;
+}
+
+static void sink_event(pa_context *ctx, unsigned type, uint32_t idx,
+ audio_output_t *aout)
+{
+ pa_operation *op = NULL;
+
+ switch (type)
{
- val.i_int = pa_stream_get_device_index(sys->stream);
- var_Change(aout, "audio-device", VLC_VAR_SETVALUE, &val, NULL);
+ case PA_SUBSCRIPTION_EVENT_NEW:
+ op = pa_context_get_sink_info_by_index(ctx, idx, sink_add_cb,
+ aout);
+ break;
+ case PA_SUBSCRIPTION_EVENT_CHANGE:
+ op = pa_context_get_sink_info_by_index(ctx, idx, sink_mod_cb,
+ aout);
+ break;
+ case PA_SUBSCRIPTION_EVENT_REMOVE:
+ sink_del(idx, aout);
+ break;
}
+ if (op != NULL)
+ pa_operation_unref(op);
}
static void sink_info_cb(pa_context *c, const pa_sink_info *i, int eol,
#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);
+ aout_RestartRequest (aout, AOUT_RESTART_OUTPUT);
} else
#endif
msg_Warn (aout, "unhandled stream event \"%s\"", name);
{
audio_output_t *aout = userdata;
aout_sys_t *sys = aout->sys;
+ const char *name = pa_stream_get_device_name(s);
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);
+ msg_Dbg(aout, "connected to sink %s", name);
+ aout_DeviceReport(aout, name);
+
+ op = pa_context_get_sink_info_by_name(sys->context, name, 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)
aout_MuteReport(aout, i->mute);
}
+static void sink_input_event(pa_context *ctx,
+ pa_subscription_event_type_t type,
+ uint32_t idx, audio_output_t *aout)
+{
+ pa_operation *op;
+
+ /* Gee... PA will not provide the infos directly in the event. */
+ switch (type)
+ {
+ 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;
+ }
+}
+
+
+/*** 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;
+ unsigned facility = type & PA_SUBSCRIPTION_EVENT_FACILITY_MASK;
+
+ type &= PA_SUBSCRIPTION_EVENT_TYPE_MASK;
+ switch (facility)
+ {
+ case PA_SUBSCRIPTION_EVENT_SINK:
+ sink_event(ctx, type, idx, userdata);
+ break;
+
+ case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+ /* only interested in our sink input */
+ if (sys->stream != NULL && idx == pa_stream_get_index(sys->stream))
+ sink_input_event(ctx, type, idx, userdata);
+ break;
+
+ default: /* unsubscribed facility?! */
+ assert(0);
+ }
+}
+
/*** VLC audio output callbacks ***/
-static int TimeGet(audio_output_t *aout, mtime_t *restrict write_pts)
+static int TimeGet(audio_output_t *aout, mtime_t *restrict delay)
{
aout_sys_t *sys = aout->sys;
pa_stream *s = sys->stream;
if (delta == VLC_TS_INVALID)
return -1;
- *write_pts = mdate() + delta;
+ *delay = delta;
return 0;
}
static int MuteSet(audio_output_t *aout, bool mute)
{
aout_sys_t *sys = aout->sys;
+
if (sys->stream == NULL)
{
- msg_Err (aout, "cannot change volume while not playing");
- return -1;
+ sys->flags_force &= ~(PA_STREAM_START_MUTED|PA_STREAM_START_UNMUTED);
+ sys->flags_force |=
+ mute ? PA_STREAM_START_MUTED : PA_STREAM_START_UNMUTED;
+ return 0;
}
pa_operation *op;
return 0;
}
-static int StreamMove(vlc_object_t *obj, const char *varname, vlc_value_t old,
- vlc_value_t val, void *userdata)
+static int SinksList(audio_output_t *aout, char ***namesp, char ***descsp)
{
- 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;
+ char **names, **descs;
+ unsigned n = 0;
+
+ pa_threaded_mainloop_lock(sys->mainloop);
+ for (struct sink *sink = sys->sinks; sink != NULL; sink = sink->next)
+ n++;
+
+ *namesp = names = xmalloc(sizeof(*names) * n);
+ *descsp = descs = xmalloc(sizeof(*descs) * n);
+
+ for (struct sink *sink = sys->sinks; sink != NULL; sink = sink->next)
+ {
+ *(names++) = strdup(sink->name);
+ *(descs++) = strdup(sink->description);
+ }
+ pa_threaded_mainloop_unlock(sys->mainloop);
+ return n;
+}
+
+static int StreamMove(audio_output_t *aout, const char *name)
+{
+ aout_sys_t *sys = aout->sys;
+
+ if (sys->stream == NULL)
+ {
+ msg_Dbg(aout, "will connect to sink %s", name);
+ free(sys->sink_force);
+ sys->sink_force = strdup(name);
+ return 0;
+ }
- (void) varname; (void) old;
+ pa_operation *op;
+ uint32_t idx = pa_stream_get_index(sys->stream);
pa_threaded_mainloop_lock(sys->mainloop);
- op = pa_context_move_sink_input_by_index(sys->context, idx, sink_idx,
- NULL, NULL);
+ op = pa_context_move_sink_input_by_name(sys->context, idx, name,
+ NULL, NULL);
if (likely(op != NULL)) {
pa_operation_unref(op);
- msg_Dbg(aout, "moving to sink %"PRIu32, sink_idx);
+ msg_Dbg(aout, "moving to sink %s", name);
} else
- vlc_pa_error(obj, "cannot move sink", sys->context);
+ vlc_pa_error(aout, "cannot move sink input", sys->context);
pa_threaded_mainloop_unlock(sys->mainloop);
- return (op != NULL) ? VLC_SUCCESS : VLC_EGENERIC;
+ return (op != NULL) ? 0 : -1;
}
static void Stop(audio_output_t *);
switch (fmt->i_format)
{
- case VLC_CODEC_F64B:
- fmt->i_format = VLC_CODEC_F32B;
- case VLC_CODEC_F32B:
- ss.format = PA_SAMPLE_FLOAT32BE;
- break;
- case VLC_CODEC_F64L:
- fmt->i_format = VLC_CODEC_F32L;
- case VLC_CODEC_F32L:
- ss.format = PA_SAMPLE_FLOAT32LE;
+ case VLC_CODEC_FL64:
+ fmt->i_format = VLC_CODEC_FL32;
+ case VLC_CODEC_FL32:
+ ss.format = PA_SAMPLE_FLOAT32NE;
break;
- case VLC_CODEC_S32B:
- ss.format = PA_SAMPLE_S32BE;
+ case VLC_CODEC_S32N:
+ ss.format = PA_SAMPLE_S32NE;
break;
- case VLC_CODEC_S32L:
- ss.format = PA_SAMPLE_S32LE;
+ case VLC_CODEC_S16N:
+ ss.format = PA_SAMPLE_S16NE;
break;
- case VLC_CODEC_S24B:
- ss.format = PA_SAMPLE_S24BE;
- break;
- case VLC_CODEC_S24L:
- ss.format = PA_SAMPLE_S24LE;
- break;
- case VLC_CODEC_S16B:
- ss.format = PA_SAMPLE_S16BE;
- break;
- case VLC_CODEC_S16L:
- ss.format = PA_SAMPLE_S16LE;
- break;
- case VLC_CODEC_S8:
- fmt->i_format = VLC_CODEC_U8;
case VLC_CODEC_U8:
ss.format = PA_SAMPLE_U8;
break;
}
/* Stream parameters */
- const pa_stream_flags_t flags = PA_STREAM_START_CORKED
+ const pa_stream_flags_t flags = sys->flags_force
+ | PA_STREAM_START_CORKED
| PA_STREAM_INTERPOLATE_TIMING
| PA_STREAM_NOT_MONOTONIC
| PA_STREAM_AUTO_TIMING_UPDATE
struct pa_buffer_attr attr;
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);
+ /* PulseAudio goes berserk if the target length (tlength) is not
+ * significantly longer than 2 periods (minreq), or when the period length
+ * is unspecified and the target length is short. */
+ attr.tlength = pa_usec_to_bytes(3 * AOUT_MIN_PREPARE_TIME, &ss);
attr.prebuf = 0; /* trigger manually */
- attr.minreq = -1;
+ attr.minreq = pa_usec_to_bytes(AOUT_MIN_PREPARE_TIME, &ss);
attr.fragsize = 0; /* not used for output */
sys->stream = NULL;
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
+ if (pa_stream_connect_playback(s, sys->sink_force, &attr, flags, NULL,
+ NULL) < 0
|| stream_wait(s, sys->mainloop)) {
vlc_pa_error(aout, "stream connection failure", sys->context);
goto fail;
}
+ sys->flags_force = PA_STREAM_NOFLAGS;
+ free(sys->sink_force);
+ sys->sink_force = NULL;
const struct pa_sample_spec *spec = pa_stream_get_sample_spec(s);
#if PA_CHECK_VERSION(1,0,0)
stream_buffer_attr_cb(s, aout);
stream_moved_cb(s, aout);
pa_threaded_mainloop_unlock(sys->mainloop);
- var_AddCallback (aout, "audio-device", StreamMove, s);
return VLC_SUCCESS;
fail:
pa_threaded_mainloop_unlock(sys->mainloop);
- var_AddCallback (aout, "audio-device", StreamMove, s);
Stop(aout);
return VLC_EGENERIC;
}
aout_sys_t *sys = aout->sys;
pa_stream *s = sys->stream;
- /* The callback takes mainloop lock, so it CANNOT be held here! */
- var_DelCallback (aout, "audio-device", StreamMove, s);
-
pa_threaded_mainloop_lock(sys->mainloop);
if (unlikely(sys->trigger != NULL))
vlc_pa_rttime_free(sys->mainloop, sys->trigger);
}
sys->stream = NULL;
sys->context = ctx;
+ sys->flags_force = PA_STREAM_NOFLAGS;
+ sys->sink_force = NULL;
+ sys->sinks = NULL;
aout->sys = sys;
aout->start = Start;
aout->flush = Flush;
aout->volume_set = VolumeSet;
aout->mute_set = MuteSet;
-
- /* Devices (sinks) */
- 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);
+ aout->device_enum = SinksList;
+ aout->device_select = StreamMove;
pa_threaded_mainloop_lock(sys->mainloop);
- op = pa_context_get_sink_info_list(sys->context, sink_list_cb, aout);
+ /* Sinks (output devices) list */
+ op = pa_context_get_sink_info_list(sys->context, sink_add_cb, aout);
if (op != NULL)
pa_operation_unref(op);
pa_threaded_mainloop_unlock(sys->mainloop);
vlc_pa_disconnect(obj, ctx, sys->mainloop);
- var_Destroy (aout, "audio-device");
+ for (struct sink *sink = sys->sinks, *next; sink != NULL; sink = next)
+ {
+ next = sink->next;
+ free(sink->description);
+ free(sink);
+ }
+ free(sys->sink_force);
free(sys);
}