Make minimum frame rate configurable in Python WebRTC/AVSM tests

pidarped · pidarped · commit c93232ed830b · 2026-06-03T11:25:32.000-07:00
- Add `--min-frame-rate` command-line argument to the test runner (default: 30).
- Update `MatterTestConfig` to store `min_frame_rate`.
- Update all Python test scripts and helper classes that had hardcoded `minFrameRate=15` to use `self.matter_test_config.min_frame_rate` instead.
- This allows users to customize the minimum frame rate used during video stream allocation.
diff --git a/src/python_testing/TC_AVSMTestBase.py b/src/python_testing/TC_AVSMTestBase.py
@@ -210,7 +210,7 @@ async def precondition_one_allocated_video_stream(self, streamUsage: Globals.Enu
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=streamUsage,
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_AVSM_2_11.py b/src/python_testing/TC_AVSM_2_11.py
@@ -263,7 +263,7 @@ async def test_TC_AVSM_2_11(self):
                 videoStreamAllocateCmd = commands.VideoStreamAllocate(
                     streamUsage=aStreamUsagePriorities[0],
                     videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                    minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                    minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                     maxFrameRate=aVideoSensorParams.maxFPS,
                     minResolution=aMinViewportRes,
                     maxResolution=cluster.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_AVSM_2_13.py b/src/python_testing/TC_AVSM_2_13.py
@@ -188,7 +188,7 @@ async def test_TC_AVSM_2_13(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportResolution,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -222,7 +222,7 @@ async def test_TC_AVSM_2_13(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportResolution,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_AVSM_2_18.py b/src/python_testing/TC_AVSM_2_18.py
@@ -137,7 +137,7 @@ async def test_TC_AVSM_2_18(self):
         min_resolution = min_viewport_resolution
         min_bit_rate = trade_off_point.minBitRate
         max_bit_rate = trade_off_point.minBitRate
-        min_frame_rate = min(15, video_sensor_params.maxFPS)
+        min_frame_rate = min(self.matter_test_config.min_frame_rate, video_sensor_params.maxFPS)
         max_frame_rate = video_sensor_params.maxFPS
         key_frame_interval = 4000
 
diff --git a/src/python_testing/TC_AVSM_2_7.py b/src/python_testing/TC_AVSM_2_7.py
@@ -259,7 +259,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -293,7 +293,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -370,7 +370,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=outOfConstraintStreamUsage,
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -403,7 +403,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=notSupportedStreamUsage,
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -486,7 +486,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -513,7 +513,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -540,7 +540,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -567,7 +567,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=10,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
@@ -594,7 +594,7 @@ async def test_TC_AVSM_2_7(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS + 10,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_AVSM_VideoStreamsPersistence.py b/src/python_testing/TC_AVSM_VideoStreamsPersistence.py
@@ -197,7 +197,7 @@ async def test_TC_AVSM_VideoStreamsPersistence(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_AVSUMTestBase.py b/src/python_testing/TC_AVSUMTestBase.py
@@ -265,7 +265,7 @@ async def video_stream_allocate_command(self, endpoint, expected_status: Status
             response = await self.send_single_cmd(cmd=Clusters.CameraAvStreamManagement.Commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=Clusters.CameraAvStreamManagement.Structs.VideoResolutionStruct(width=aVideoSensorParams.sensorWidth,
diff --git a/src/python_testing/TC_PAVSTTestBase.py b/src/python_testing/TC_PAVSTTestBase.py
@@ -137,7 +137,7 @@ async def allocate_one_video_stream(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=aStreamUsagePriorities[0],
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewport,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_WEBRTCPTestBase.py b/src/python_testing/TC_WEBRTCPTestBase.py
@@ -138,7 +138,7 @@ async def allocate_one_video_stream(self):
             videoStreamAllocateCmd = commands.VideoStreamAllocate(
                 streamUsage=Globals.Enums.StreamUsageEnum.kLiveView,
                 videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                 maxFrameRate=aVideoSensorParams.maxFPS,
                 minResolution=aMinViewportRes,
                 maxResolution=cluster.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_WEBRTC_1_5.py b/src/python_testing/TC_WEBRTC_1_5.py
@@ -185,7 +185,7 @@ async def allocate_video_stream(self, endpoint):
                 cmd=CameraAvStreamManagement.Commands.VideoStreamAllocate(
                     streamUsage=aStreamUsagePriorities[0],
                     videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                    minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                    minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                     maxFrameRate=aVideoSensorParams.maxFPS,
                     minResolution=aMinViewportRes,
                     maxResolution=CameraAvStreamManagement.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/TC_WEBRTC_Utils.py b/src/python_testing/TC_WEBRTC_Utils.py
@@ -91,7 +91,7 @@ async def allocate_video_stream(self, endpoint, devCtrl=None, node_id=None):
                 cmd=CameraAvStreamManagement.Commands.VideoStreamAllocate(
                     streamUsage=aStreamUsagePriorities[0],
                     videoCodec=aRateDistortionTradeOffPoints[0].codec,
-                    minFrameRate=min(15, aVideoSensorParams.maxFPS),
+                    minFrameRate=min(self.matter_test_config.min_frame_rate, aVideoSensorParams.maxFPS),
                     maxFrameRate=aVideoSensorParams.maxFPS,
                     minResolution=aMinViewportRes,
                     maxResolution=CameraAvStreamManagement.Structs.VideoResolutionStruct(
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/matter_test_config.py b/src/python_testing/matter_testing_infrastructure/matter/testing/matter_test_config.py
@@ -102,3 +102,4 @@ class MatterTestConfig:
 
     # Debug mode to capture attribute dump at end of test modules
     debug: bool = False
+    min_frame_rate: int = 30
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/runner.py b/src/python_testing/matter_testing_infrastructure/matter/testing/runner.py
@@ -789,6 +789,7 @@ def convert_args_to_matter_config(args: argparse.Namespace):
     config.endpoint = args.endpoint  # This can be None, the get_endpoint function allows the tests to supply a default
     config.restart_flag_file = args.restart_flag_file
     config.debug = args.debug
+    config.min_frame_rate = args.min_frame_rate
 
     # Map CLI arg to the current config field name used by tests
     config.pipe_name = args.app_pipe
@@ -975,6 +976,8 @@ def parse_matter_test_args(argv: Optional[list[str]] = None):
                              help="The full path of the file to use to signal a restart to the app")
     basic_group.add_argument('--debug', action="store_true", default=False,
                              help="Run the script in debug mode. This is needed to capture attribute dump at end of test modules if there are problems found during testing.")
+    basic_group.add_argument('--min-frame-rate', type=int, default=30,
+                             help='Minimum frame rate for video stream allocation (default: 30)')
     basic_group.add_argument('--timeout', type=int, help="Test timeout in seconds")
     basic_group.add_argument("--PICS", help="PICS file path", type=str)
 
