apps/goffmpeg
1
0
Fork 0
mirror of https://github.com/xfrr/goffmpeg.git synced 2025-10-06 16:36:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added progress check flag, only open stderr if progress required

Browse Source
This commit is contained in:
Rohit Garg
2018-06-29 16:06:54 +05:30
parent 1f5b5dda88
commit 97ab829bed
4 changed files with 50 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@@ -78,10 +78,11 @@ func main() {
# Progress properties
```golang
type Progress struct {
FramesProcessed string
CurrentTime string
CurrentBitrate string
Progress float64
FramesProcessed string
CurrentTime string
CurrentBitrate string
Progress float64
Speed string
}
```
# Media setters

1
models/models.go
View File

@@ -73,6 +73,7 @@ type Progress struct {
CurrentTime string
CurrentBitrate string
Progress float64
Speed string
}
type Tags struct {

20
tests/transcoding_test.go
View File

@@ -31,7 +31,7 @@ func TestTranscoding3GP(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <- done
if err != nil {
t.Error(err)
@@ -52,7 +52,7 @@ func TestTranscodingAVI(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <- done
if err != nil {
t.Error(err)
@@ -73,7 +73,7 @@ func TestTranscodingFLV(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <- done
if err != nil {
t.Error(err)
@@ -94,7 +94,7 @@ func TestTranscodingMKV(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <-done
if err != nil {
t.Error(err)
@@ -115,7 +115,7 @@ func TestTranscodingMOV(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <-done
if err != nil {
t.Error(err)
@@ -136,7 +136,7 @@ func TestTranscodingMPEG(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <-done
if err != nil {
t.Error(err)
@@ -157,7 +157,7 @@ func TestTranscodingOGG(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <- done
if err != nil {
t.Error(err)
@@ -178,7 +178,7 @@ func TestTranscodingWAV(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <- done
if err != nil {
t.Error(err)
@@ -199,7 +199,7 @@ func TestTranscodingWEBM(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <- done
if err != nil {
t.Error(err)
@@ -220,7 +220,7 @@ func TestTranscodingWMV(t *testing.T) {
return
}
done := trans.Run()
done := trans.Run(false)
err = <- done
if err != nil {
t.Error(err)

77
transcoder/transcoder.go
View File

@@ -114,30 +114,26 @@ func (t *Transcoder) Initialize(inputPath string, outputPath string) (error) {
}
func (t *Transcoder) Run() <-chan error {
func (t *Transcoder) Run(progress bool) <-chan error {
done := make(chan error)
command := t.GetCommand()
proc := exec.Command(t.configuration.FfmpegBin, command...)
errStream, err := proc.StderrPipe()
if err != nil {
fmt.Println("Progress not available: "+ err.Error())
} else {
t.SetProcessStderrPipe(errStream)
if progress {
errStream, err := proc.StderrPipe()
if err != nil {
fmt.Println("Progress not available: "+ err.Error())
} else {
t.SetProcessStderrPipe(errStream)
}
}
out := &bytes.Buffer{}
proc.Stdout = out
err = proc.Start()
err := proc.Start()
t.SetProcess(proc)
go func(err error, out *bytes.Buffer, errStream io.ReadCloser) {
defer func() {
if errStream != nil {
errStream.Close()
}
}()
go func(err error, out *bytes.Buffer) {
if err != nil {
done <- fmt.Errorf("Failed Start FFMPEG (%s) with %s, message %s", command, err, out.String())
close(done)
@@ -149,7 +145,7 @@ func (t *Transcoder) Run() <-chan error {
}
done <- err
close(done)
}(err, out, errStream)
}(err, out)
return done
}
@@ -160,30 +156,25 @@ func (t Transcoder) Output() <-chan models.Progress {
go func() {
defer close(out)
if t.stdErrPipe == nil {
out <- models.Progress{}
return
} else {
defer t.stdErrPipe.Close()
}
scanner := bufio.NewScanner(t.stdErrPipe)
filetype := utils.CheckFileType(t.MediaFile().Metadata().Streams)
split := func(data []byte, atEOF bool) (advance int, token []byte, spliterror error) {
if atEOF && len(data) == 0 {
return 0, nil, nil
}
Iframe := strings.Index(string(data), "frame=")
if filetype == "video" {
if Iframe > 0 {
return Iframe + 1, data[Iframe:], nil
}
} else {
if i := bytes.IndexByte(data, '\n'); i >= 0 {
// We have a full newline-terminated line.
return i + 1, data[0:i], nil
}
if i := bytes.IndexByte(data, '\n'); i >= 0 {
// We have a full newline-terminated line.
return i + 1, data[0:i], nil
}
if i := bytes.IndexByte(data, '\r'); i >= 0 {
// We have a cr terminated line
return i + 1, data[0:i], nil
}
if atEOF {
return len(data), data, nil
}
@@ -195,20 +186,18 @@ func (t Transcoder) Output() <-chan models.Progress {
buf := make([]byte, 2)
scanner.Buffer(buf, bufio.MaxScanTokenSize)
var lastProgress float64
for scanner.Scan() {
Progress := new(models.Progress)
line := scanner.Text()
// fmt.Println(line)
if strings.Contains(line, "time=") && strings.Contains(line, "bitrate=") {
if strings.Contains(line, "frame=") && strings.Contains(line, "time=") && strings.Contains(line, "bitrate=") {
var re= regexp.MustCompile(`=\s+`)
st := re.ReplaceAllString(line, `=`)
f := strings.Fields(st)
var framesProcessed string
var currentTime string
var currentBitrate string
var currentSpeed string
for j := 0; j < len(f); j++ {
field := f[j]
@@ -229,23 +218,25 @@ func (t Transcoder) Output() <-chan models.Progress {
if fieldname == "bitrate" {
currentBitrate = fieldvalue
}
if fieldname == "speed" {
currentSpeed = fieldvalue
}
}
}
timesec := utils.DurToSec(currentTime)
dursec, _ := strconv.ParseFloat(t.MediaFile().Metadata().Format.Duration, 64)
// Progress calculation
progress := (timesec * 100) / dursec
Progress.Progress = progress
//live stream check
if dursec != 0 {
// Progress calculation
progress := (timesec * 100) / dursec
Progress.Progress = progress
}
Progress.CurrentBitrate = currentBitrate
Progress.FramesProcessed = framesProcessed
Progress.CurrentTime = currentTime
if progress != lastProgress {
lastProgress = progress
out <- *Progress
}
Progress.Speed = currentSpeed
out <- *Progress
}
}
}()