Apply suggestions from code review

Co-authored-by: Copilot <[email protected]>

Author: pidarped

src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.cpp

@@ -1004,12 +1004,15 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified             = (stream.watermarkEnabled != waterMarkEnabled);
+                wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) ||
+                    (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&
+                     stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified       = wasModified || (stream.OSDEnabled != osdEnabled);
+                wasModified = wasModified || (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) ||
+                    (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)
@@ -1032,12 +1035,15 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified             = (stream.watermarkEnabled != waterMarkEnabled);
+                wasModified = (stream.watermarkEnabled.HasValue() != waterMarkEnabled.HasValue()) ||
+                    (stream.watermarkEnabled.HasValue() && waterMarkEnabled.HasValue() &&
+                     stream.watermarkEnabled.Value() != waterMarkEnabled.Value());
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified       = wasModified || (stream.OSDEnabled != osdEnabled);
+                wasModified = wasModified || (stream.OSDEnabled.HasValue() != osdEnabled.HasValue()) ||
+                    (stream.OSDEnabled.HasValue() && osdEnabled.HasValue() && stream.OSDEnabled.Value() != osdEnabled.Value());
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)

src/python_testing/TC_AVSM_2_3.py

@@ -189,8 +189,8 @@ async def test_TC_AVSM_2_3(self):
 
         self.step(7)
         if aHardwareEncoder:
-            expected_wmark = not aWmark
-            expected_osd = not aOSD
+            expected_wmark = None if aWmark is None else not aWmark,
+            expected_osd = None if aOSD is None else not aOSD,
             sub_handler.await_all_expected_report_matches(expected_matchers=[wmark_osd_matcher(
                 attr.AllocatedSnapshotStreams, expected_wmark, expected_osd, wmarkSupport, osdSupport)], timeout_sec=20)
 

src/python_testing/TC_AVSM_2_8.py

@@ -160,7 +160,7 @@ async def test_TC_AVSM_2_8(self):
             pass
 
         self.step(5)
-        # Establish subscription to AllocatedSnapshotStreams
+        # Establish subscription to AllocatedVideoStreams
         sub_handler = AttributeSubscriptionHandler(cluster, attr.AllocatedVideoStreams)
         await sub_handler.start(self.default_controller, self.dut_node_id, endpoint=endpoint, min_interval_sec=0, max_interval_sec=30, keepSubscriptions=False)
 
@@ -179,8 +179,8 @@ async def test_TC_AVSM_2_8(self):
             pass
 
         self.step(7)
-        expected_wmark = not aWmark
-        expected_osd = not aOSD
+        expected_wmark = None if aWmark is None else not aWmark
+        expected_osd = None if aOSD is None else not aOSD
         sub_handler.await_all_expected_report_matches(expected_matchers=[wmark_osd_matcher(
             attr.AllocatedVideoStreams, expected_wmark, expected_osd, wmarkSupport, osdSupport)], timeout_sec=20)