From 924695359abac56038b2439f91950d4f58d7cbd9 Mon Sep 17 00:00:00 2001
From: Pradip De <pradipd@google.com>
Date: Thu, 17 Oct 2024 15:50:29 -0700
Subject: [PATCH] Incorporate Spec modifications into the Camera
 AVStreamManagement Cluster xml.

Name changes to Max content buffer size and On screen display names.
Adjust constraints for Min and Max fragment len.
---
 .../camera-av-stream-management-cluster.xml   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml
index 463aa6af03f865..5cbf1d28ec89d3 100644
--- a/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml
@@ -18,7 +18,7 @@ limitations under the License.
 XML generated by Alchemy; DO NOT EDIT.
 Source: src/app_clusters/CameraAVStreamManagement.adoc
 Parameters: in-progress 
-Git: 0.9-fall2024-387-gfd3062545
+Git: 0.9-fall2024-411-g9835b5cd7
 -->
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="General"/>
@@ -127,8 +127,8 @@ Git: 0.9-fall2024-387-gfd3062545
     <item fieldId="6" name="MaxResolution" type="VideoResolutionStruct"/>
     <item fieldId="7" name="MinBitRate" type="int32u" min="1"/>
     <item fieldId="8" name="MaxBitRate" type="int32u" min="1"/>
-    <item fieldId="9" name="MinFragmentLen" type="int16u" default="4000" min="0" max="65500"/>
-    <item fieldId="10" name="MaxFragmentLen" type="int16u" default="4000" min="0" max="65500"/>
+    <item fieldId="9" name="MinFragmentLen" type="int16u" default="4000" max="65500"/>
+    <item fieldId="10" name="MaxFragmentLen" type="int16u" default="4000" max="65500"/>
     <item fieldId="11" name="WatermarkEnabled" type="boolean" optional="true" default="0"/>
     <item fieldId="12" name="OSDEnabled" type="boolean" optional="true" default="0"/>
     <item fieldId="13" name="ReferenceCount" type="int8u" default="0"/>
@@ -143,8 +143,8 @@ Git: 0.9-fall2024-387-gfd3062545
     <item fieldId="3" name="Y2" type="int16u" default="0"/>
   </struct>
 
-  <cluster>
-    <domain name="General"/>
+  <cluster apiMaturity="provisional">
+    <domain name="Cameras"/>
     <name>Camera AV Stream Management</name>
     <code>0x0551</code>
     <define>CAMERA_AV_STREAM_MANAGEMENT_CLUSTER</define>
@@ -172,7 +172,7 @@ Git: 0.9-fall2024-387-gfd3062545
       <feature bit="6" code="WMARK" name="Watermark" summary="Watermark supported">
         <optionalConform/>
       </feature>
-      <feature bit="7" code="OSD" name="On-Screen Display" summary="OSD supported">
+      <feature bit="7" code="OSD" name="OnScreenDisplay" summary="OSD supported">
         <optionalConform/>
       </feature>
       <feature bit="8" code="STOR" name="LocalStorage" summary="Local Storage available">
@@ -187,7 +187,7 @@ Git: 0.9-fall2024-387-gfd3062545
     <attribute code="0x0003" side="server" define="NIGHT_VISION_CAPABLE" type="boolean" reportable="true" optional="true">NightVisionCapable</attribute>
     <attribute code="0x0004" side="server" define="MIN_VIEWPORT" type="VideoResolutionStruct" reportable="true" optional="true">MinViewport</attribute>
     <attribute code="0x0005" side="server" define="RATE_DISTORTION_TRADE_OFF_POINTS" type="array" entryType="RateDistortionTradeOffPointsStruct" reportable="true" optional="true">RateDistortionTradeOffPoints</attribute>
-    <attribute code="0x0006" side="server" define="MAX_PRE_ROLL_BUFFER_SIZE" type="int32u" reportable="true" optional="true">MaxPreRollBufferSize</attribute>
+    <attribute code="0x0006" side="server" define="MAX_CONTENT_BUFFER_SIZE" type="int32u" reportable="true" optional="true">MaxContentBufferSize</attribute>
     <attribute code="0x0007" side="server" define="MICROPHONE_CAPABILITIES" type="AudioCapabilitiesStruct" reportable="true" optional="true">MicrophoneCapabilities</attribute>
     <attribute code="0x0008" side="server" define="SPEAKER_CAPABILITIES" type="AudioCapabilitiesStruct" reportable="true" optional="true">SpeakerCapabilities</attribute>
     <attribute code="0x0009" side="server" define="TWO_WAY_TALK_SUPPORT" type="TwoWayTalkSupportTypeEnum" reportable="true" min="0x00" max="0x02" optional="true">TwoWayTalkSupport</attribute>
@@ -345,8 +345,8 @@ Git: 0.9-fall2024-387-gfd3062545
       <arg id="6" name="MaxResolution" type="VideoResolutionStruct"/>
       <arg id="7" name="MinBitRate" type="int32u" min="1"/>
       <arg id="8" name="MaxBitRate" type="int32u" min="1"/>
-      <arg id="9" name="MinFragmentLen" type="int16u" default="4000" min="0" max="65500"/>
-      <arg id="10" name="MaxFragmentLen" type="int16u" default="4000" min="0" max="65500"/>
+      <arg id="9" name="MinFragmentLen" type="int16u" default="4000" max="65500"/>
+      <arg id="10" name="MaxFragmentLen" type="int16u" default="4000" max="65500"/>
       <arg id="11" name="WatermarkEnabled" type="boolean" optional="true" default="0"/>
       <arg id="12" name="OSDEnabled" type="boolean" optional="true" default="0"/>
     </command>
@@ -447,8 +447,8 @@ Git: 0.9-fall2024-387-gfd3062545
       <field id="6" name="MaxResolution" type="VideoResolutionStruct" optional="true"/>
       <field id="7" name="MinBitRate" type="int32u" optional="true" min="1"/>
       <field id="8" name="MaxBitRate" type="int32u" optional="true" min="1"/>
-      <field id="9" name="MinFragmentLen" type="int16u" optional="true" min="0" max="65500"/>
-      <field id="10" name="MaxFragmentLen" type="int16u" optional="true" min="0" max="65500"/>
+      <field id="9" name="MinFragmentLen" type="int16u" optional="true" max="65500"/>
+      <field id="10" name="MaxFragmentLen" type="int16u" optional="true" max="65500"/>
       <description>This event SHALL be generated when there is a modification in the corresponding video stream.</description>
     </event>