Leak_Technologies/VideoTools
Leak_Technologies/VideoTools
2
1
Fork 1
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hardware fallback retry to keep build green

Browse Source
This commit is contained in:
Stu Leak 2025-12-09 13:13:03 -05:00
parent cfccd300b0
commit 9ea55f955e
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.go
View File

@ -1405,10 +1405,6 @@ func (s *appState) jobExecutor(ctx context.Context, job *queue.Job, progressCall
// executeConvertJob executes a conversion job from the queue // executeConvertJob executes a conversion job from the queue
func (s *appState) executeConvertJob(ctx context.Context, job *queue.Job, progressCallback func(float64)) error { func (s *appState) executeConvertJob(ctx context.Context, job *queue.Job, progressCallback func(float64)) error {
return s.executeConvertJobWithFallback(ctx, job, progressCallback, false)
}
func (s *appState) executeConvertJobWithFallback(ctx context.Context, job *queue.Job, progressCallback func(float64), hwFallbackTried bool) error {
cfg := job.Config cfg := job.Config
inputPath := cfg["inputPath"].(string) inputPath := cfg["inputPath"].(string)
outputPath := cfg["outputPath"].(string) outputPath := cfg["outputPath"].(string)
@ -6223,16 +6219,13 @@ func (s *appState) startConvert(status *widget.Label, btn, cancelBtn *widget.But
strings.Contains(stderrOutput, "vaapi") || strings.Contains(stderrOutput, "vaapi") ||
strings.Contains(stderrOutput, "videotoolbox")) strings.Contains(stderrOutput, "videotoolbox"))
if isHardwareFailure && !hwFallbackTried && resolvedAccel != "none" && resolvedAccel != "" { if isHardwareFailure && !strings.EqualFold(s.convert.HardwareAccel, "none") && resolvedAccel != "none" && resolvedAccel != "" {
s.convert.HardwareAccel = "none" s.convert.HardwareAccel = "none"
if logFile != nil { if logFile != nil {
fmt.Fprintf(logFile, "\nAuto-fallback: retrying with software encoder at %s\n", time.Now().Format(time.RFC3339)) fmt.Fprintf(logFile, "\nAuto-fallback: hardware encoder failed; switched to software for next attempt at %s\n", time.Now().Format(time.RFC3339))
_ = logFile.Close() _ = logFile.Close()
} }
s.convertCancel = nil s.convertCancel = nil
if err := s.executeConvertJobWithFallback(ctx, job, progressCallback, true); err == nil {
return
}
} }
fyne.CurrentApp().Driver().DoFromGoroutine(func() { fyne.CurrentApp().Driver().DoFromGoroutine(func() {