From 9b2f45aa18e9011a6e120347b9f6f046005e7afa Mon Sep 17 00:00:00 2001 From: hagn Date: Mon, 1 May 2023 13:58:59 +0200 Subject: [PATCH] Enable VA-API hardware decoding --- core/transcoder/codecs.go | 6 ++++-- core/transcoder/transcoder_vaapi_test.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/transcoder/codecs.go b/core/transcoder/codecs.go index cb047014c..76d85cca3 100644 --- a/core/transcoder/codecs.go +++ b/core/transcoder/codecs.go @@ -170,6 +170,8 @@ func (c *VaapiCodec) DisplayName() string { // GlobalFlags are the global flags used with this codec in the transcoder. func (c *VaapiCodec) GlobalFlags() string { flags := []string{ + "-hwaccel", "vaapi", + "-hwaccel_output_format", "vaapi", "-vaapi_device", "/dev/dri/renderD128", } @@ -183,7 +185,7 @@ func (c *VaapiCodec) PixelFormat() string { // ExtraFilters are the extra filters required for this codec in the transcoder. func (c *VaapiCodec) ExtraFilters() string { - return "format=nv12,hwupload" + return "" } // ExtraArguments are the extra arguments used with this codec in the transcoder. @@ -232,7 +234,7 @@ func (c *NvencCodec) DisplayName() string { // GlobalFlags are the global flags used with this codec in the transcoder. func (c *NvencCodec) GlobalFlags() string { flags := []string{ - "-hwaccel cuda", + "-hwaccel", "cuda", } return strings.Join(flags, " ") diff --git a/core/transcoder/transcoder_vaapi_test.go b/core/transcoder/transcoder_vaapi_test.go index d85c27174..1523324eb 100644 --- a/core/transcoder/transcoder_vaapi_test.go +++ b/core/transcoder/transcoder_vaapi_test.go @@ -42,7 +42,7 @@ func TestFFmpegVaapiCommand(t *testing.T) { cmd := transcoder.getString() expectedLogPath := filepath.Join("data", "logs", "transcoder.log") - expected := `FFREPORT=file="` + expectedLogPath + `":level=32 ` + transcoder.ffmpegPath + ` -hide_banner -loglevel warning -vaapi_device /dev/dri/renderD128 -fflags +genpts -i fakecontent.flv -map v:0 -c:v:0 h264_vaapi -b:v:0 1008k -maxrate:v:0 1088k -g:v:0 90 -keyint_min:v:0 90 -r:v:0 30 -map a:0? -c:a:0 copy -filter:v:0 "format=nv12,hwupload" -preset veryfast -map v:0 -c:v:1 h264_vaapi -b:v:1 3308k -maxrate:v:1 3572k -g:v:1 72 -keyint_min:v:1 72 -r:v:1 24 -map a:0? -c:a:1 copy -filter:v:1 "format=nv12,hwupload" -preset fast -map v:0 -c:v:2 copy -map a:0? -c:a:2 copy -preset ultrafast -var_stream_map "v:0,a:0 v:1,a:1 v:2,a:2 " -f hls -hls_time 3 -hls_list_size 10 -hls_flags program_date_time+independent_segments+omit_endlist -segment_format_options mpegts_flags=mpegts_copyts=1 -pix_fmt vaapi_vld -sc_threshold 0 -master_pl_name stream.m3u8 -hls_segment_filename http://127.0.0.1:8123/%v/stream-jdofFGg-%d.ts -max_muxing_queue_size 400 -method PUT http://127.0.0.1:8123/%v/stream.m3u8` + expected := `FFREPORT=file="` + expectedLogPath + `":level=32 ` + transcoder.ffmpegPath + ` -hide_banner -loglevel warning -hwaccel vaapi -hwaccel_output_format vaapi -vaapi_device /dev/dri/renderD128 -fflags +genpts -i fakecontent.flv -map v:0 -c:v:0 h264_vaapi -b:v:0 1008k -maxrate:v:0 1088k -g:v:0 90 -keyint_min:v:0 90 -r:v:0 30 -map a:0? -c:a:0 copy -preset veryfast -map v:0 -c:v:1 h264_vaapi -b:v:1 3308k -maxrate:v:1 3572k -g:v:1 72 -keyint_min:v:1 72 -r:v:1 24 -map a:0? -c:a:1 copy -preset fast -map v:0 -c:v:2 copy -map a:0? -c:a:2 copy -preset ultrafast -var_stream_map "v:0,a:0 v:1,a:1 v:2,a:2 " -f hls -hls_time 3 -hls_list_size 10 -hls_flags program_date_time+independent_segments+omit_endlist -segment_format_options mpegts_flags=mpegts_copyts=1 -pix_fmt vaapi_vld -sc_threshold 0 -master_pl_name stream.m3u8 -hls_segment_filename http://127.0.0.1:8123/%v/stream-jdofFGg-%d.ts -max_muxing_queue_size 400 -method PUT http://127.0.0.1:8123/%v/stream.m3u8` if cmd != expected { t.Errorf("ffmpeg command does not match expected.\nGot %s\n, want: %s", cmd, expected)