Merge branch 'master' into dependabot/github_actions/actions/checkout…

…-4.2.1

lib/parameters.py

@@ -750,6 +750,19 @@ def gen_jpeg_cqp_parameters(spec):
   params = gen_jpeg_cqp_variants(spec)
   return keys, params
 
+def gen_jpeg_seek_variants(spec):
+  for case, params in spec.items():
+    variants = params.get("variants", dict()).get("seek", [])
+    for variant in variants:
+      yield [
+        case, variant.get("fps", 25), variant.get("seek", 1)
+      ]
+
+def gen_jpeg_seek_parameters(spec):
+  keys = ("case", "fps", "seek")
+  params = gen_jpeg_seek_variants(spec)
+  return keys, params
+
 def gen_vp8_cqp_variants(spec):
   for case, params in spec.items():
     variants = params.get("variants", dict()).get("cqp", None)
@@ -952,6 +965,7 @@ def gen_vp9_seek_lp_parameters(spec):
 gen_avc_seek_lp_parameters = gen_vp9_seek_lp_parameters
 gen_av1_seek_parameters = gen_vp9_seek_parameters
 gen_av1_seek_lp_parameters = gen_vp9_seek_lp_parameters
+gen_mpeg2_seek_parameters = gen_vp9_seek_parameters
 
 def gen_av1_cqp_variants(spec, strapi=False):
   for case, params in spec.items():

test/ffmpeg-qsv/encode/jpeg.py

@@ -31,3 +31,18 @@ def test_r2r(self, case, quality):
     self.init(spec_r2r, case, quality)
     vars(self).setdefault("r2r", 5)
     self.encode()
+
+class seek(JPEGEncoderTest):
+  def init(self, tspec, case, fps, seek):
+    vars(self).update(tspec[case].copy())
+    vars(self).update(
+      case      = case,
+      rcmode    = "cqp",
+      fps       = fps,
+      seek      = seek,
+    )
+
+  @slash.parametrize(*gen_jpeg_seek_parameters(spec))
+  def test(self, case, fps, seek):
+    self.init(spec, case, fps, seek)
+    self.encode()

test/ffmpeg-qsv/encode/mpeg2.py

@@ -33,3 +33,21 @@ def test_r2r(self, case, gop, bframes, qp, quality):
     self.init(spec_r2r, case, gop, bframes, qp, quality)
     vars(self).setdefault("r2r", 5)
     self.encode()
+
+class seek(MPEG2EncoderTest):
+  def init(self, tspec, case, rcmode, bitrate, maxrate, fps, seek):
+    vars(self).update(tspec[case].copy())
+    vars(self).update(
+      case      = case,
+      bitrate   = bitrate,
+      maxrate   = maxrate,
+      minrate   = bitrate,
+      rcmode    = rcmode,
+      fps       = fps,
+      seek      = seek,
+    )
+
+  @slash.parametrize(*gen_mpeg2_seek_parameters(spec))
+  def test(self, case, rcmode, bitrate, maxrate, fps, seek):
+    self.init(spec, case, rcmode, bitrate, maxrate, fps, seek)
+    self.encode()