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 pa_threaded_mainloop_lock().
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,
aout_sys_t *sys = aout->sys;
pa_operation *op;
- if (sys->trigger != NULL) {
- vlc_pa_rttime_free(sys->mainloop, sys->trigger);
- sys->trigger = NULL;
- }
+ assert (sys->trigger == NULL);
op = pa_stream_cork(s, 0, NULL, NULL);
if (op != NULL)
audio_output_t *aout = userdata;
aout_sys_t *sys = aout->sys;
- msg_Dbg(aout, "starting deferred");
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;
}
aout_sys_t *sys = aout->sys;
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;
if (delta > 0) {
- if (sys->trigger == NULL) {
- 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);
- }
+ 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);
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);
{
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)) {
dummy, dummy, NULL);
} else
#endif
- msg_Warn (aout, "unhandled event %s", name);
+ msg_Warn (aout, "unhandled stream event \"%s\"", name);
(void) s;
(void) pl;
}
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)
{
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;
}
pa_threaded_mainloop_unlock(sys->mainloop);
+ (void) drift;
}
/**
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));
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);
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;
/* 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;
sys->desync = 0;
sys->rate = ss.rate;
- /* 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);
-
/* Channel volume */
sys->base_volume = PA_VOLUME_NORM;
pa_cvolume_set(&sys->cvolume, ss.channels, PA_VOLUME_NORM);
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++;
}
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, NULL);
+ 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]);
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);
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:
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);
projects / vlc / blobdiff