astra/Vidio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3 from Jille/cleanups

Browse source 
Two minor cleanups
This commit is contained in:
Alex Eidt 2023-03-17 10:47:35 -07:00 • committed by GitHub
commit 05cff486bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
video.go
View file

@ -24,7 +24,7 @@ type Video struct {
hasstreams bool // Flag storing whether file has additional data streams. hasstreams bool // Flag storing whether file has additional data streams.
framebuffer []byte // Raw frame data. framebuffer []byte // Raw frame data.
metadata map[string]string // Video metadata. metadata map[string]string // Video metadata.
pipe *io.ReadCloser // Stdout pipe for ffmpeg process. pipe io.ReadCloser // Stdout pipe for ffmpeg process.
cmd *exec.Cmd // ffmpeg command. cmd *exec.Cmd // ffmpeg command.
} }
@ -209,7 +209,7 @@ func (video *Video) init() error {
if err != nil { if err != nil {
return err return err
} }
video.pipe = &pipe video.pipe = pipe
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return err return err
@ -232,23 +232,17 @@ func (video *Video) Read() bool {
} }
} }
total := 0 if _, err := io.ReadFull(video.pipe, video.framebuffer); err != nil {
for total < video.width*video.height*video.depth { video.Close()
n, err := (*video.pipe).Read(video.framebuffer[total:]) return false
if err == io.EOF {
video.Close()
return false
}
total += n
} }
return true return true
} }
// Closes the pipe and stops the ffmpeg process. // Closes the pipe and stops the ffmpeg process.
func (video *Video) Close() { func (video *Video) Close() {
if video.pipe != nil { if video.pipe != nil {
(*video.pipe).Close() video.pipe.Close()
} }
if video.cmd != nil { if video.cmd != nil {
video.cmd.Wait() video.cmd.Wait()
@ -263,7 +257,7 @@ func (video *Video) cleanup() {
go func() { go func() {
<-c <-c
if video.pipe != nil { if video.pipe != nil {
(*video.pipe).Close() video.pipe.Close()
} }
if video.cmd != nil { if video.cmd != nil {
video.cmd.Process.Kill() video.cmd.Process.Kill()