<html><head></head><body>Hi,<br><br>This seems backward. The period of the output should be no more than half the maximum tolerable delay, and most back-ends support different values. Only if the minimum period length is more than half the maximum delay should the back-end override (increase) the delay.<br><br><div class="gmail_quote">Le 5 février 2019 10:18:07 GMT+02:00, Thomas Guillem <thomas@gllm.fr> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">This value should be 2 times (RFC: or 3 times, Rémi ?) the minimum audio<br>request value.<br><br>This value will be used by the future new output clock. If the audio ES is the<br>master, audio outputs will be able to set the jitter value of the clock. The<br>first start of all other ESes will be delayed by this value. This will allow to<br>start without any distortion/frame drop.<hr> include/vlc_aout.h | 7 ++++++-<br> modules/audio_output/adummy.c | 5 +++--<br> modules/audio_output/alsa.c | 4 +++-<br> modules/audio_output/amem.c | 4 +++-<br> modules/audio_output/audiotrack.c | 6 ++++--<br> modules/audio_output/audiounit_ios.m | 4 +++-<br> modules/audio_output/auhal.c | 4 +++-<br> modules/audio_output/directsound.c | 3 ++-<br> modules/audio_output/file.c | 4 +++-<br> modules/audio_output/jack.c | 4 +++-<br> modules/audio_output/kai.c | 3 ++-<br> modules/audio_output/mmdevice.c | 4 +++-<br> modules/audio_output/opensles_android.c | 4 +++-<br> modules/audio_output/oss.c | 4 +++-<br> modules/audio_output/pulse.c | 4 +++-<br> modules/audio_output/sndio.c | 3 ++-<br> modules/audio_output/tizen_audio.c | 4 +++-<br> modules/audio_output/waveout.c | 4 +++-<br> modules/audio_output/winstore.c | 4 +++-<br> modules/video_output/decklink.cpp | 4 +++-<br> src/audio_output/output.c | 3 ++-<br> 21 files changed, 63 insertions(+), 23 deletions(-)<br><br>diff --git a/include/vlc_aout.h b/include/vlc_aout.h<br>index 11209ee0ce..cec64a1e61 100644<br>--- a/include/vlc_aout.h<br>+++ b/include/vlc_aout.h<br>@@ -140,7 +140,7 @@ struct audio_output<br> <br> void *sys; /**< Private data for callbacks */<br> <br>- int (*start)(audio_output_t *, audio_sample_format_t *fmt);<br>+ int (*start)(audio_output_t *, audio_sample_format_t *fmt, vlc_tick_t *jitter);<br> /**< Starts a new stream (mandatory, cannot be NULL).<br> *<br> * This callback changes the audio output from stopped to playing state<br>@@ -149,6 +149,11 @@ struct audio_output<br> *<br> * \param fmt input stream sample format upon entry,<br> * output stream sample format upon return [IN/OUT]<br>+ * \param jitter delay that is needed to start without distortion. The<br>+ * first played block date will be 'jitter' us in the future. If the<br>+ * module can't handle a late start, the time_get() implementation should<br>+ * return a valid value before the first play. [OUT]<br>+<br> * \return VLC_SUCCESS on success, non-zero on failure<br> *<br> * \note This callback can only be called while the audio output is in<br>diff --git a/modules/audio_output/adummy.c b/modules/audio_output/adummy.c<br>index d0889b8c08..894356e527 100644<br>--- a/modules/audio_output/adummy.c<br>+++ b/modules/audio_output/adummy.c<br>@@ -57,9 +57,10 @@ static void Flush(audio_output_t *aout, bool wait)<br> (void) aout; (void) wait;<br> }<br> <br>-static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br>- (void) aout;<br>+ (void) aout; (void) jitter;<br> <br> switch (fmt->i_format)<br> {<br>diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c<br>index 08067c1338..9ff6c3eb09 100644<br>--- a/modules/audio_output/alsa.c<br>+++ b/modules/audio_output/alsa.c<br>@@ -297,7 +297,8 @@ static void PauseDummy (audio_output_t *, bool, vlc_tick_t);<br> static void Flush (audio_output_t *, bool);<br> <br> /** Initializes an ALSA playback stream */<br>-static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> aout_sys_t *sys = aout->sys;<br> snd_pcm_format_t pcm_format; /* ALSA sample format */<br>@@ -627,6 +628,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)<br> error:<br> snd_pcm_close (pcm);<br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static int TimeGet (audio_output_t *aout, vlc_tick_t *restrict delay)<br>diff --git a/modules/audio_output/amem.c b/modules/audio_output/amem.c<br>index dcba84c32d..098b97b9ac 100644<br>--- a/modules/audio_output/amem.c<br>+++ b/modules/audio_output/amem.c<br>@@ -184,7 +184,8 @@ static void Stop (audio_output_t *aout)<br> vlc_mutex_unlock(&sys->lock);<br> }<br> <br>-static int Start (audio_output_t *aout, audio_sample_format_t *fmt)<br>+static int Start (audio_output_t *aout, audio_sample_format_t *fmt,<br>+ vlc_tick_t *jitter)<br> {<br> aout_sys_t *sys = aout->sys;<br> char format[5] = "S16N";<br>@@ -265,6 +266,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *fmt)<br> fmt->i_format = VLC_CODEC_S16N;<br> fmt->channel_type = AUDIO_CHANNEL_TYPE_BITMAP;<br> return VLC_SUCCESS;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static int Open (vlc_object_t *obj)<br>diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c<br>index 8aef4aecfe..ed45d82253 100644<br>--- a/modules/audio_output/audiotrack.c<br>+++ b/modules/audio_output/audiotrack.c<br>@@ -43,7 +43,7 @@<br> static int Open( vlc_object_t * );<br> static void Close( vlc_object_t * );<br> static void Stop( audio_output_t * );<br>-static int Start( audio_output_t *, audio_sample_format_t * );<br>+static int Start( audio_output_t *, audio_sample_format_t *, vlc_tick_t * );<br> static void *AudioTrack_Thread( void * );<br> <br> /* There is an undefined behavior when configuring AudioTrack with SPDIF or<br>@@ -1292,7 +1292,8 @@ StartPCM( JNIEnv *env, audio_output_t *p_aout, unsigned i_max_channels )<br> }<br> <br> static int<br>-Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )<br>+Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt,<br>+ vlc_tick_t *jitter )<br> {<br> aout_sys_t *p_sys = p_aout->sys;<br> JNIEnv *env;<br>@@ -1494,6 +1495,7 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )<br> error:<br> Stop( p_aout );<br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void<br>diff --git a/modules/audio_output/audiounit_ios.m b/modules/audio_output/audiounit_ios.m<br>index e449f6e2eb..f379c4f70f 100644<br>--- a/modules/audio_output/audiounit_ios.m<br>+++ b/modules/audio_output/audiounit_ios.m<br>@@ -477,7 +477,8 @@ Stop(audio_output_t *p_aout)<br> }<br> <br> static int<br>-Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)<br>+Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> aout_sys_t *p_sys = p_aout->sys;<br> OSStatus err;<br>@@ -580,6 +581,7 @@ error:<br> [[NSNotificationCenter defaultCenter] removeObserver:p_sys->aoutWrapper];<br> msg_Err(p_aout, "opening AudioUnit output failed");<br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static int DeviceSelect(audio_output_t *p_aout, const char *psz_id)<br>diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c<br>index 8005e27954..1bc215a9d5 100644<br>--- a/modules/audio_output/auhal.c<br>+++ b/modules/audio_output/auhal.c<br>@@ -1496,7 +1496,8 @@ Stop(audio_output_t *p_aout)<br> }<br> <br> static int<br>-Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)<br>+Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> UInt32 i_param_size = 0;<br> aout_sys_t *p_sys = NULL;<br>@@ -1627,6 +1628,7 @@ Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)<br> kAudioDevicePropertyDeviceIsAlive,<br> kAudioObjectPropertyScopeGlobal);<br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void Close(vlc_object_t *obj)<br>diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c<br>index b3f3b130c5..0752a559d8 100644<br>--- a/modules/audio_output/directsound.c<br>+++ b/modules/audio_output/directsound.c<br>@@ -963,7 +963,7 @@ static int MuteSet( audio_output_t *p_aout, bool mute )<br> }<br> <br> static int OutputStart( audio_output_t *p_aout,<br>- audio_sample_format_t *restrict fmt )<br>+ audio_sample_format_t *restrict fmt, vlc_tick_t *jitter )<br> {<br> msg_Dbg( p_aout, "Opening DirectSound Audio Output" );<br> <br>@@ -990,6 +990,7 @@ static int OutputStart( audio_output_t *p_aout,<br> p_aout->flush = OutputFlush;<br> <br> return 0;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> typedef struct<br>diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c<br>index fbdf35fcb1..0fab9bdece 100644<br>--- a/modules/audio_output/file.c<br>+++ b/modules/audio_output/file.c<br>@@ -128,7 +128,8 @@ vlc_module_begin ()<br> set_callbacks( Open, NULL )<br> vlc_module_end ()<br> <br>-static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )<br>+static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter )<br> {<br> char * psz_name, * psz_format;<br> const char * const * ppsz_compare = format_list;<br>@@ -272,6 +273,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )<br> }<br> <br> return 0;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> /*****************************************************************************<br>diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c<br>index 59ad013b2f..6dce9f1609 100644<br>--- a/modules/audio_output/jack.c<br>+++ b/modules/audio_output/jack.c<br>@@ -112,7 +112,8 @@ vlc_module_begin ()<br> vlc_module_end ()<br> <br> <br>-static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )<br>+static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter )<br> {<br> char *psz_name;<br> aout_sys_t *p_sys = p_aout->sys;<br>@@ -280,6 +281,7 @@ error_out:<br> }<br> free( psz_name );<br> return status;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void Play(audio_output_t * p_aout, block_t * p_block, vlc_tick_t date)<br>diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c<br>index 98a2182394..5c87aeb74b 100644<br>--- a/modules/audio_output/kai.c<br>+++ b/modules/audio_output/kai.c<br>@@ -124,7 +124,7 @@ vlc_module_end ()<br> /*****************************************************************************<br> * Open: open the audio device<br> *****************************************************************************/<br>-static int Start ( audio_output_t *p_aout, audio_sample_format_t *fmt )<br>+static int Start ( audio_output_t *p_aout, audio_sample_format_t *fmt, vlc_tick_t *jitter )<br> {<br> aout_sys_t *p_sys = p_aout->sys;<br> char *psz_mode;<br>@@ -228,6 +228,7 @@ exit_kai_done :<br> kaiDone();<br> <br> return VLC_EGENERIC;<br>+ VLC_UNUSED( jitter );<br> }<br> <br> /*****************************************************************************<br>diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c<br>index 3aded2b9d3..8d6948b285 100644<br>--- a/modules/audio_output/mmdevice.c<br>+++ b/modules/audio_output/mmdevice.c<br>@@ -1117,7 +1117,8 @@ static void aout_stream_Stop(void *func, va_list ap)<br> stop(s);<br> }<br> <br>-static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> aout_sys_t *sys = aout->sys;<br> <br>@@ -1232,6 +1233,7 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br> sys->stream = s;<br> aout_GainRequest(aout, sys->gain);<br> return 0;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void Stop(audio_output_t *aout)<br>diff --git a/modules/audio_output/opensles_android.c b/modules/audio_output/opensles_android.c<br>index f0d7360397..080548b17a 100644<br>--- a/modules/audio_output/opensles_android.c<br>+++ b/modules/audio_output/opensles_android.c<br>@@ -380,7 +380,8 @@ static int aout_get_native_sample_rate(audio_output_t *aout)<br> /*****************************************************************************<br> *<br> *****************************************************************************/<br>-static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> if (aout_FormatNbChannels(fmt) == 0 || !AOUT_FMT_LINEAR(fmt))<br> return VLC_EGENERIC;<br>@@ -496,6 +497,7 @@ error:<br> }<br> <br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void Stop(audio_output_t *aout)<br>diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c<br>index 5e16255798..820a3b63c1 100644<br>--- a/modules/audio_output/oss.c<br>+++ b/modules/audio_output/oss.c<br>@@ -92,7 +92,8 @@ static void Play(audio_output_t *, block_t *, vlc_tick_t);<br> static void Pause (audio_output_t *, bool, vlc_tick_t);<br> static void Flush (audio_output_t *, bool);<br> <br>-static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> aout_sys_t* sys = aout->sys;<br> <br>@@ -248,6 +249,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)<br> error:<br> vlc_close (fd);<br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static int TimeGet (audio_output_t *aout, vlc_tick_t *restrict pts)<br>diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c<br>index 5075dd92ce..8be4004534 100644<br>--- a/modules/audio_output/pulse.c<br>+++ b/modules/audio_output/pulse.c<br>@@ -696,7 +696,8 @@ static const char *str_map(const char *key, const char *const table[][2],<br> /**<br> * Create a PulseAudio playback stream, a.k.a. a sink input.<br> */<br>-static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> aout_sys_t *sys = aout->sys;<br> <br>@@ -962,6 +963,7 @@ fail:<br> pa_threaded_mainloop_unlock(sys->mainloop);<br> Stop(aout);<br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> /**<br>diff --git a/modules/audio_output/sndio.c b/modules/audio_output/sndio.c<br>index 6b28772817..54df8a0e96 100644<br>--- a/modules/audio_output/sndio.c<br>+++ b/modules/audio_output/sndio.c<br>@@ -62,7 +62,7 @@ typedef struct<br> } aout_sys_t;<br> <br> /** Initializes an sndio playback stream */<br>-static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt, vlc_tick_t *jitter)<br> {<br> aout_sys_t *sys = aout->sys;<br> <br>@@ -202,6 +202,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)<br> error:<br> sio_close (sys->hdl);<br> return VLC_EGENERIC;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void Stop (audio_output_t *aout)<br>diff --git a/modules/audio_output/tizen_audio.c b/modules/audio_output/tizen_audio.c<br>index 6ed34ac3d3..19332417ec 100644<br>--- a/modules/audio_output/tizen_audio.c<br>+++ b/modules/audio_output/tizen_audio.c<br>@@ -193,7 +193,8 @@ AudioIO_Start( audio_output_t *p_aout )<br> }<br> <br> static int<br>-Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )<br>+Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt,<br>+ vlc_tick_t *jitter )<br> {<br> aout_sys_t *p_sys = p_aout->sys;<br> <br>@@ -242,6 +243,7 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )<br> aout_FormatPrint( p_aout, "Tizen audio will output:", p_fmt );<br> <br> return VLC_SUCCESS;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void<br>diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c<br>index b71fe762bb..74b67d0388 100644<br>--- a/modules/audio_output/waveout.c<br>+++ b/modules/audio_output/waveout.c<br>@@ -168,7 +168,8 @@ vlc_module_end ()<br> *****************************************************************************<br> * This function opens and setups Win32 waveOut<br> *****************************************************************************/<br>-static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )<br>+static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter )<br> {<br> if( aout_FormatNbChannels( fmt ) == 0 )<br> return VLC_EGENERIC;<br>@@ -334,6 +335,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )<br> fmt->channel_type = AUDIO_CHANNEL_TYPE_BITMAP;<br> <br> return VLC_SUCCESS;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> /*****************************************************************************<br>diff --git a/modules/audio_output/winstore.c b/modules/audio_output/winstore.c<br>index 5dcad97908..afc4224e5c 100644<br>--- a/modules/audio_output/winstore.c<br>+++ b/modules/audio_output/winstore.c<br>@@ -226,7 +226,8 @@ static void aout_stream_Stop(void *func, va_list ap)<br> stop(s);<br> }<br> <br>-static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> aout_sys_t *sys = aout->sys;<br> HRESULT hr;<br>@@ -252,6 +253,7 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br> assert (sys->stream == NULL);<br> sys->stream = s;<br> return 0;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void Stop(audio_output_t *aout)<br>diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp<br>index 597807d163..467dd87d75 100644<br>--- a/modules/video_output/decklink.cpp<br>+++ b/modules/video_output/decklink.cpp<br>@@ -1099,7 +1099,8 @@ static int TimeGet(audio_output_t *, vlc_tick_t* restrict)<br> return -1;<br> }<br> <br>-static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br>+static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt,<br>+ vlc_tick_t *jitter)<br> {<br> decklink_sys_t *sys = (decklink_sys_t *) aout->sys;<br> <br>@@ -1116,6 +1117,7 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)<br> fmt->i_frame_length = FRAME_SIZE;<br> <br> return VLC_SUCCESS;<br>+ VLC_UNUSED(jitter);<br> }<br> <br> static void PlayAudio(audio_output_t *aout, block_t *audio, vlc_tick_t systempts)<br>diff --git a/src/audio_output/output.c b/src/audio_output/output.c<br>index 7c1f90b6ba..3a29c308e7 100644<br>--- a/src/audio_output/output.c<br>+++ b/src/audio_output/output.c<br>@@ -570,7 +570,8 @@ int aout_OutputNew (audio_output_t *aout, audio_sample_format_t *restrict fmt,<br> aout->current_sink_info.headphones = false;<br> <br> aout_OutputLock(aout);<br>- int ret = aout->start(aout, fmt);<br>+ vlc_tick_t jitter = AOUT_MAX_PTS_ADVANCE * 2;<br>+ int ret = aout->start(aout, fmt, &jitter);<br> aout_OutputUnlock(aout);<br> if (ret)<br> {</pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>