Change scale_cuda to scale_npp

livepeer · Aug 31, 2023 · b4d36c9 · b4d36c9
1 parent e8052f0
commit b4d36c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ffmpeg/ffmpeg.go b/ffmpeg/ffmpeg.go
@@ -461,18 +461,18 @@ 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 {
 				return "", "", ErrTranscoderDev // XXX not allowed
 			}
-			return encoder, "scale_cuda", nil
+			return encoder, "scale_npp", nil
 		}
 	case Netint:
 		switch outOpts.Accel {

diff --git a/ffmpeg/nvidia_test.go b/ffmpeg/nvidia_test.go
@@ -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