diff --git a/src/python_testing/TC_AVSMTestBase.py b/src/python_testing/TC_AVSMTestBase.py index f9618ecc252ded..ec2e8d8638e900 100644 --- 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.user_params.get("minFrameRate", 30), 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 index 7d788e5bdd0b49..7ac952069b582c 100644 --- 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.user_params.get("minFrameRate", 30), 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 index 015ca23cab6172..ad18121b3b9670 100644 --- 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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 index 727c74181b0cb2..9ee474f3e2748b 100644 --- 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.user_params.get("minFrameRate", 30), 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 index 929c21d0e0bb86..e0f6abc405288e 100644 --- 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), 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.user_params.get("minFrameRate", 30), aVideoSensorParams.maxFPS), maxFrameRate=aVideoSensorParams.maxFPS + 10, minResolution=aMinViewportRes, maxResolution=cluster.Structs.VideoResolutionStruct( @@ -638,8 +638,8 @@ async def test_TC_AVSM_2_7(self): asserts.fail("Allocated video streams not cleared") # start initial frame rate range low and gradually increase - minFrameRateConfig = 15 - maxFrameRateConfig = 30 + minFrameRateConfig = self.user_params.get("minFrameRate", 30) + maxFrameRateConfig = minFrameRateConfig + 15 # Try and allocate up to maxConcurrentEncoders. If all these streams are # successfully allocated, the next one should hit a resource exhausted # error. diff --git a/src/python_testing/TC_AVSM_VideoStreamsPersistence.py b/src/python_testing/TC_AVSM_VideoStreamsPersistence.py index ebac30f3c07194..3c216cf4fc0fd9 100644 --- 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.user_params.get("minFrameRate", 30), aVideoSensorParams.maxFPS), maxFrameRate=aVideoSensorParams.maxFPS, minResolution=aMinViewportRes, maxResolution=cluster.Structs.VideoResolutionStruct( @@ -290,7 +290,7 @@ async def test_TC_AVSM_VideoStreamsPersistence(self): asserts.assert_equal(aAllocatedVideoStreams[0].videoCodec, aRateDistortionTradeOffPoints[0].codec, "Video codec does not match") asserts.assert_equal(aAllocatedVideoStreams[0].minFrameRate, - min(15, aVideoSensorParams.maxFPS), + min(self.user_params.get("minFrameRate", 30), aVideoSensorParams.maxFPS), "MinFrameRate does not match") asserts.assert_equal(aAllocatedVideoStreams[0].maxFrameRate, aVideoSensorParams.maxFPS, "MaxFrameRate does not match") diff --git a/src/python_testing/TC_AVSUMTestBase.py b/src/python_testing/TC_AVSUMTestBase.py index 11013bcfcc509e..cd2cb98dc04732 100644 --- 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.user_params.get("minFrameRate", 30), 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 index 0c3d07d78346e4..7c106be5f04c2a 100644 --- 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.user_params.get("minFrameRate", 30), 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 index 68022549f74854..c2043b6208a2b6 100644 --- 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.user_params.get("minFrameRate", 30), 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 index d7e762a3951a93..1878396ac5a62d 100644 --- 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.user_params.get("minFrameRate", 30), 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 index 922c65ca325f3f..deefd573c91546 100644 --- 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.user_params.get("minFrameRate", 30), aVideoSensorParams.maxFPS), maxFrameRate=aVideoSensorParams.maxFPS, minResolution=aMinViewportRes, maxResolution=CameraAvStreamManagement.Structs.VideoResolutionStruct(