update

admpub · admpub · commit a354e6a22f03 · 2022-02-12T19:55:19.000+08:00
diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go
@@ -263,7 +263,41 @@ func (t *Transcoder) GetMetadata() (transcoder.Metadata, error) {
 		if err = json.Unmarshal(outb.Bytes(), &metadata); err != nil {
 			return nil, err
 		}
-
+		metadata.Infos = map[string]string{}
+		reader := bufio.NewReader(&errb)
+		var prefix string
+		var hasMetadata bool
+		for {
+			byteLine, isPrefix, err := reader.ReadLine()
+			if err != nil && err != io.EOF {
+				return metadata, err
+			}
+			line := string(byteLine)
+			if isPrefix {
+				prefix += line
+				continue
+			}
+			line = prefix + line
+			line = strings.TrimLeft(line, ` `)
+			if !hasMetadata {
+				if strings.HasPrefix(line, `Metadata:`) {
+					hasMetadata = true
+				}
+			} else {
+				parts := strings.SplitN(line, `:`, 2)
+				if len(parts) == 2 {
+					parts[0] = strings.TrimRight(parts[0], ` `)
+					if len(parts[0]) > 0 && parts[0] != `Metadata:` {
+						parts[1] = strings.TrimSpace(parts[1])
+						metadata.Infos[parts[0]] = parts[1]
+					}
+				}
+			}
+			prefix = ""
+			if err == io.EOF {
+				break
+			}
+		}
 		t.metadata = metadata
 
 		return metadata, nil
diff --git a/ffmpeg/metadata.go b/ffmpeg/metadata.go
@@ -4,8 +4,9 @@ import "github.com/admpub/transcoder"
 
 // Metadata ...
 type Metadata struct {
-	Format  Format    `json:"format"`
-	Streams []Streams `json:"streams"`
+	Format  Format            `json:"format"`
+	Streams []Streams         `json:"streams"`
+	Infos   map[string]string `json:"infos"`
 }
 
 // Format ...
