mirror of
https://github.com/datarhei/core.git
synced 2025-10-19 22:34:43 +08:00
Unify FFmpeg prelude parser, add pid awareness
The progress and probe parser had both their own prelude parsing implementation in case the json variant is not available. Now there's a new package for this implementation that both use. If a program has an ID (in case of srt+mpegts) then this was no recognized by the parser and these inputs/outputs were not detected.
This commit is contained in:
Ingo Oppermann
@@ -2,11 +2,10 @@ package probe
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/datarhei/core/v16/ffmpeg/prelude"
|
||||
"github.com/datarhei/core/v16/log"
|
||||
"github.com/datarhei/core/v16/process"
|
||||
"github.com/datarhei/core/v16/restream/app"
|
||||
@@ -84,128 +83,32 @@ func (p *prober) parseJSON(line string) {
|
||||
}
|
||||
|
||||
func (p *prober) parseDefault() {
|
||||
// Input #0, lavfi, from 'testsrc=size=1280x720:rate=25':
|
||||
// Input #1, lavfi, from 'anullsrc=r=44100:cl=stereo':
|
||||
// Output #0, hls, to './data/testsrc.m3u8':
|
||||
reFormat := regexp.MustCompile(`^Input #([0-9]+), (.*?), (from|to) '([^']+)`)
|
||||
lines := make([]string, len(p.data))
|
||||
|
||||
// Duration: 00:01:02.28, start: 0.000000, bitrate: 5895 kb/s
|
||||
// Duration: N/A, start: 0.000000, bitrate: 5895 kb/s
|
||||
reDuration := regexp.MustCompile(`Duration: ([0-9]+):([0-9]+):([0-9]+)\.([0-9]+)`)
|
||||
for i, line := range p.data {
|
||||
lines[i] = line.Data
|
||||
}
|
||||
|
||||
// Stream #0:0: Video: rawvideo (RGB[24] / 0x18424752), rgb24, 1280x720 [SAR 1:1 DAR 16:9], 25 tbr, 25 tbn, 25 tbc
|
||||
// Stream #1:0: Audio: pcm_u8, 44100 Hz, stereo, u8, 705 kb/s
|
||||
// Stream #0:0: Video: h264 (libx264), yuv420p(progressive), 1280x720 [SAR 1:1 DAR 16:9], q=-1--1, 25 fps, 90k tbn, 25 tbc
|
||||
// Stream #0:1: Audio: aac (LC), 44100 Hz, stereo, fltp, 64 kb/s
|
||||
reStream := regexp.MustCompile(`Stream #([0-9]+):([0-9]+)(?:\(([a-z]+)\))?: (Video|Audio|Subtitle): (.*)`)
|
||||
reStreamCodec := regexp.MustCompile(`^([^\s,]+)`)
|
||||
reStreamVideoPixfmtSize := regexp.MustCompile(`, ([0-9A-Za-z]+)(\([^\)]+\))?, ([0-9]+)x([0-9]+)`)
|
||||
reStreamVideoFPS := regexp.MustCompile(`, ([0-9]+(\.[0-9]+)?) fps`)
|
||||
reStreamAudio := regexp.MustCompile(`, ([0-9]+) Hz, ([^,]+)`)
|
||||
reStreamBitrate := regexp.MustCompile(`, ([0-9]+) kb/s`)
|
||||
inputs, _, _ := prelude.Parse(lines)
|
||||
|
||||
format := ""
|
||||
address := ""
|
||||
var duration float64 = 0.0
|
||||
p.inputs = make([]probeIO, len(inputs))
|
||||
|
||||
for _, line := range p.data {
|
||||
if matches := reFormat.FindStringSubmatch(line.Data); matches != nil {
|
||||
format = matches[2]
|
||||
address = matches[4]
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if matches := reDuration.FindStringSubmatch(line.Data); matches != nil {
|
||||
duration = 0.0
|
||||
|
||||
// hours
|
||||
if x, err := strconv.ParseFloat(matches[1], 64); err == nil {
|
||||
duration += x * 60 * 60
|
||||
}
|
||||
|
||||
// minutes
|
||||
if x, err := strconv.ParseFloat(matches[2], 64); err == nil {
|
||||
duration += x * 60
|
||||
}
|
||||
|
||||
// seconds
|
||||
if x, err := strconv.ParseFloat(matches[3], 64); err == nil {
|
||||
duration += x
|
||||
}
|
||||
|
||||
// fractions
|
||||
if x, err := strconv.ParseFloat(matches[4], 64); err == nil {
|
||||
duration += x / 100
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if matches := reStream.FindStringSubmatch(line.Data); matches != nil {
|
||||
io := probeIO{}
|
||||
|
||||
io.Address = address
|
||||
io.Format = format
|
||||
io.Duration = duration
|
||||
|
||||
if x, err := strconv.ParseUint(matches[1], 10, 64); err == nil {
|
||||
io.Index = x
|
||||
}
|
||||
|
||||
if x, err := strconv.ParseUint(matches[2], 10, 64); err == nil {
|
||||
io.Stream = x
|
||||
}
|
||||
|
||||
io.Language = "und"
|
||||
if len(matches[3]) == 3 {
|
||||
io.Language = matches[3]
|
||||
}
|
||||
|
||||
io.Type = strings.ToLower(matches[4])
|
||||
|
||||
streamDetail := matches[5]
|
||||
|
||||
if matches = reStreamCodec.FindStringSubmatch(streamDetail); matches != nil {
|
||||
io.Codec = matches[1]
|
||||
}
|
||||
|
||||
if matches = reStreamBitrate.FindStringSubmatch(streamDetail); matches != nil {
|
||||
if x, err := strconv.ParseFloat(matches[1], 64); err == nil {
|
||||
io.Bitrate = x
|
||||
}
|
||||
}
|
||||
|
||||
if io.Type == "video" {
|
||||
if matches = reStreamVideoPixfmtSize.FindStringSubmatch(streamDetail); matches != nil {
|
||||
io.Pixfmt = matches[1]
|
||||
|
||||
if x, err := strconv.ParseUint(matches[3], 10, 64); err == nil {
|
||||
io.Width = x
|
||||
}
|
||||
if x, err := strconv.ParseUint(matches[4], 10, 64); err == nil {
|
||||
io.Height = x
|
||||
}
|
||||
}
|
||||
|
||||
if matches = reStreamVideoFPS.FindStringSubmatch(streamDetail); matches != nil {
|
||||
if x, err := strconv.ParseFloat(matches[1], 64); err == nil {
|
||||
io.FPS = x
|
||||
}
|
||||
}
|
||||
|
||||
} else if io.Type == "audio" {
|
||||
if matches = reStreamAudio.FindStringSubmatch(streamDetail); matches != nil {
|
||||
if x, err := strconv.ParseUint(matches[1], 10, 64); err == nil {
|
||||
io.Sampling = x
|
||||
}
|
||||
|
||||
io.Layout = matches[2]
|
||||
}
|
||||
}
|
||||
|
||||
p.inputs = append(p.inputs, io)
|
||||
}
|
||||
for i, input := range inputs {
|
||||
p.inputs[i].Address = input.Address
|
||||
p.inputs[i].Format = input.Format
|
||||
p.inputs[i].Duration = input.Duration
|
||||
p.inputs[i].Index = input.Index
|
||||
p.inputs[i].Stream = input.Stream
|
||||
p.inputs[i].Language = input.Language
|
||||
p.inputs[i].Type = input.Type
|
||||
p.inputs[i].Codec = input.Codec
|
||||
p.inputs[i].Bitrate = input.Bitrate
|
||||
p.inputs[i].Pixfmt = input.Pixfmt
|
||||
p.inputs[i].Width = input.Width
|
||||
p.inputs[i].Height = input.Height
|
||||
p.inputs[i].FPS = input.FPS
|
||||
p.inputs[i].Sampling = input.Sampling
|
||||
p.inputs[i].Layout = input.Layout
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user