ENT-1686: Set FFmpeg stimeout and timeout independently

A legacy env with only stimeout would skip timeout, which FFmpeg 5+ actually
uses. Fill whichever key is missing.

Author: NVergunst-ROBO

inference/core/interfaces/camera/rtsp_opencv_tls.py

@@ -99,9 +99,10 @@ def build_opencv_ffmpeg_capture_options(video: Union[str, int]) -> Optional[str]
     merged = _parse_opencv_ffmpeg_capture_options(existing or "")
     for key, value in overrides.items():
         merged[key] = value
-    if "stimeout" not in merged and "timeout" not in merged:
-        timeout_value = str(_RTSPS_OPEN_TIMEOUT_US)
+    timeout_value = str(_RTSPS_OPEN_TIMEOUT_US)
+    if "stimeout" not in merged:
         merged["stimeout"] = timeout_value
+    if "timeout" not in merged:
         merged["timeout"] = timeout_value
     return _format_opencv_ffmpeg_capture_options(merged)
 

tests/inference/unit_tests/core/interfaces/camera/test_rtsp_opencv_tls.py

@@ -96,10 +96,21 @@ def test_build_options_merges_existing_env(
     got = build_opencv_ffmpeg_capture_options("rtsps://cam/stream")
     assert got is not None
     assert "stimeout;5000000" in got
+    assert "timeout;5000000" in got
     assert "rtsp_transport;tcp" in got
     assert "tls_verify;1" in got
 
 
+def test_build_options_fills_stimeout_when_only_timeout_present(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv(OPENCV_FFMPEG_CAPTURE_OPTIONS_ENV_VAR, "timeout;5000000")
+    got = build_opencv_ffmpeg_capture_options("rtsps://cam/stream")
+    assert got is not None
+    assert "stimeout;5000000" in got
+    assert "timeout;5000000" in got
+
+
 def test_rtsp_tls_validation_flags_gstreamer_suffix(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None: