NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated download ffmpeg behavior

Browse source
This commit is contained in:
bytedream 2022-02-17 20:23:17 +01:00
parent 22525973c7
commit e7b5a7bf30
2 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
format.go
View file

@ -56,12 +56,12 @@ func (f *Format) Download(downloader Downloader) error {
if downloader.DeleteTempAfter {
defer os.RemoveAll(downloader.TempDir)
}
if err := download(downloader.Context, f, downloader.TempDir, downloader.Goroutines, downloader.OnSegmentDownload); err != nil {
if err := download(downloader.Context, f, downloader.TempDir, downloader.Goroutines, downloader.LockOnSegmentDownload, downloader.OnSegmentDownload); err != nil {
return err
}
if downloader.FFmpeg {
return mergeSegmentsFFmpeg(downloader.Context, downloader.TempDir, downloader.Filename)
if downloader.FFmpegOpts != nil {
return mergeSegmentsFFmpeg(downloader.Context, downloader.TempDir, downloader.Filename, downloader.FFmpegOpts)
} else {
return mergeSegments(downloader.Context, downloader.TempDir, downloader.Filename)
}
@ -116,7 +116,7 @@ func mergeSegments(context context.Context, tempDir string, outputFile string) e
// mergeSegmentsFFmpeg reads every file in tempDir and merges their content to the outputFile
// with ffmpeg (https://ffmpeg.org/).
// The given output file gets created or overwritten if already existing
func mergeSegmentsFFmpeg(context context.Context, tempDir string, outputFile string) error {
func mergeSegmentsFFmpeg(context context.Context, tempDir string, outputFile string, opts []string) error {
dir, err := os.ReadDir(tempDir)
if err != nil {
return err
@ -129,12 +129,21 @@ func mergeSegmentsFFmpeg(context context.Context, tempDir string, outputFile str
for i := 0; i < len(dir); i++ {
fmt.Fprintf(f, "file '%s.ts'\n", filepath.Join(tempDir, strconv.Itoa(i)))
}
cmd := exec.Command("ffmpeg",
// predefined options ... custom options ... predefined output filename
command := []string{
"-f", "concat",
"-safe", "0",
"-i", f.Name(),
"-c", "copy",
outputFile)
}
if opts != nil {
command = append(command, opts...)
}
command = append(command, outputFile)
cmd := exec.Command("ffmpeg",
command...)
if err := cmd.Start(); err != nil {
return err
}
@ -148,6 +157,7 @@ func mergeSegmentsFFmpeg(context context.Context, tempDir string, outputFile str
case err := <-cmdChan:
return err
case <-context.Done():
cmd.Process.Kill()
return context.Err()
}
}