#include <vlc_cpu.h>
#include <pulse/pulseaudio.h>
-#include "vlcpulse.h"
-#if !PA_CHECK_VERSION(0,9,22)
-# include <vlc_xlib.h>
-#endif
+#include "audio_output/vlcpulse.h"
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
{
struct sink *next;
uint32_t index;
+ pa_volume_t base_volume;
char name[1];
};
pa_cvolume cvolume; /**< actual sink input volume */
mtime_t first_pts; /**< Play time of buffer start */
+ pa_volume_t volume_force; /**< Forced volume (stream must be NULL) */
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 VolumeReport(audio_output_t *aout)
+{
+ aout_sys_t *sys = aout->sys;
+ pa_volume_t volume = pa_cvolume_max(&sys->cvolume);
+
+ volume = pa_sw_volume_divide(volume, sys->base_volume);
+ aout_VolumeReport(aout, (float)volume / PA_VOLUME_NORM);
+}
/*** Sink ***/
+static struct sink *sink_find(aout_sys_t *sys, uint32_t index)
+{
+ for (struct sink *sink = sys->sinks; sink != NULL; sink = sink->next)
+ if (sink->index == index)
+ return sink;
+ return NULL;
+}
+
+static struct sink *sink_find_by_name(aout_sys_t *sys, const char *name)
+{
+ for (struct sink *sink = sys->sinks; sink != NULL; sink = sink->next)
+ if (!strcmp(sink->name, name))
+ return sink;
+ return NULL;
+}
+
static void sink_add_cb(pa_context *ctx, const pa_sink_info *i, int eol,
void *userdata)
{
aout_sys_t *sys = aout->sys;
if (eol)
+ {
+ pa_threaded_mainloop_signal(sys->mainloop, 0);
return;
+ }
(void) ctx;
msg_Dbg(aout, "adding sink %"PRIu32": %s (%s)", i->index, i->name,
sink->next = sys->sinks;
sink->index = i->index;
+ /* 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)
+ sink->base_volume = i->base_volume;
+ else
+ sink->base_volume = PA_VOLUME_NORM;
memcpy(sink->name, i->name, namelen + 1);
sys->sinks = sink;
}
void *userdata)
{
audio_output_t *aout = userdata;
+ aout_sys_t *sys = aout->sys;
if (eol)
return;
msg_Dbg(aout, "changing sink %"PRIu32": %s (%s)", i->index, i->name,
i->description);
aout_HotplugReport(aout, i->name, i->description);
+
+ struct sink *sink = sink_find(sys, i->index);
+ if (unlikely(sink == NULL))
+ return;
+
+ if (i->flags & PA_SINK_FLAT_VOLUME)
+ sink->base_volume = i->base_volume;
+ else
+ sink->base_volume = PA_VOLUME_NORM;
}
static void sink_del(uint32_t index, audio_output_t *aout)
pa_operation_unref(op);
}
-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_start_now(pa_stream *s, audio_output_t *aout)
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)) {
msg_Dbg (aout, "format lost");
aout_RestartRequest (aout, AOUT_RESTART_OUTPUT);
} else
-#endif
msg_Warn (aout, "unhandled stream event \"%s\"", name);
(void) s;
(void) pl;
audio_output_t *aout = userdata;
aout_sys_t *sys = aout->sys;
const char *name = pa_stream_get_device_name(s);
- pa_operation *op;
+ struct sink *sink = sink_find(sys, pa_stream_get_device_index(s));
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);
+ sys->base_volume = likely(sink != NULL) ? sink->base_volume
+ : PA_VOLUME_INVALID;
+ msg_Dbg(aout, "base volume: %"PRIu32, sys->base_volume);
+ if (pa_cvolume_valid(&sys->cvolume))
+ VolumeReport(aout);
}
static void stream_overflow_cb(pa_stream *s, void *userdata)
(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);
+ if (PA_VOLUME_IS_VALID(sys->base_volume))
+ VolumeReport(aout);
aout_MuteReport(aout, i->mute);
}
static int VolumeSet(audio_output_t *aout, float vol)
{
aout_sys_t *sys = aout->sys;
- if (sys->stream == NULL)
- {
- msg_Err (aout, "cannot change volume while not playing");
- return -1;
- }
+ pa_stream *s = sys->stream;
+ pa_operation *op;
+ int ret = -1;
+ pa_volume_t base_volume;
/* VLC provides the software volume so convert directly to PulseAudio
* software volume, pa_volume_t. This is not a linear amplification factor
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);
+
+ pa_threaded_mainloop_lock(sys->mainloop);
+
+ base_volume = sys->base_volume;
+ if (!PA_VOLUME_IS_VALID(base_volume))
+ { /* Base volume is unknown, typically because sink is unknown.
+ * Try to guess the base volume. */
+ const struct sink *sink = sys->sinks;
+ if (unlikely(sink == NULL))
+ {
+ msg_Err(aout, "cannot change volume without sink");
+ goto out;
+ }
+
+ base_volume = sink->base_volume;
+ while ((sink = sink->next) != NULL)
+ if (sink->base_volume != base_volume)
+ {
+ msg_Err(aout, "cannot change volume without base");
+ goto out;
+ }
+ }
+
+ pa_volume_t volume = pa_sw_volume_multiply(lroundf(vol), base_volume);
+
+ if (s == NULL)
+ {
+ sys->volume_force = volume;
+ aout_VolumeReport(aout, vol / (float)PA_VOLUME_NORM);
+ ret = 0;
+ goto out;
+ }
+
+ if (!pa_cvolume_valid(&sys->cvolume))
+ {
+ const pa_sample_spec *ss = pa_stream_get_sample_spec(s);
+
+ msg_Warn(aout, "balance clobbered by volume change");
+ pa_cvolume_set(&sys->cvolume, ss->channels, PA_VOLUME_NORM);
+ }
/* Preserve the balance (VLC does not support it). */
pa_cvolume cvolume = sys->cvolume;
pa_sw_cvolume_multiply_scalar(&cvolume, &cvolume, volume);
assert(pa_cvolume_valid(&cvolume));
- pa_operation *op;
- uint32_t idx = pa_stream_get_index(sys->stream);
- pa_threaded_mainloop_lock(sys->mainloop);
- op = pa_context_set_sink_input_volume(sys->context, idx, &cvolume,
- NULL, NULL);
+ op = pa_context_set_sink_input_volume(sys->context, pa_stream_get_index(s),
+ &cvolume, NULL, NULL);
if (likely(op != NULL))
+ {
pa_operation_unref(op);
+ ret = 0;
+ }
+out:
pa_threaded_mainloop_unlock(sys->mainloop);
-
- return 0;
+ return ret;
}
static int MuteSet(audio_output_t *aout, bool mute)
if (sys->stream == NULL)
{
+ struct sink *sink = sink_find_by_name(sys, name);
+
+ sys->base_volume = likely(sink != NULL) ? sink->base_volume
+ : PA_VOLUME_INVALID;
msg_Dbg(aout, "will connect to sink %s", name);
free(sys->sink_force);
sys->sink_force = strdup(name);
/* Sample format specification */
struct pa_sample_spec ss;
-#if PA_CHECK_VERSION(1,0,0)
pa_encoding_t encoding = PA_ENCODING_INVALID;
-#endif
switch (fmt->i_format)
{
case VLC_CODEC_U8:
ss.format = PA_SAMPLE_U8;
break;
-#if PA_CHECK_VERSION(1,0,0)
case VLC_CODEC_A52:
fmt->i_format = VLC_CODEC_SPDIFL;
encoding = PA_ENCODING_AC3_IEC61937;
encoding = PA_ENCODING_DTS_IEC61937;
ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
break;
-#endif
default:
if (HAVE_FPU)
{
attr.minreq = pa_usec_to_bytes(AOUT_MIN_PREPARE_TIME, &ss);
attr.fragsize = 0; /* not used for output */
- sys->stream = NULL;
+ pa_cvolume *cvolume = NULL, cvolumebuf;
+ if (PA_VOLUME_IS_VALID(sys->volume_force))
+ {
+ cvolume = &cvolumebuf;
+ pa_cvolume_set(cvolume, ss.channels, sys->volume_force);
+ }
+
sys->trigger = NULL;
+ pa_cvolume_init(&sys->cvolume);
sys->first_pts = VLC_TS_INVALID;
- /* 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;
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(sys->context, "audio stream", formatv, formatc,
- props);
+ pa_stream *s = pa_stream_new_extended(sys->context, "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(sys->context, "audio stream", &ss, &map);
-#endif
+
if (s == NULL) {
pa_threaded_mainloop_unlock(sys->mainloop);
vlc_pa_error(aout, "stream creation failure", sys->context);
return VLC_EGENERIC;
}
+ assert(sys->stream == NULL);
sys->stream = s;
pa_stream_set_state_callback(s, stream_state_cb, sys->mainloop);
pa_stream_set_buffer_attr_callback(s, stream_buffer_attr_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, sys->sink_force, &attr, flags, NULL,
- NULL) < 0
+ if (pa_stream_connect_playback(s, sys->sink_force, &attr, flags,
+ cvolume, NULL) < 0
|| stream_wait(s, sys->mainloop)) {
vlc_pa_error(aout, "stream connection failure", sys->context);
goto fail;
}
+ sys->volume_force = PA_VOLUME_INVALID;
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)
if (encoding != PA_ENCODING_INVALID) {
const pa_format_info *info = pa_stream_get_format_info(s);
spec = NULL;
}
}
-#endif
if (spec != NULL)
fmt->i_rate = spec->rate;
pa_stream_unref(s);
sys->stream = NULL;
+ sys->base_volume = PA_VOLUME_INVALID;
pa_threaded_mainloop_unlock(sys->mainloop);
}
aout_sys_t *sys = malloc(sizeof (*sys));
pa_operation *op;
-#if !PA_CHECK_VERSION(0,9,22)
- if (!vlc_xlib_init(obj))
- return VLC_EGENERIC;
-#endif
if (unlikely(sys == NULL))
return VLC_ENOMEM;
}
sys->stream = NULL;
sys->context = ctx;
+ sys->base_volume = PA_VOLUME_INVALID;
+ sys->volume_force = PA_VOLUME_INVALID;
sys->flags_force = PA_STREAM_NOFLAGS;
sys->sink_force = NULL;
sys->sinks = NULL;
pa_threaded_mainloop_lock(sys->mainloop);
/* Sinks (output devices) list */
op = pa_context_get_sink_info_list(sys->context, sink_add_cb, aout);
- if (op != NULL)
+ if (likely(op != NULL))
+ {
+ while (pa_operation_get_state(op) == PA_OPERATION_RUNNING)
+ pa_threaded_mainloop_wait(sys->mainloop);
pa_operation_unref(op);
+ }
/* Context events */
const pa_subscription_mask_t mask = PA_SUBSCRIPTION_MASK_SINK
projects / vlc / blobdiff