From b38cb90110ad4255590a5f37c0fbc2b1f54540a2 Mon Sep 17 00:00:00 2001 From: Focus Luo Date: Tue, 20 Aug 2024 18:12:06 -0700 Subject: [PATCH] [strapi]ffmpeg-qsv hevc using consolidated strapi generators Signed-off-by: Focus Luo --- test/ffmpeg-qsv/encode/hevc.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/ffmpeg-qsv/encode/hevc.py b/test/ffmpeg-qsv/encode/hevc.py index 67899d13..90861ec1 100755 --- a/test/ffmpeg-qsv/encode/hevc.py +++ b/test/ffmpeg-qsv/encode/hevc.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 HEVC8EncoderTest, HEVC8EncoderLPTest from ....lib.ffmpeg.qsv.encoder import StringAPIEncoder @@ -39,11 +38,10 @@ def test_r2r(self, case, gop, slices, bframes, qp, quality, profile): self.encode() @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params")) - @slash.parametrize(*gen_hevc_cqp_strapi_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cqp_parameters(spec, ['main'], strapi=True)) def test_strapi(self, case, gop, slices, bframes, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bframes, qp, quality, profile) - self.EncoderClass = StringAPIEncoder self.encode() class cqp_lp(HEVC8EncoderLPTest): @@ -71,7 +69,7 @@ def test_r2r(self, case, gop, slices, qp, quality, profile): self.encode() @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params")) - @slash.parametrize(*gen_hevc_cqp_lp_strapi_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cqp_lp_parameters(spec, ['main'], strapi=True)) def test_strapi(self, case, gop, slices, qp, quality, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, qp, quality, profile) @@ -105,7 +103,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, profile): self.encode() @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params")) - @slash.parametrize(*gen_hevc_cbr_strapi_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cbr_parameters(spec, ['main'], strapi=True)) 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 +136,7 @@ def test_r2r(self, case, gop, slices, bitrate, fps, profile): self.encode() @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params")) - @slash.parametrize(*gen_hevc_cbr_lp_strapi_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_cbr_lp_parameters(spec, ['main'], strapi=True)) def test_strapi(self, case, gop, slices, bitrate, fps, profile): self.EncoderClass = StringAPIEncoder self.init(spec, case, gop, slices, bitrate, fps, profile) @@ -174,7 +172,7 @@ def test_r2r(self, case, gop, slices, bframes, bitrate, fps, quality, refs, prof self.encode() @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params")) - @slash.parametrize(*gen_hevc_vbr_strapi_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_vbr_parameters(spec, ['main'], strapi=True)) 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) @@ -212,7 +210,7 @@ def test_r2r(self, case, gop, slices, bitrate, fps, quality, refs, profile): self.encode() @slash.requires(*have_ffmpeg_encoder_options("hevc_qsv", "qsv_params")) - @slash.parametrize(*gen_hevc_vbr_lp_strapi_parameters(spec, ['main'])) + @slash.parametrize(*gen_hevc_vbr_lp_parameters(spec, ['main'], strapi=True)) 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)