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

Refine HW fallback: retry convert once in software

Browse Source
This commit is contained in:
Stu Leak 2025-12-09 11:50:48 -05:00
parent 278c8b8846
commit 4b99fe8029
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.go
View File

@ -1405,10 +1405,13 @@ 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)
hwFallbackTried, _ := cfg["hwFallbackTried"].(bool)
// If a direct conversion is running, wait until it finishes before starting queued jobs. // If a direct conversion is running, wait until it finishes before starting queued jobs.
for s.convertBusy { for s.convertBusy {
@ -6221,22 +6224,13 @@ func (s *appState) startConvert(status *widget.Label, btn, cancelBtn *widget.But
strings.Contains(stderrOutput, "videotoolbox")) strings.Contains(stderrOutput, "videotoolbox"))
if isHardwareFailure && !hwFallbackTried && resolvedAccel != "none" && resolvedAccel != "" { if isHardwareFailure && !hwFallbackTried && resolvedAccel != "none" && resolvedAccel != "" {
accelVal, _ := cfg["hardwareAccel"].(string) s.convert.HardwareAccel = "none"
if accelVal == "" { if logFile != nil {
accelVal = "auto" fmt.Fprintf(logFile, "\nAuto-fallback: retrying with software encoder at %s\n", time.Now().Format(time.RFC3339))
} _ = logFile.Close()
if !strings.EqualFold(accelVal, "none") {
cfg["hardwareAccel"] = "none"
cfg["hwFallbackTried"] = true
job.Config = cfg
s.convert.HardwareAccel = "none"
if logFile != nil {
fmt.Fprintf(logFile, "\nAuto-fallback: retrying with software encoder at %s\n", time.Now().Format(time.RFC3339))
_ = logFile.Close()
}
s.convertCancel = nil
return s.executeConvertJob(ctx, job, progressCallback)
} }
s.convertCancel = nil
return s.executeConvertJobWithFallback(ctx, job, progressCallback, true)
} }
fyne.CurrentApp().Driver().DoFromGoroutine(func() { fyne.CurrentApp().Driver().DoFromGoroutine(func() {