From 44c738c7c01c7fd3fd2f031e5f0654efc0fc30a2 Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Tue, 23 Jan 2024 00:28:19 +0000 Subject: [PATCH 1/2] ffmpeg: move back to scale_cuda from scale_npp --- ffmpeg/ffmpeg.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go index 6ed3442dd9..c479fabac4 100755 --- a/ffmpeg/ffmpeg.go +++ b/ffmpeg/ffmpeg.go @@ -9,7 +9,6 @@ import ( "os" "path" "path/filepath" - "runtime" "strconv" "strings" "sync" @@ -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) { From 1b8df0d70135df5b0968e6c860bdc51e420d282f Mon Sep 17 00:00:00 2001 From: Eli Mallon Date: Tue, 23 Jan 2024 00:39:21 +0000 Subject: [PATCH 2/2] install_ffmpeg.sh: use branch --- install_ffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ffmpeg.sh b/install_ffmpeg.sh index d187373cfd..bfe128eae9 100755 --- a/install_ffmpeg.sh +++ b/install_ffmpeg.sh @@ -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 \ No newline at end of file +wget -O - https://raw.githubusercontent.com/livepeer/go-livepeer/eli/no-npp/install_ffmpeg.sh | bash -s $1 \ No newline at end of file