WiP

livekit · Sep 29, 2023 · 7afe0fb · 7afe0fb
1 parent 23a7c55
commit 7afe0fb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/livekit/livekit-server v1.4.6-0.20230918194757-8a0d417a8c99
 	github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
-	github.com/livekit/protocol v1.7.3-0.20230928220138-a73f47fb8bc8
+	github.com/livekit/protocol v1.7.3-0.20230929193653-a020215c5c8e
 	github.com/livekit/psrpc v0.3.3
 	github.com/livekit/server-sdk-go v1.0.17-0.20230928233454-b49bf45b164b
 	github.com/pion/rtp v1.8.1

diff --git a/go.sum b/go.sum
@@ -177,8 +177,8 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD
 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
 github.com/livekit/mediatransportutil v0.0.0-20230906055425-e81fd5f6fb3f h1:b4ri7hQESRSzJWzXXcmANG2hJ4HTj5LM01Ekm8lnQmg=
 github.com/livekit/mediatransportutil v0.0.0-20230906055425-e81fd5f6fb3f/go.mod h1:+WIOYwiBMive5T81V8B2wdAc2zQNRjNQiJIcPxMTILY=
-github.com/livekit/protocol v1.7.3-0.20230928220138-a73f47fb8bc8 h1:qgXAnLeeM7O2lnN87XRabwdlb7B537LfpNqBQcdZ4vU=
-github.com/livekit/protocol v1.7.3-0.20230928220138-a73f47fb8bc8/go.mod h1:zbh0QPUcLGOeZeIO/VeigwWWbudz4Lv+Px94FnVfQH0=
+github.com/livekit/protocol v1.7.3-0.20230929193653-a020215c5c8e h1:4Z+XM3ohqxBuyARhQ0Cj8JjAj4XaQDulqPq1Ykvp4BQ=
+github.com/livekit/protocol v1.7.3-0.20230929193653-a020215c5c8e/go.mod h1:zbh0QPUcLGOeZeIO/VeigwWWbudz4Lv+Px94FnVfQH0=
 github.com/livekit/psrpc v0.3.3 h1:+lltbuN39IdaynXhLLxRShgYqYsRMWeeXKzv60oqyWo=
 github.com/livekit/psrpc v0.3.3/go.mod h1:n6JntEg+zT6Ji8InoyTpV7wusPNwGqqtxmHlkNhDN0U=
 github.com/livekit/server-sdk-go v1.0.17-0.20230928233454-b49bf45b164b h1:4rm2CAPOfLG7r7texpyhf0HEE5xvAkFfg+UrcxV4x3U=

diff --git a/pkg/config/output.go b/pkg/config/output.go
@@ -229,7 +229,7 @@ func (p *PipelineConfig) updateImageOutputs(req ImageOutput) error {
 		p.OutputCount++
 		p.FinalizationRequired = true
 
-		p.Info.ImagesResults = append(p.Info.ImagesResults, conf.ImagesInfo)
+		p.Info.ImageResults = append(p.Info.ImageResults, conf.ImagesInfo)
 	}
 
 	return nil

diff --git a/pkg/pipeline/sink/images.go → pkg/pipeline/sink/image.go b/pkg/pipeline/sink/images.go → pkg/pipeline/sink/image.go
@@ -88,7 +88,7 @@ func (s *ImageSink) Start() error {
 }
 
 func (s *ImageSink) handleNewImage(update *imageUpdate) error {
-	s.ImagesInfo.ImagesCount++
+	s.ImagesInfo.ImageCount++
 
 	filename := update.filename
 	ts := s.getImageTime(update.timestamp)

diff --git a/test/room_composite.go b/test/room_composite.go
@@ -38,6 +38,7 @@ func (r *Runner) testRoomComposite(t *testing.T) {
 	r.testRoomCompositeFile(t)
 	r.testRoomCompositeStream(t)
 	r.testRoomCompositeSegments(t)
+	r.testRoomCompositeImages(t)
 	r.testRoomCompositeMulti(t)
 }