[strapi]ffmpeg-qsv av1 using consolidated strapi generators

Signed-off-by: Focus Luo <[email protected]>
intel · Aug 21, 2024 · 9934c4e · 9934c4e
1 parent b38cb90
commit 9934c4e
Showing 1 changed file with 6 additions and 7 deletions.
diff --git 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)