add lock, fix srt added through update

livekit · Aug 5, 2024 · c526bd9 · c526bd9
1 parent 1cd3a3a
commit c526bd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/pipeline/controller.go b/pkg/pipeline/controller.go
@@ -265,6 +265,7 @@ func (c *Controller) UpdateStream(ctx context.Context, req *livekit.UpdateStream
 
 	sendUpdate := false
 	errs := errors.ErrArray{}
+	now := time.Now().UnixNano()
 
 	// add stream outputs first
 	for _, rawUrl := range req.AddOutputUrls {
@@ -296,7 +297,9 @@ func (c *Controller) UpdateStream(ctx context.Context, req *livekit.UpdateStream
 			continue
 		}
 
-		// add to output count
+		if o.OutputType != types.OutputTypeRTMP {
+			streamInfo.StartedAt = now
+		}
 		c.OutputCount++
 		sendUpdate = true
 	}

diff --git a/pkg/pipeline/watch.go b/pkg/pipeline/watch.go
@@ -97,6 +97,7 @@ func (c *Controller) gstLog(
 		if function == fnSendCreateStream {
 			streamID := strings.Split(message, "'")[1]
 			if o := c.GetStreamConfig(); o != nil {
+				c.mu.Lock()
 				for url, sID := range o.StreamIDs {
 					if streamID == sID {
 						if streamInfo := o.StreamInfo[url]; streamInfo != nil && streamInfo.StartedAt == 0 {
@@ -105,6 +106,7 @@ func (c *Controller) gstLog(
 						}
 					}
 				}
+				c.mu.Unlock()
 			}
 		}
 		return