Corresponding ZAP Autogen code changes.

project-chip · Oct 18, 2024 · b2ae1a0 · b2ae1a0
1 parent 9246953
commit b2ae1a0
Show file tree

Hide file tree

Showing 25 changed files with 83 additions and 83 deletions.
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -9535,7 +9535,7 @@ provisional cluster ZoneManagement = 1360 {
 }
 
 /** The Camera AV Stream Management cluster is used to allow clients to manage, control, and configure various audio, video, and snapshot streams on a camera. */
-cluster CameraAvStreamManagement = 1361 {
+provisional cluster CameraAvStreamManagement = 1361 {
  revision 1;
 
  enum AudioCodecEnum : enum8 {
@@ -9703,7 +9703,7 @@ cluster CameraAvStreamManagement = 1361 {
  readonly attribute optional boolean nightVisionCapable = 3;
  readonly attribute optional VideoResolutionStruct minViewport = 4;
  readonly attribute optional RateDistortionTradeOffPointsStruct rateDistortionTradeOffPoints[] = 5;
- readonly attribute optional int32u maxPreRollBufferSize = 6;
+ readonly attribute optional int32u maxContentBufferSize = 6;
  readonly attribute optional AudioCapabilitiesStruct microphoneCapabilities = 7;
  readonly attribute optional AudioCapabilitiesStruct speakerCapabilities = 8;
  readonly attribute optional TwoWayTalkSupportTypeEnum twoWayTalkSupport = 9;

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
@@ -59970,7 +59970,7 @@ public static class CameraAvStreamManagementCluster extends BaseChipCluster {
  private static final long NIGHT_VISION_CAPABLE_ATTRIBUTE_ID = 3L;
  private static final long MIN_VIEWPORT_ATTRIBUTE_ID = 4L;
  private static final long RATE_DISTORTION_TRADE_OFF_POINTS_ATTRIBUTE_ID = 5L;
- private static final long MAX_PRE_ROLL_BUFFER_SIZE_ATTRIBUTE_ID = 6L;
+ private static final long MAX_CONTENT_BUFFER_SIZE_ATTRIBUTE_ID = 6L;
  private static final long MICROPHONE_CAPABILITIES_ATTRIBUTE_ID = 7L;
  private static final long SPEAKER_CAPABILITIES_ATTRIBUTE_ID = 8L;
  private static final long TWO_WAY_TALK_SUPPORT_ATTRIBUTE_ID = 9L;
@@ -60658,30 +60658,30 @@ public void onSuccess(byte[] tlv) {
  }, RATE_DISTORTION_TRADE_OFF_POINTS_ATTRIBUTE_ID, minInterval, maxInterval);
  }
 
- public void readMaxPreRollBufferSizeAttribute(
+ public void readMaxContentBufferSizeAttribute(
  LongAttributeCallback callback) {
- ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRE_ROLL_BUFFER_SIZE_ATTRIBUTE_ID);
+ ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONTENT_BUFFER_SIZE_ATTRIBUTE_ID);
 
  readAttribute(new ReportCallbackImpl(callback, path) {
  @Override
  public void onSuccess(byte[] tlv) {
  Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
  callback.onSuccess(value);
  }
- }, MAX_PRE_ROLL_BUFFER_SIZE_ATTRIBUTE_ID, true);
+ }, MAX_CONTENT_BUFFER_SIZE_ATTRIBUTE_ID, true);
  }
 
- public void subscribeMaxPreRollBufferSizeAttribute(
+ public void subscribeMaxContentBufferSizeAttribute(
  LongAttributeCallback callback, int minInterval, int maxInterval) {
- ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRE_ROLL_BUFFER_SIZE_ATTRIBUTE_ID);
+ ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONTENT_BUFFER_SIZE_ATTRIBUTE_ID);
 
  subscribeAttribute(new ReportCallbackImpl(callback, path) {
  @Override
  public void onSuccess(byte[] tlv) {
  Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
  callback.onSuccess(value);
  }
- }, MAX_PRE_ROLL_BUFFER_SIZE_ATTRIBUTE_ID, minInterval, maxInterval);
+ }, MAX_CONTENT_BUFFER_SIZE_ATTRIBUTE_ID, minInterval, maxInterval);
  }
 
  public void readMicrophoneCapabilitiesAttribute(

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -17085,7 +17085,7 @@ public enum Attribute {
  NightVisionCapable(3L),
  MinViewport(4L),
  RateDistortionTradeOffPoints(5L),
- MaxPreRollBufferSize(6L),
+ MaxContentBufferSize(6L),
  MicrophoneCapabilities(7L),
  SpeakerCapabilities(8L),
  TwoWayTalkSupport(9L),

diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java
@@ -18406,17 +18406,17 @@ private static Map<String, InteractionInfo> readCameraAvStreamManagementInteract
  readCameraAvStreamManagementRateDistortionTradeOffPointsCommandParams
  );
  result.put("readRateDistortionTradeOffPointsAttribute", readCameraAvStreamManagementRateDistortionTradeOffPointsAttributeInteractionInfo);
- Map<String, CommandParameterInfo> readCameraAvStreamManagementMaxPreRollBufferSizeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
- InteractionInfo readCameraAvStreamManagementMaxPreRollBufferSizeAttributeInteractionInfo = new InteractionInfo(
+ Map<String, CommandParameterInfo> readCameraAvStreamManagementMaxContentBufferSizeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+ InteractionInfo readCameraAvStreamManagementMaxContentBufferSizeAttributeInteractionInfo = new InteractionInfo(
  (cluster, callback, commandArguments) -> {
- ((ChipClusters.CameraAvStreamManagementCluster) cluster).readMaxPreRollBufferSizeAttribute(
+ ((ChipClusters.CameraAvStreamManagementCluster) cluster).readMaxContentBufferSizeAttribute(
  (ChipClusters.LongAttributeCallback) callback
  );
  },
  () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
- readCameraAvStreamManagementMaxPreRollBufferSizeCommandParams
+ readCameraAvStreamManagementMaxContentBufferSizeCommandParams
  );
- result.put("readMaxPreRollBufferSizeAttribute", readCameraAvStreamManagementMaxPreRollBufferSizeAttributeInteractionInfo);
+ result.put("readMaxContentBufferSizeAttribute", readCameraAvStreamManagementMaxContentBufferSizeAttributeInteractionInfo);
  Map<String, CommandParameterInfo> readCameraAvStreamManagementTwoWayTalkSupportCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
  InteractionInfo readCameraAvStreamManagementTwoWayTalkSupportAttributeInteractionInfo = new InteractionInfo(
  (cluster, callback, commandArguments) -> {

diff --git a/...java/generated/java/matter/controller/cluster/clusters/CameraAvStreamManagementCluster.kt b/...java/generated/java/matter/controller/cluster/clusters/CameraAvStreamManagementCluster.kt
@@ -1327,7 +1327,7 @@ class CameraAvStreamManagementCluster(
  }
  }
 
- suspend fun readMaxPreRollBufferSizeAttribute(): UInt? {
+ suspend fun readMaxContentBufferSizeAttribute(): UInt? {
  val ATTRIBUTE_ID: UInt = 6u
 
  val attributePath =
@@ -1349,7 +1349,7 @@ class CameraAvStreamManagementCluster(
  it.path.attributeId == ATTRIBUTE_ID
  }
 
- requireNotNull(attributeData) { "Maxprerollbuffersize attribute not found in response" }
+ requireNotNull(attributeData) { "Maxcontentbuffersize attribute not found in response" }
 
  // Decode the TLV data into the appropriate type
  val tlvReader = TlvReader(attributeData.data)
@@ -1363,7 +1363,7 @@ class CameraAvStreamManagementCluster(
  return decodedValue
  }
 
- suspend fun subscribeMaxPreRollBufferSizeAttribute(
+ suspend fun subscribeMaxContentBufferSizeAttribute(
  minInterval: Int,
  maxInterval: Int,
  ): Flow<UIntSubscriptionState> {
@@ -1399,7 +1399,7 @@ class CameraAvStreamManagementCluster(
  .firstOrNull { it.path.attributeId == ATTRIBUTE_ID }
 
  requireNotNull(attributeData) {
- "Maxprerollbuffersize attribute not found in Node State update"
+ "Maxcontentbuffersize attribute not found in Node State update"
  }
 
  // Decode the TLV data into the appropriate type

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h