mirror of
https://github.com/u2takey/ffmpeg-go.git
synced 2025-10-03 15:16:36 +08:00
Move platform-specific code under build tags; fix corresponding tests
This commit is contained in:
14
ffmpeg_linux_test.go
Normal file
14
ffmpeg_linux_test.go
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
package ffmpeg_go
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCompileWithOptions(t *testing.T) {
|
||||||
|
out := Input("dummy.mp4").Output("dummy2.mp4")
|
||||||
|
cmd := out.Compile(SeparateProcessGroup())
|
||||||
|
assert.Equal(t, cmd.SysProcAttr.Pgid, 0)
|
||||||
|
assert.True(t, cmd.SysProcAttr.Setpgid)
|
||||||
|
}
|
@@ -277,13 +277,6 @@ func TestCompile(t *testing.T) {
|
|||||||
assert.Equal(t, out.Compile().Args, []string{"ffmpeg", "-i", "dummy.mp4", "dummy2.mp4"})
|
assert.Equal(t, out.Compile().Args, []string{"ffmpeg", "-i", "dummy.mp4", "dummy2.mp4"})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCompileWithOptions(t *testing.T) {
|
|
||||||
out := Input("dummy.mp4").Output("dummy2.mp4")
|
|
||||||
cmd := out.Compile(SeparateProcessGroup())
|
|
||||||
assert.Equal(t, cmd.SysProcAttr.Pgid, 0)
|
|
||||||
assert.True(t, cmd.SysProcAttr.Setpgid)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPipe(t *testing.T) {
|
func TestPipe(t *testing.T) {
|
||||||
|
|
||||||
width, height := 32, 32
|
width, height := 32, 32
|
||||||
|
20
ffmpeg_windows_test.go
Normal file
20
ffmpeg_windows_test.go
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package ffmpeg_go
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os/exec"
|
||||||
|
"syscall"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCompileWithOptions(t *testing.T) {
|
||||||
|
out := Input("dummy.mp4").Output("dummy2.mp4")
|
||||||
|
cmd := out.Compile(func(s *Stream, cmd *exec.Cmd) {
|
||||||
|
if cmd.SysProcAttr == nil {
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{}
|
||||||
|
}
|
||||||
|
cmd.SysProcAttr.HideWindow = true
|
||||||
|
})
|
||||||
|
assert.Equal(t, true, cmd.SysProcAttr.HideWindow)
|
||||||
|
}
|
10
run.go
10
run.go
@@ -9,7 +9,6 @@ import (
|
|||||||
"os/exec"
|
"os/exec"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -239,15 +238,6 @@ func (s *Stream) ErrorToStdOut() *Stream {
|
|||||||
|
|
||||||
type CompilationOption func(s *Stream, cmd *exec.Cmd)
|
type CompilationOption func(s *Stream, cmd *exec.Cmd)
|
||||||
|
|
||||||
// SeparateProcessGroup ensures that the command is run in a separate process
|
|
||||||
// group. This is useful to enable handling of signals such as SIGINT without
|
|
||||||
// propagating them to the ffmpeg process.
|
|
||||||
func SeparateProcessGroup() CompilationOption {
|
|
||||||
return func(s *Stream, cmd *exec.Cmd) {
|
|
||||||
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true, Pgid: 0}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *Stream) SetFfmpegPath(path string) *Stream {
|
func (s *Stream) SetFfmpegPath(path string) *Stream {
|
||||||
s.FfmpegPath = path
|
s.FfmpegPath = path
|
||||||
return s
|
return s
|
||||||
|
@@ -140,3 +140,12 @@ func (s *Stream) RunLinux() error {
|
|||||||
|
|
||||||
return cmd.Wait()
|
return cmd.Wait()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SeparateProcessGroup ensures that the command is run in a separate process
|
||||||
|
// group. This is useful to enable handling of signals such as SIGINT without
|
||||||
|
// propagating them to the ffmpeg process.
|
||||||
|
func SeparateProcessGroup() CompilationOption {
|
||||||
|
return func(s *Stream, cmd *exec.Cmd) {
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true, Pgid: 0}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user