From 74b7001500c0901b095986fafe7dca3e5c23c7f2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Mar 2014 15:23:03 +0100 Subject: encode: don't access ao->pts This field will be moved out of the ao struct. The encoding code was basically using an invalid way of accessing this field. Since the AO will be moved into its own thread too and will do its own buffering, the AO and the playback core might not even agree which sample a PTS timestamp belongs to. Add some extrapolation code to handle this case. --- audio/out/ao_lavc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'audio') diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index 359fbae0fa..9a2df7be22 100644 --- a/audio/out/ao_lavc.c +++ b/audio/out/ao_lavc.c @@ -320,7 +320,6 @@ static int play(struct ao *ao, void **data, int samples, int flags) struct encode_lavc_context *ectx = ao->encode_lavc_ctx; int bufpos = 0; double nextpts; - double pts = ao->pts; double outpts; if (!encode_lavc_start(ectx)) { @@ -328,6 +327,10 @@ static int play(struct ao *ao, void **data, int samples, int flags) return 0; } + double pts = ectx->last_audio_in_pts; + pts += ectx->samples_since_last_pts / ao->samplerate; + ectx->samples_since_last_pts += samples; + size_t num_planes = af_fmt_is_planar(ao->format) ? ao->channels.num : 1; if (flags & AOPLAY_FINAL_CHUNK) { -- cgit v1.2.3