Initialize webmsaver with config

iViewer · Jun 3, 2020 · 1b8b11a · 1b8b11a
1 parent a8a540f
commit 1b8b11a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/cmd/avp/main.go b/cmd/avp/main.go
@@ -18,7 +18,10 @@ import (
 func getDefaultElements(id string) map[string]elements.Element {
 	de := make(map[string]elements.Element)
 	if conf.Pipeline.WebmSaver.Enabled && conf.Pipeline.WebmSaver.DefaultOn {
-		webm := elements.NewWebmSaver(id)
+		webm := elements.NewWebmSaver(elements.WebmSaverConfig{
+			ID:   id,
+			Path: conf.Pipeline.WebmSaver.Path,
+		})
 		de[elements.TypeWebmSaver] = webm
 	}
 	return de
@@ -27,7 +30,10 @@ func getDefaultElements(id string) map[string]elements.Element {
 func getTogglableElement(msg proto.ElementInfo) (elements.Element, error) {
 	switch msg.Type {
 	case elements.TypeWebmSaver:
-		return elements.NewWebmSaver(msg.MID), nil
+		return elements.NewWebmSaver(elements.WebmSaverConfig{
+			ID:   msg.MID,
+			Path: conf.Pipeline.WebmSaver.Path,
+		}), nil
 	}
 
 	return nil, errors.New("element not found")

diff --git a/pkg/process/elements/webm.go b/pkg/process/elements/webm.go
@@ -16,16 +16,10 @@ const (
 	TypeWebmSaver = "WebmSaver"
 )
 
-var (
-	config WebmSaverConfig
-)
-
 // WebmSaverConfig .
 type WebmSaverConfig struct {
-	Enabled   bool
-	Togglable bool
-	DefaultOn bool
-	Path      string
+	ID   string
+	Path string
 }
 
 // WebmSaver Module for saving rtp streams to webm
@@ -36,15 +30,10 @@ type WebmSaver struct {
 	audioTimestamp, videoTimestamp uint32
 }
 
-// InitWebmSaver sets initial config
-func InitWebmSaver(c WebmSaverConfig) {
-	config = c
-}
-
 // NewWebmSaver Initialize a new webm saver
-func NewWebmSaver(id string) *WebmSaver {
+func NewWebmSaver(config WebmSaverConfig) *WebmSaver {
 	return &WebmSaver{
-		id:   id,
+		id:   config.ID,
 		path: config.Path,
 	}
 }