From eeb15773f951ddedb106fe5e2160adfc9304e986 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Tue, 8 Mar 2022 18:13:37 +0100
Subject: [PATCH] hls client: rename ClientParent into ClientLogger

---
 internal/hls/client.go                 | 22 +++++++++-------------
 internal/hls/client_video_processor.go |  8 ++++----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/internal/hls/client.go b/internal/hls/client.go
index b6dda929..6bc7968b 100644
--- a/internal/hls/client.go
+++ b/internal/hls/client.go
@@ -39,8 +39,8 @@ type clientAllocateProcsReq struct {
 	res chan struct{}
 }
 
-// ClientParent is the parent of a Client.
-type ClientParent interface {
+// ClientLogger allows to receive log lines.
+type ClientLogger interface {
 	Log(level logger.Level, format string, args ...interface{})
 }
 
@@ -49,7 +49,7 @@ type Client struct {
 	onTracks    func(gortsplib.Track, gortsplib.Track) error
 	onVideoData func(time.Duration, [][]byte)
 	onAudioData func(time.Duration, [][]byte)
-	parent      ClientParent
+	logger      ClientLogger
 
 	ctx                   context.Context
 	ctxCancel             func()
@@ -86,7 +86,7 @@ func NewClient(
 	onTracks func(gortsplib.Track, gortsplib.Track) error,
 	onVideoData func(time.Duration, [][]byte),
 	onAudioData func(time.Duration, [][]byte),
-	parent ClientParent,
+	logger ClientLogger,
 ) (*Client, error) {
 	primaryPlaylistURL, err := url.Parse(primaryPlaylistURLStr)
 	if err != nil {
@@ -120,7 +120,7 @@ func NewClient(
 		onTracks:           onTracks,
 		onVideoData:        onVideoData,
 		onAudioData:        onAudioData,
-		parent:             parent,
+		logger:             logger,
 		ctx:                ctx,
 		ctxCancel:          ctxCancel,
 		primaryPlaylistURL: primaryPlaylistURL,
@@ -139,10 +139,6 @@ func NewClient(
 	return c, nil
 }
 
-func (c *Client) log(level logger.Level, format string, args ...interface{}) {
-	c.parent.Log(level, format, args...)
-}
-
 // Close closes all the Client resources.
 func (c *Client) Close() {
 	c.ctxCancel()
@@ -177,7 +173,7 @@ func (c *Client) runInner() error {
 						defer c.tracksMutex.RUnlock()
 						c.onVideoData(pts, nalus)
 					},
-					c.parent)
+					c.logger)
 
 				go func() { errChan <- c.videoProc.run() }()
 			}
@@ -293,7 +289,7 @@ func (c *Client) segmentWasDownloaded(ur string) bool {
 }
 
 func (c *Client) downloadPrimaryPlaylist(innerCtx context.Context) (*m3u8.MediaPlaylist, error) {
-	c.log(logger.Debug, "downloading primary playlist %s", c.primaryPlaylistURL)
+	c.logger.Log(logger.Debug, "downloading primary playlist %s", c.primaryPlaylistURL)
 
 	pl, err := c.downloadPlaylist(innerCtx, c.primaryPlaylistURL)
 	if err != nil {
@@ -334,7 +330,7 @@ func (c *Client) downloadPrimaryPlaylist(innerCtx context.Context) (*m3u8.MediaP
 }
 
 func (c *Client) downloadStreamPlaylist(innerCtx context.Context) (*m3u8.MediaPlaylist, error) {
-	c.log(logger.Debug, "downloading stream playlist %s", c.streamPlaylistURL.String())
+	c.logger.Log(logger.Debug, "downloading stream playlist %s", c.streamPlaylistURL.String())
 
 	pl, err := c.downloadPlaylist(innerCtx, c.streamPlaylistURL)
 	if err != nil {
@@ -379,7 +375,7 @@ func (c *Client) downloadSegment(innerCtx context.Context, segmentURI string) ([
 		return nil, err
 	}
 
-	c.log(logger.Debug, "downloading segment %s", u)
+	c.logger.Log(logger.Debug, "downloading segment %s", u)
 	req, err := http.NewRequestWithContext(innerCtx, http.MethodGet, u.String(), nil)
 	if err != nil {
 		return nil, err
diff --git a/internal/hls/client_video_processor.go b/internal/hls/client_video_processor.go
index 03cc323d..1709ffae 100644
--- a/internal/hls/client_video_processor.go
+++ b/internal/hls/client_video_processor.go
@@ -21,7 +21,7 @@ type clientVideoProcessor struct {
 	ctx     context.Context
 	onTrack func(gortsplib.Track) error
 	onData  func(time.Duration, [][]byte)
-	parent  ClientParent
+	logger  ClientLogger
 
 	trackInitialized bool
 	queue            chan clientVideoProcessorData
@@ -34,13 +34,13 @@ func newClientVideoProcessor(
 	ctx context.Context,
 	onTrack func(gortsplib.Track) error,
 	onData func(time.Duration, [][]byte),
-	parent ClientParent,
+	logger ClientLogger,
 ) *clientVideoProcessor {
 	p := &clientVideoProcessor{
 		ctx:     ctx,
 		onTrack: onTrack,
 		onData:  onData,
-		parent:  parent,
+		logger:  logger,
 		queue:   make(chan clientVideoProcessorData, clientQueueSize),
 	}
 
@@ -77,7 +77,7 @@ func (p *clientVideoProcessor) doProcess(
 
 	nalus, err := h264.DecodeAnnexB(data)
 	if err != nil {
-		p.parent.Log(logger.Warn, "unable to decode Annex-B: %s", err)
+		p.logger.Log(logger.Warn, "unable to decode Annex-B: %s", err)
 		return nil
 	}