From 9934c4e04211c8355796e5dad5102c785698b404 Mon Sep 17 00:00:00 2001 From: Focus Luo Date: Tue, 20 Aug 2024 18:13:10 -0700 Subject: [PATCH] [strapi]ffmpeg-qsv av1 using consolidated strapi generators Signed-off-by: Focus Luo --- test/ffmpeg-qsv/encode/av1.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/ffmpeg-qsv/encode/av1.py b/test/ffmpeg-qsv/encode/av1.py index 6df3e323..7dfc0b6b 100644 --- a/test/ffmpeg-qsv/encode/av1.py +++ b/test/ffmpeg-qsv/encode/av1.py @@ -5,7 +5,6 @@ ### from ....lib import * -from ....lib.parameters_strapi import * from ....lib.ffmpeg.qsv.util import * from ....lib.ffmpeg.qsv.encoder import AV1EncoderLPTest, AV1EncoderTest from ....lib.ffmpeg.qsv.encoder import StringAPIEncoder @@ -40,7 +39,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile) self.encode() @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params")) - @slash.parametrize(*gen_av1_cqp_strapi_parameters(spec)) + @slash.parametrize(*gen_av1_cqp_parameters(spec, strapi=True)) def test_strapi(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, bframes, tilecols, tilerows, qp, quality, profile) @@ -102,7 +101,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps self.encode() @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params")) - @slash.parametrize(*gen_av1_cbr_strapi_parameters(spec)) + @slash.parametrize(*gen_av1_cbr_parameters(spec, strapi=True)) def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile) @@ -139,7 +138,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality self.encode() @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params")) - @slash.parametrize(*gen_av1_vbr_strapi_parameters(spec)) + @slash.parametrize(*gen_av1_vbr_parameters(spec, strapi=True)) def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile) @@ -172,7 +171,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile) self.encode() @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params")) - @slash.parametrize(*gen_av1_cqp_lp_strapi_parameters(spec)) + @slash.parametrize(*gen_av1_cqp_lp_parameters(spec, strapi=True)) def test_strapi(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, bframes, tilecols, tilerows, qp, quality, profile) @@ -234,7 +233,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps self.encode() @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params")) - @slash.parametrize(*gen_av1_cbr_lp_strapi_parameters(spec)) + @slash.parametrize(*gen_av1_cbr_lp_parameters(spec, strapi=True)) def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile) @@ -271,7 +270,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality self.encode() @slash.requires(*have_ffmpeg_encoder_options("av1_qsv", "qsv_params")) - @slash.parametrize(*gen_av1_vbr_lp_strapi_parameters(spec)) + @slash.parametrize(*gen_av1_vbr_lp_parameters(spec, strapi=True)) def test_strapi(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality, profile)