apps/lpms
1
0
Fork 0
mirror of https://github.com/livepeer/lpms synced 2026-04-23 00:07:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change all scale_cuda to scale_npp

Browse Source
This commit is contained in:
Rafal Leszko
2023-08-30 17:58:17 +00:00
parent ce43742b6c
commit ae7fb48771
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ffmpeg/ffmpeg.go
+2 -2
View File
@@ -461,12 +461,12 @@ func configEncoder(inOpts *TranscodeOptionsIn, outOpts TranscodeOptions) (string
if outDev != "" {
upload = upload + "=device=" + outDev
}
return encoder, upload + ",scale_cuda", nil
return encoder, upload + ",scale_npp", nil
}
case Nvidia:
switch outOpts.Accel {
case Software:
return encoder, "scale_cuda", nil
return encoder, "scale_npp", nil
case Nvidia:
// If we encode on a different device from decode then need to transfer
if outDev != "" && outDev != inDev {
ffmpeg/nvidia_test.go
+2 -2
View File
@@ -550,7 +550,7 @@ func TestNvidia_API_MixedOutput(t *testing.T) {
diff -u $1.md5 ffmpeg_$1.md5
ffmpeg -loglevel warning -i out_$1.ts -c:a aac -ar 44100 -ac 2 \
-vf hwupload_cuda,fps=123,scale_cuda=w=256:h=144 -c:v h264_nvenc \
-vf hwupload_cuda,fps=123,scale_npp=w=256:h=144 -c:v h264_nvenc \
ffmpeg_nv_$1.ts
# sanity check ffmpeg frame count against ours
@@ -640,7 +640,7 @@ func TestNvidia_API_AlternatingTimestamps(t *testing.T) {
diff -u $1.md5 ffmpeg_$1.md5
ffmpeg -loglevel warning -i out_$1.ts -c:a aac -ar 44100 -ac 2 \
-vf hwupload_cuda,fps=123,scale_cuda=w=256:h=144 -c:v h264_nvenc \
-vf hwupload_cuda,fps=123,scale_npp=w=256:h=144 -c:v h264_nvenc \
-muxdelay 0 -copyts \
ffmpeg_nv_$1.ts