Skip to content

ffmpeg: move back to scale_cuda from scale_npp #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
iameli wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

ffmpeg: move back to scale_cuda from scale_npp #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44c738c
ffmpeg: move back to scale_cuda from scale_npp
iameli Jan 23, 2024
1b8df0d
install_ffmpeg.sh: use branch
iameli Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions ffmpeg/ffmpeg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"os"
"path"
"path/filepath"
"runtime"
"strconv"
"strings"
"sync"
Expand Down Expand Up @@ -1072,21 +1071,11 @@ func ffmpegStrEscape(origStr string) string {
}

func hwScale() string {
if runtime.GOOS == "windows" {
// we don't build windows binaries with CUDA SDK, so need to use scale_cuda instead of scale_npp
return "scale_cuda"
} else {
return "scale_npp"
}
return "scale_cuda"
}

func hwScaleAlgo() string {
if runtime.GOOS == "windows" {
// we don't build windows binaries with CUDA SDK, so need to use the default scale algorithm
return ""
} else {
return "super"
}
return ""
}

func FfmpegSetLogLevel(level int) {
Expand Down
2 changes: 1 addition & 1 deletion install_ffmpeg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
echo 'WARNING: downloading and executing go-livepeer/install_ffmpeg.sh, use it directly in case of issues'
wget -O - https://raw.githubusercontent.com/livepeer/go-livepeer/master/install_ffmpeg.sh | bash -s $1
wget -O - https://raw.githubusercontent.com/livepeer/go-livepeer/eli/no-npp/install_ffmpeg.sh | bash -s $1