Simplify the Optional comparisons in both ModifyVideoStream and ModifySnapshotStream (project-chip#41956)

yufengwangca · web-flow · commit 88005309b22c · 2025-11-13T08:38:24.000Z
diff --git a/src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.cpp b/src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.cpp
@@ -1004,12 +1004,12 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified = !stream.watermarkEnabled.HasValue() || stream.watermarkEnabled.Value() != waterMarkEnabled.Value();
+                wasModified             = (waterMarkEnabled != stream.watermarkEnabled);
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified       = wasModified || !stream.OSDEnabled.HasValue() || stream.OSDEnabled.Value() != osdEnabled.Value();
+                wasModified       = wasModified || (osdEnabled != stream.OSDEnabled);
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)
@@ -1032,12 +1032,12 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con
             bool wasModified = false;
             if (waterMarkEnabled.HasValue())
             {
-                wasModified = !stream.watermarkEnabled.HasValue() || stream.watermarkEnabled.Value() != waterMarkEnabled.Value();
+                wasModified             = (waterMarkEnabled != stream.watermarkEnabled);
                 stream.watermarkEnabled = waterMarkEnabled;
             }
             if (osdEnabled.HasValue())
             {
-                wasModified       = wasModified || !stream.OSDEnabled.HasValue() || stream.OSDEnabled.Value() != osdEnabled.Value();
+                wasModified       = wasModified || (osdEnabled != stream.OSDEnabled);
                 stream.OSDEnabled = osdEnabled;
             }
             if (wasModified)

Original file line number	Diff line number	Diff line change
`@@ -1004,12 +1004,12 @@ void CameraAVStreamMgmtServer::ModifyVideoStream(const uint16_t streamID, const`
`1004`	`1004`	`bool wasModified = false;`
`1005`	`1005`	`if (waterMarkEnabled.HasValue())`
`1006`	`1006`	`{`
`1007`		`- wasModified = !stream.watermarkEnabled.HasValue() \|\| stream.watermarkEnabled.Value() != waterMarkEnabled.Value();`
	`1007`	`+ wasModified = (waterMarkEnabled != stream.watermarkEnabled);`
`1008`	`1008`	`stream.watermarkEnabled = waterMarkEnabled;`
`1009`	`1009`	`}`
`1010`	`1010`	`if (osdEnabled.HasValue())`
`1011`	`1011`	`{`
`1012`		`- wasModified = wasModified \|\| !stream.OSDEnabled.HasValue() \|\| stream.OSDEnabled.Value() != osdEnabled.Value();`
	`1012`	`+ wasModified = wasModified \|\| (osdEnabled != stream.OSDEnabled);`
`1013`	`1013`	`stream.OSDEnabled = osdEnabled;`
`1014`	`1014`	`}`
`1015`	`1015`	`if (wasModified)`
`@@ -1032,12 +1032,12 @@ void CameraAVStreamMgmtServer::ModifySnapshotStream(const uint16_t streamID, con`
`1032`	`1032`	`bool wasModified = false;`
`1033`	`1033`	`if (waterMarkEnabled.HasValue())`
`1034`	`1034`	`{`
`1035`		`- wasModified = !stream.watermarkEnabled.HasValue() \|\| stream.watermarkEnabled.Value() != waterMarkEnabled.Value();`
	`1035`	`+ wasModified = (waterMarkEnabled != stream.watermarkEnabled);`
`1036`	`1036`	`stream.watermarkEnabled = waterMarkEnabled;`
`1037`	`1037`	`}`
`1038`	`1038`	`if (osdEnabled.HasValue())`
`1039`	`1039`	`{`
`1040`		`- wasModified = wasModified \|\| !stream.OSDEnabled.HasValue() \|\| stream.OSDEnabled.Value() != osdEnabled.Value();`
	`1040`	`+ wasModified = wasModified \|\| (osdEnabled != stream.OSDEnabled);`
`1041`	`1041`	`stream.OSDEnabled = osdEnabled;`
`1042`	`1042`	`}`
`1043`	`1043`	`if (wasModified)`