From ae23dde1696496a7a60d54f42b298b68cc23c436 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Tue, 10 May 2022 23:35:07 +0200
Subject: [PATCH] hls client: improve video / audio sync

---
 internal/hls/client_audio_processor.go | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/internal/hls/client_audio_processor.go b/internal/hls/client_audio_processor.go
index b54f64c0..a14f40b5 100644
--- a/internal/hls/client_audio_processor.go
+++ b/internal/hls/client_audio_processor.go
@@ -64,20 +64,17 @@ func (p *clientAudioProcessor) doProcess(
 	}
 
 	aus := make([][]byte, 0, len(adtsPkts))
-	pktPts := pts
-	now := time.Now()
+
+	elapsed := time.Since(p.clockStartRTC)
+	if pts > elapsed {
+		select {
+		case <-p.ctx.Done():
+			return fmt.Errorf("terminated")
+		case <-time.After(pts - elapsed):
+		}
+	}
 
 	for _, pkt := range adtsPkts {
-		elapsed := now.Sub(p.clockStartRTC)
-
-		if pktPts > elapsed {
-			select {
-			case <-p.ctx.Done():
-				return fmt.Errorf("terminated")
-			case <-time.After(pktPts - elapsed):
-			}
-		}
-
 		if !p.trackInitialized {
 			p.trackInitialized = true
 
@@ -93,7 +90,6 @@ func (p *clientAudioProcessor) doProcess(
 		}
 
 		aus = append(aus, pkt.AU)
-		pktPts += aac.SamplesPerAccessUnit * time.Second / time.Duration(pkt.SampleRate)
 	}
 
 	p.onData(pts, aus)