Commit 89d23df7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

ALSA: correct S/PDIF start timing (fixes #6565)

This is completely untested, but it seems logical.
parent d521b25d
...@@ -580,22 +580,30 @@ static void Play (audio_output_t *aout, block_t *block) ...@@ -580,22 +580,30 @@ static void Play (audio_output_t *aout, block_t *block)
if (state != SND_PCM_STATE_RUNNING) if (state != SND_PCM_STATE_RUNNING)
{ {
delay = block->i_pts - (mdate () + delay); delay = block->i_pts - (mdate () + delay);
if (delay > 0 && aout->format.i_format != VLC_CODEC_SPDIFL) if (delay > 0)
{ {
frames = (delay * aout->format.i_rate) / CLOCK_FREQ; if (aout->format.i_format != VLC_CODEC_SPDIFL)
msg_Dbg (aout, "prepending %ld zeroes", frames); {
frames = (delay * aout->format.i_rate) / CLOCK_FREQ;
void *pad = calloc (frames, aout->format.i_bytes_per_frame); msg_Dbg (aout, "prepending %ld zeroes", frames);
if (likely(pad != NULL))
void *z = calloc (frames, aout->format.i_bytes_per_frame);
if (likely(z != NULL))
{
snd_pcm_writei (pcm, z, frames);
free (z);
delay = 0;
}
}
/* Lame fallback if zero padding does not work */
if (delay > 0)
{ {
snd_pcm_writei (pcm, pad, frames); msg_Dbg (aout, "deferring start (%"PRId64" us)", delay);
free (pad); msleep (delay);
delay = 0;
} }
} }
/* Lame fallback if zero padding does not work */ else
if (delay > 0) msg_Dbg (aout, "starting late (%"PRId64" us)", delay);
mwait (block->i_pts - delay);
} }
else else
aout_TimeReport (aout, block->i_pts - delay); aout_TimeReport (aout, block->i_pts - delay);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment