diff --git a/test/ffmpeg-qsv/encode/av1.py b/test/ffmpeg-qsv/encode/av1.py index d9f51c2e..dfec5847 100644 --- a/test/ffmpeg-qsv/encode/av1.py +++ b/test/ffmpeg-qsv/encode/av1.py @@ -5,6 +5,7 @@ ### 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 @@ -39,7 +40,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile) self.encode() @slash.requires(*have_string_api("av1_qsv")) - @slash.parametrize(*gen_av1_cqp_parameters(spec)) + @slash.parametrize(*gen_av1_cqp_strapi_parameters(spec)) 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) @@ -101,7 +102,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps self.encode() @slash.requires(*have_string_api("av1_qsv")) - @slash.parametrize(*gen_av1_cbr_parameters(spec)) + @slash.parametrize(*gen_av1_cbr_strapi_parameters(spec)) 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) @@ -138,7 +139,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality self.encode() @slash.requires(*have_string_api("av1_qsv")) - @slash.parametrize(*gen_av1_vbr_parameters(spec)) + @slash.parametrize(*gen_av1_vbr_strapi_parameters(spec)) 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) @@ -171,7 +172,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, qp, quality, profile) self.encode() @slash.requires(*have_string_api("av1_qsv")) - @slash.parametrize(*gen_av1_cqp_lp_parameters(spec)) + @slash.parametrize(*gen_av1_cqp_lp_strapi_parameters(spec)) 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) @@ -233,7 +234,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, quality, fps self.encode() @slash.requires(*have_string_api("av1_qsv")) - @slash.parametrize(*gen_av1_cbr_lp_parameters(spec)) + @slash.parametrize(*gen_av1_cbr_lp_strapi_parameters(spec)) 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) @@ -270,7 +271,7 @@ def test_r2r(self, case, gop, bframes, tilecols, tilerows, bitrate, fps, quality self.encode() @slash.requires(*have_string_api("av1_qsv")) - @slash.parametrize(*gen_av1_vbr_lp_parameters(spec)) + @slash.parametrize(*gen_av1_vbr_lp_strapi_parameters(spec)) 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) diff --git a/test/ffmpeg-qsv/encode/avc.py b/test/ffmpeg-qsv/encode/avc.py index 058aa025..261e4a5b 100755 --- a/test/ffmpeg-qsv/encode/avc.py +++ b/test/ffmpeg-qsv/encode/avc.py @@ -5,6 +5,7 @@ ### from ....lib import * +from ....lib.parameters_strapi import * from ....lib.ffmpeg.qsv.util import * from ....lib.ffmpeg.qsv.encoder import AVCEncoderTest, AVCEncoderLPTest from ....lib.ffmpeg.qsv.encoder import StringAPIEncoder @@ -38,7 +39,7 @@ def test_r2r(self, case, gop, slices, bframes, qp, quality, profile): self.encode() @slash.requires(*have_string_api("h264_qsv")) - @slash.parametrize(*gen_avc_cqp_parameters(spec, ['high', 'main', 'baseline'])) + @slash.parametrize(*gen_avc_cqp_strapi_parameters(spec, ['high', 'main', 'baseline'])) def test_strapi(self, case, gop, slices, bframes, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, qp, quality, profile) @@ -70,7 +71,7 @@ def test_r2r(self, case, gop, slices, bframes, qp, quality, profile): self.encode() @slash.requires(*have_string_api("h264_qsv")) - @slash.parametrize(*gen_avc_cqp_lp_parameters(spec, ['high', 'main'])) + @slash.parametrize(*gen_avc_cqp_lp_strapi_parameters(spec, ['high', 'main'])) def test_strapi(self, case, gop, slices, bframes, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, qp, quality, profile) @@ -104,7 +105,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, profile): self.encode() @slash.requires(*have_string_api("h264_qsv")) - @slash.parametrize(*gen_avc_cbr_parameters(spec, ['high', 'main', 'baseline'])) + @slash.parametrize(*gen_avc_cbr_strapi_parameters(spec, ['high', 'main', 'baseline'])) def test_strapi(self, case, gop, slices, bframes, bitrate, fps, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, bitrate, fps, profile) @@ -138,7 +139,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, profile): self.encode() @slash.requires(*have_string_api("h264_qsv")) - @slash.parametrize(*gen_avc_cbr_lp_parameters(spec, ['high', 'main'])) + @slash.parametrize(*gen_avc_cbr_lp_strapi_parameters(spec, ['high', 'main'])) def test_strapi(self, case, gop, slices, bframes, bitrate, fps, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, bitrate, fps, profile) @@ -174,7 +175,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, quality, refs, prof self.encode() @slash.requires(*have_string_api("h264_qsv")) - @slash.parametrize(*gen_avc_vbr_parameters(spec_r2r, ['high', 'main', 'baseline'])) + @slash.parametrize(*gen_avc_vbr_strapi_parameters(spec_r2r, ['high', 'main', 'baseline'])) def test_strapi(self, case, gop, slices, bframes, bitrate, fps, quality, refs, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, bitrate, fps, quality, refs, profile) @@ -228,7 +229,7 @@ def test_tcbrc(self, case, bitrate, fps, profile): self.encode() @slash.requires(*have_string_api("h264_qsv")) - @slash.parametrize(*gen_avc_vbr_lp_parameters(spec, ['high', 'main'])) + @slash.parametrize(*gen_avc_vbr_lp_strapi_parameters(spec, ['high', 'main'])) def test_strapi(self, case, gop, slices, bframes, bitrate, fps, quality, refs, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, bitrate, fps, quality, refs, profile) diff --git a/test/ffmpeg-qsv/encode/hevc.py b/test/ffmpeg-qsv/encode/hevc.py index eabefbd0..72cb293c 100755 --- a/test/ffmpeg-qsv/encode/hevc.py +++ b/test/ffmpeg-qsv/encode/hevc.py @@ -5,6 +5,7 @@ ### from ....lib import * +from ....lib.parameters_strapi import * from ....lib.ffmpeg.qsv.util import * from ....lib.ffmpeg.qsv.encoder import HEVC8EncoderTest, HEVC8EncoderLPTest from ....lib.ffmpeg.qsv.encoder import StringAPIEncoder @@ -38,7 +39,7 @@ def test_r2r(self, case, gop, slices, bframes, qp, quality, profile): self.encode() @slash.requires(*have_string_api("hevc_qsv")) - @slash.parametrize(*gen_hevc_cqp_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cqp_strapi_parameters(spec, ['main'])) def test_strapi(self, case, gop, slices, bframes, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, qp, quality, profile) @@ -70,7 +71,7 @@ def test_r2r(self, case, gop, slices, qp, quality, profile): self.encode() @slash.requires(*have_string_api("hevc_qsv")) - @slash.parametrize(*gen_hevc_cqp_lp_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cqp_lp_strapi_parameters(spec, ['main'])) def test_strapi(self, case, gop, slices, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, qp, quality, profile) @@ -104,7 +105,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, profile): self.encode() @slash.requires(*have_string_api("hevc_qsv")) - @slash.parametrize(*gen_hevc_cbr_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cbr_strapi_parameters(spec, ['main'])) def test_strapi(self, case, gop, slices, bframes, bitrate, fps, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, bitrate, fps, profile) @@ -137,7 +138,7 @@ def test_r2r(self, case, gop, slices, bitrate, fps, profile): self.encode() @slash.requires(*have_string_api("hevc_qsv")) - @slash.parametrize(*gen_hevc_cbr_lp_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cbr_lp_strapi_parameters(spec, ['main'])) def test_strapi(self, case, gop, slices, bitrate, fps, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bitrate, fps, profile) @@ -173,7 +174,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, quality, refs, prof self.encode() @slash.requires(*have_string_api("hevc_qsv")) - @slash.parametrize(*gen_hevc_vbr_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_vbr_strapi_parameters(spec, ['main'])) def test_strapi(self, case, gop, slices, bframes, bitrate, fps, quality, refs, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, bitrate, fps, quality, refs, profile) @@ -211,7 +212,7 @@ def test_r2r(self, case, gop, slices, bitrate, fps, quality, refs, profile): self.encode() @slash.requires(*have_string_api("hevc_qsv")) - @slash.parametrize(*gen_hevc_vbr_lp_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_vbr_lp_strapi_parameters(spec, ['main'])) def test_strapi(self, case, gop, slices, bitrate, fps, quality, refs, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bitrate, fps, quality, refs, profile)