diff --git a/tests/datasets/test_streaming_video_encoder.py b/tests/datasets/test_streaming_video_encoder.py index 6af2bc797..e2c51db20 100644 --- a/tests/datasets/test_streaming_video_encoder.py +++ b/tests/datasets/test_streaming_video_encoder.py @@ -385,7 +385,8 @@ class TestStreamingVideoEncoder: # Verify codec options include thread tuning for libsvtav1 (lp=…) thread = encoder._threads[f"{OBS_IMAGES}.cam"] - assert "svtav1-params" in thread.codec_options or "threads" in thread.codec_options + codec_opts = thread.video_encoder.get_codec_options(encoder_threads=thread.encoder_threads) + assert "svtav1-params" in codec_opts or "threads" in codec_opts # Feed some frames and finish to ensure it works end-to-end num_frames = 10 diff --git a/tests/datasets/test_video_encoding.py b/tests/datasets/test_video_encoding.py index f21a1cdf7..2cc23d549 100644 --- a/tests/datasets/test_video_encoding.py +++ b/tests/datasets/test_video_encoding.py @@ -378,7 +378,7 @@ class TestGetVideoInfo: def test_merges_encoder_config_as_video_prefixed_entries(self): cfg = VideoEncoderConfig(vcodec="libsvtav1", g=2, crf=30, preset=12) - info = get_video_info(TEST_ARTIFACTS_DIR / "clip_4frames.mp4", camera_encoder=cfg) + info = get_video_info(TEST_ARTIFACTS_DIR / "clip_4frames.mp4", video_encoder=cfg) assert info["video.g"] == 2 assert info["video.crf"] == 30 @@ -391,7 +391,7 @@ class TestGetVideoInfo: def test_stream_derived_keys_take_precedence_over_config(self): cfg = VideoEncoderConfig(vcodec="libsvtav1", pix_fmt="yuv420p") - info = get_video_info(TEST_ARTIFACTS_DIR / "clip_4frames.mp4", camera_encoder=cfg) + info = get_video_info(TEST_ARTIFACTS_DIR / "clip_4frames.mp4", video_encoder=cfg) assert info["video.codec"] # populated from stream, not from config's vcodec assert info["video.pix_fmt"] == "yuv420p" @@ -454,7 +454,7 @@ class TestEncodeVideoFrames: cfg = VideoEncoderConfig(vcodec="libsvtav1", g=4, crf=25, preset=10) video_path = _encode_video(tmp_path / "out.mp4", num_frames=4, fps=30, cfg=cfg) - info = get_video_info(video_path, camera_encoder=cfg) + info = get_video_info(video_path, video_encoder=cfg) # Stream-derived assert info["video.height"] == 64