From b1277405bc754b6c17a1c4f4be03d7433d0470d1 Mon Sep 17 00:00:00 2001 From: Pradip De Date: Tue, 22 Oct 2024 18:04:14 -0700 Subject: [PATCH] Camera AVStreamMgmt xml updates (#36133) * 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. * Corresponding ZAP Autogen code changes. --- .../camera-av-stream-management-cluster.xml | 22 +++++------ .../data_model/controller-clusters.matter | 4 +- .../chip/devicecontroller/ChipClusters.java | 14 +++---- .../devicecontroller/ClusterIDMapping.java | 2 +- .../devicecontroller/ClusterReadMapping.java | 10 ++--- .../CameraAvStreamManagementCluster.kt | 8 ++-- .../CHIPAttributeTLVValueDecoder.cpp | 4 +- .../python/chip/clusters/CHIPClusters.py | 2 +- .../python/chip/clusters/Objects.py | 6 +-- .../MTRAttributeSpecifiedCheck.mm | 2 +- .../MTRAttributeTLVValueDecoder.mm | 4 +- .../CHIP/zap-generated/MTRBaseClusters.h | 6 +-- .../CHIP/zap-generated/MTRBaseClusters.mm | 12 +++--- .../CHIP/zap-generated/MTRClusterConstants.h | 2 +- .../CHIP/zap-generated/MTRClusterNames.mm | 4 +- .../CHIP/zap-generated/MTRClusters.h | 2 +- .../CHIP/zap-generated/MTRClusters.mm | 4 +- .../zap-generated/attributes/Accessors.cpp | 4 +- .../zap-generated/attributes/Accessors.h | 4 +- .../zap-generated/cluster-objects.cpp | 4 +- .../zap-generated/cluster-objects.h | 8 ++-- .../app-common/zap-generated/ids/Attributes.h | 4 +- .../zap-generated/cluster/Commands.h | 10 ++--- .../cluster/logging/DataModelLogger.cpp | 4 +- .../cluster/logging/EntryToText.cpp | 4 +- .../zap-generated/cluster/Commands.h | 38 +++++++++---------- 26 files changed, 94 insertions(+), 94 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 --> @@ -127,8 +127,8 @@ Git: 0.9-fall2024-387-gfd3062545 - - + + @@ -143,8 +143,8 @@ Git: 0.9-fall2024-387-gfd3062545 - - + + Camera AV Stream Management 0x0551 CAMERA_AV_STREAM_MANAGEMENT_CLUSTER @@ -172,7 +172,7 @@ Git: 0.9-fall2024-387-gfd3062545 - + @@ -187,7 +187,7 @@ Git: 0.9-fall2024-387-gfd3062545 NightVisionCapable MinViewport RateDistortionTradeOffPoints - MaxPreRollBufferSize + MaxContentBufferSize MicrophoneCapabilities SpeakerCapabilities TwoWayTalkSupport @@ -345,8 +345,8 @@ Git: 0.9-fall2024-387-gfd3062545 - - + + @@ -447,8 +447,8 @@ Git: 0.9-fall2024-387-gfd3062545 - - + + This event SHALL be generated when there is a modification in the corresponding video stream. diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index d663a5f018a217..24c7e00c623b53 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9527,7 +9527,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 { @@ -9695,7 +9695,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 index dff134bddd1a18..06b8dd8ff0b54c 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -59730,7 +59730,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; @@ -60418,9 +60418,9 @@ 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 @@ -60428,12 +60428,12 @@ 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 @@ -60441,7 +60441,7 @@ 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 index a43df66e40bf0a..354f49ed6caa5d 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -17079,7 +17079,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 index 9abbcd879c5503..843114b4374f58 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -18340,17 +18340,17 @@ private static Map readCameraAvStreamManagementInteract readCameraAvStreamManagementRateDistortionTradeOffPointsCommandParams ); result.put("readRateDistortionTradeOffPointsAttribute", readCameraAvStreamManagementRateDistortionTradeOffPointsAttributeInteractionInfo); - Map readCameraAvStreamManagementMaxPreRollBufferSizeCommandParams = new LinkedHashMap(); - InteractionInfo readCameraAvStreamManagementMaxPreRollBufferSizeAttributeInteractionInfo = new InteractionInfo( + Map readCameraAvStreamManagementMaxContentBufferSizeCommandParams = new LinkedHashMap(); + 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 readCameraAvStreamManagementTwoWayTalkSupportCommandParams = new LinkedHashMap(); InteractionInfo readCameraAvStreamManagementTwoWayTalkSupportAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvStreamManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvStreamManagementCluster.kt index c9f6d50d065f8f..c0993403079dbf 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvStreamManagementCluster.kt +++ b/src/controller/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 { @@ -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 index c49674fbbefe7e..c8247c5d4d31a8 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -40112,8 +40112,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } return value; } - case Attributes::MaxPreRollBufferSize::Id: { - using TypeInfo = Attributes::MaxPreRollBufferSize::TypeInfo; + case Attributes::MaxContentBufferSize::Id: { + using TypeInfo = Attributes::MaxContentBufferSize::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 395506b33bb843..08f8182e6b6886 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -12543,7 +12543,7 @@ class ChipClusters: "reportable": True, }, 0x00000006: { - "attributeName": "MaxPreRollBufferSize", + "attributeName": "MaxContentBufferSize", "attributeId": 0x00000006, "type": "int", "reportable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 0cdc2a54549cce..b7b73282715a22 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -44779,7 +44779,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="nightVisionCapable", Tag=0x00000003, Type=typing.Optional[bool]), ClusterObjectFieldDescriptor(Label="minViewport", Tag=0x00000004, Type=typing.Optional[CameraAvStreamManagement.Structs.VideoResolutionStruct]), ClusterObjectFieldDescriptor(Label="rateDistortionTradeOffPoints", Tag=0x00000005, Type=typing.Optional[typing.List[CameraAvStreamManagement.Structs.RateDistortionTradeOffPointsStruct]]), - ClusterObjectFieldDescriptor(Label="maxPreRollBufferSize", Tag=0x00000006, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="maxContentBufferSize", Tag=0x00000006, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="microphoneCapabilities", Tag=0x00000007, Type=typing.Optional[CameraAvStreamManagement.Structs.AudioCapabilitiesStruct]), ClusterObjectFieldDescriptor(Label="speakerCapabilities", Tag=0x00000008, Type=typing.Optional[CameraAvStreamManagement.Structs.AudioCapabilitiesStruct]), ClusterObjectFieldDescriptor(Label="twoWayTalkSupport", Tag=0x00000009, Type=typing.Optional[CameraAvStreamManagement.Enums.TwoWayTalkSupportTypeEnum]), @@ -44833,7 +44833,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: nightVisionCapable: typing.Optional[bool] = None minViewport: typing.Optional[CameraAvStreamManagement.Structs.VideoResolutionStruct] = None rateDistortionTradeOffPoints: typing.Optional[typing.List[CameraAvStreamManagement.Structs.RateDistortionTradeOffPointsStruct]] = None - maxPreRollBufferSize: typing.Optional[uint] = None + maxContentBufferSize: typing.Optional[uint] = None microphoneCapabilities: typing.Optional[CameraAvStreamManagement.Structs.AudioCapabilitiesStruct] = None speakerCapabilities: typing.Optional[CameraAvStreamManagement.Structs.AudioCapabilitiesStruct] = None twoWayTalkSupport: typing.Optional[CameraAvStreamManagement.Enums.TwoWayTalkSupportTypeEnum] = None @@ -45561,7 +45561,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: typing.Optional[typing.List[CameraAvStreamManagement.Structs.RateDistortionTradeOffPointsStruct]] = None @dataclass - class MaxPreRollBufferSize(ClusterAttributeDescriptor): + class MaxContentBufferSize(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x00000551 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm index 5495d6a9d7a0ca..43e0528c252c14 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm @@ -5613,7 +5613,7 @@ static BOOL AttributeIsSpecifiedInCameraAVStreamManagementCluster(AttributeId aA case Attributes::RateDistortionTradeOffPoints::Id: { return YES; } - case Attributes::MaxPreRollBufferSize::Id: { + case Attributes::MaxContentBufferSize::Id: { return YES; } case Attributes::MicrophoneCapabilities::Id: { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index b894c30f6cfc8e..16f882fe473a43 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -16999,8 +16999,8 @@ static id _Nullable DecodeAttributeValueForCameraAVStreamManagementCluster(Attri } return value; } - case Attributes::MaxPreRollBufferSize::Id: { - using TypeInfo = Attributes::MaxPreRollBufferSize::TypeInfo; + case Attributes::MaxContentBufferSize::Id: { + using TypeInfo = Attributes::MaxContentBufferSize::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index d3f7ba442b3c80..9c1755c5414f8f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14260,11 +14260,11 @@ MTR_PROVISIONALLY_AVAILABLE reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; + (void)readAttributeRateDistortionTradeOffPointsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)readAttributeMaxPreRollBufferSizeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeMaxPreRollBufferSizeWithParams:(MTRSubscribeParams *)params +- (void)readAttributeMaxContentBufferSizeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeMaxContentBufferSizeWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeMaxPreRollBufferSizeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeMaxContentBufferSizeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeMicrophoneCapabilitiesWithCompletion:(void (^)(MTRCameraAVStreamManagementClusterAudioCapabilitiesStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeMicrophoneCapabilitiesWithParams:(MTRSubscribeParams *)params diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index eb2a2f5687c1f5..3c347c4472e132 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -98643,9 +98643,9 @@ + (void)readAttributeRateDistortionTradeOffPointsWithClusterStateCache:(MTRClust completion:completion]; } -- (void)readAttributeMaxPreRollBufferSizeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeMaxContentBufferSizeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvStreamManagement::Attributes::MaxPreRollBufferSize::TypeInfo; + using TypeInfo = CameraAvStreamManagement::Attributes::MaxContentBufferSize::TypeInfo; [self.device _readKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -98654,11 +98654,11 @@ - (void)readAttributeMaxPreRollBufferSizeWithCompletion:(void (^)(NSNumber * _Nu completion:completion]; } -- (void)subscribeAttributeMaxPreRollBufferSizeWithParams:(MTRSubscribeParams * _Nonnull)params +- (void)subscribeAttributeMaxContentBufferSizeWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = CameraAvStreamManagement::Attributes::MaxPreRollBufferSize::TypeInfo; + using TypeInfo = CameraAvStreamManagement::Attributes::MaxContentBufferSize::TypeInfo; [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -98668,9 +98668,9 @@ - (void)subscribeAttributeMaxPreRollBufferSizeWithParams:(MTRSubscribeParams * _ subscriptionEstablished:subscriptionEstablished]; } -+ (void)readAttributeMaxPreRollBufferSizeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion ++ (void)readAttributeMaxContentBufferSizeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvStreamManagement::Attributes::MaxPreRollBufferSize::TypeInfo; + using TypeInfo = CameraAvStreamManagement::Attributes::MaxContentBufferSize::TypeInfo; [clusterStateCacheContainer _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) clusterID:TypeInfo::GetClusterId() diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 7ee2c7d88af1c0..b1d26e9ce0fb12 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -4641,7 +4641,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeNightVisionCapableID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMinViewportID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeRateDistortionTradeOffPointsID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMaxPreRollBufferSizeID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMaxContentBufferSizeID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneCapabilitiesID MTR_PROVISIONALLY_AVAILABLE = 0x00000007, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerCapabilitiesID MTR_PROVISIONALLY_AVAILABLE = 0x00000008, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeTwoWayTalkSupportID MTR_PROVISIONALLY_AVAILABLE = 0x00000009, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm index 08373371a7c5e2..ef41bc6487b379 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm @@ -7751,8 +7751,8 @@ result = @"RateDistortionTradeOffPoints"; break; - case MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMaxPreRollBufferSizeID: - result = @"MaxPreRollBufferSize"; + case MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMaxContentBufferSizeID: + result = @"MaxContentBufferSize"; break; case MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneCapabilitiesID: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index d9ca769e250aaa..111cab13f8af49 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -6660,7 +6660,7 @@ MTR_PROVISIONALLY_AVAILABLE - (NSDictionary * _Nullable)readAttributeRateDistortionTradeOffPointsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; -- (NSDictionary * _Nullable)readAttributeMaxPreRollBufferSizeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; +- (NSDictionary * _Nullable)readAttributeMaxContentBufferSizeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeMicrophoneCapabilitiesWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 0923caca7cead0..b473aed7020e46 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -19454,9 +19454,9 @@ - (void)setImageFlipVerticalWithParams:(MTRCameraAVStreamManagementClusterSetIma return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeRateDistortionTradeOffPointsID) params:params]; } -- (NSDictionary * _Nullable)readAttributeMaxPreRollBufferSizeWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary * _Nullable)readAttributeMaxContentBufferSizeWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMaxPreRollBufferSizeID) params:params]; + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMaxContentBufferSizeID) params:params]; } - (NSDictionary * _Nullable)readAttributeMicrophoneCapabilitiesWithParams:(MTRReadParams * _Nullable)params diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 382c808a78cc62..762cedbf1b5aa3 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -37056,7 +37056,7 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value) } // namespace NightVisionCapable -namespace MaxPreRollBufferSize { +namespace MaxContentBufferSize { Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value) { @@ -37101,7 +37101,7 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value) return emberAfWriteAttribute(endpoint, Clusters::CameraAvStreamManagement::Id, Id, writable, ZCL_INT32U_ATTRIBUTE_TYPE); } -} // namespace MaxPreRollBufferSize +} // namespace MaxContentBufferSize namespace TwoWayTalkSupport { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index e0a965b732a743..98aebd50964980 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -5620,11 +5620,11 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value); Protocols::InteractionModel::Status Set(EndpointId endpoint, bool value, MarkAttributeDirty markDirty); } // namespace NightVisionCapable -namespace MaxPreRollBufferSize { +namespace MaxContentBufferSize { Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value); // int32u Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value); Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty); -} // namespace MaxPreRollBufferSize +} // namespace MaxContentBufferSize namespace TwoWayTalkSupport { Protocols::InteractionModel::Status diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 7e9752db4a888c..111324e9cb51ae 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -30138,8 +30138,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre return DataModel::Decode(reader, minViewport); case Attributes::RateDistortionTradeOffPoints::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, rateDistortionTradeOffPoints); - case Attributes::MaxPreRollBufferSize::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, maxPreRollBufferSize); + case Attributes::MaxContentBufferSize::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, maxContentBufferSize); case Attributes::MicrophoneCapabilities::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, microphoneCapabilities); case Attributes::SpeakerCapabilities::TypeInfo::GetAttributeId(): diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 4ec96663f8becd..d7f69cc3818e3e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -41980,7 +41980,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace RateDistortionTradeOffPoints -namespace MaxPreRollBufferSize { +namespace MaxContentBufferSize { struct TypeInfo { using Type = uint32_t; @@ -41988,10 +41988,10 @@ struct TypeInfo using DecodableArgType = uint32_t; static constexpr ClusterId GetClusterId() { return Clusters::CameraAvStreamManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::MaxPreRollBufferSize::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MaxContentBufferSize::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace MaxPreRollBufferSize +} // namespace MaxContentBufferSize namespace MicrophoneCapabilities { struct TypeInfo { @@ -42529,7 +42529,7 @@ struct TypeInfo Attributes::NightVisionCapable::TypeInfo::DecodableType nightVisionCapable = static_cast(0); Attributes::MinViewport::TypeInfo::DecodableType minViewport; Attributes::RateDistortionTradeOffPoints::TypeInfo::DecodableType rateDistortionTradeOffPoints; - Attributes::MaxPreRollBufferSize::TypeInfo::DecodableType maxPreRollBufferSize = static_cast(0); + Attributes::MaxContentBufferSize::TypeInfo::DecodableType maxContentBufferSize = static_cast(0); Attributes::MicrophoneCapabilities::TypeInfo::DecodableType microphoneCapabilities; Attributes::SpeakerCapabilities::TypeInfo::DecodableType speakerCapabilities; Attributes::TwoWayTalkSupport::TypeInfo::DecodableType twoWayTalkSupport = diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 8ee5cb21be8e31..e9375f5dad786a 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -6890,9 +6890,9 @@ namespace RateDistortionTradeOffPoints { static constexpr AttributeId Id = 0x00000005; } // namespace RateDistortionTradeOffPoints -namespace MaxPreRollBufferSize { +namespace MaxContentBufferSize { static constexpr AttributeId Id = 0x00000006; -} // namespace MaxPreRollBufferSize +} // namespace MaxContentBufferSize namespace MicrophoneCapabilities { static constexpr AttributeId Id = 0x00000007; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index afcc2abd01d6fb..4ee3c3e1f98afa 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -13732,7 +13732,7 @@ class ZoneManagementRemoveZone : public ClusterCommand | * NightVisionCapable | 0x0003 | | * MinViewport | 0x0004 | | * RateDistortionTradeOffPoints | 0x0005 | -| * MaxPreRollBufferSize | 0x0006 | +| * MaxContentBufferSize | 0x0006 | | * MicrophoneCapabilities | 0x0007 | | * SpeakerCapabilities | 0x0008 | | * TwoWayTalkSupport | 0x0009 | @@ -26925,7 +26925,7 @@ void registerClusterCameraAvStreamManagement(Commands & commands, CredentialIssu make_unique(Id, "min-viewport", Attributes::MinViewport::Id, credsIssuerConfig), // make_unique(Id, "rate-distortion-trade-off-points", Attributes::RateDistortionTradeOffPoints::Id, credsIssuerConfig), // - make_unique(Id, "max-pre-roll-buffer-size", Attributes::MaxPreRollBufferSize::Id, credsIssuerConfig), // + make_unique(Id, "max-content-buffer-size", Attributes::MaxContentBufferSize::Id, credsIssuerConfig), // make_unique(Id, "microphone-capabilities", Attributes::MicrophoneCapabilities::Id, credsIssuerConfig), // make_unique(Id, "speaker-capabilities", Attributes::SpeakerCapabilities::Id, credsIssuerConfig), // make_unique(Id, "two-way-talk-support", Attributes::TwoWayTalkSupport::Id, credsIssuerConfig), // @@ -26993,7 +26993,7 @@ void registerClusterCameraAvStreamManagement(Commands & commands, CredentialIssu const chip::app::Clusters::CameraAvStreamManagement::Structs::RateDistortionTradeOffPointsStruct::Type>>>( Id, "rate-distortion-trade-off-points", Attributes::RateDistortionTradeOffPoints::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>(Id, "max-pre-roll-buffer-size", 0, UINT32_MAX, Attributes::MaxPreRollBufferSize::Id, + make_unique>(Id, "max-content-buffer-size", 0, UINT32_MAX, Attributes::MaxContentBufferSize::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>( Id, "microphone-capabilities", Attributes::MicrophoneCapabilities::Id, WriteCommandType::kForceWrite, @@ -27114,8 +27114,8 @@ void registerClusterCameraAvStreamManagement(Commands & commands, CredentialIssu make_unique(Id, "night-vision-capable", Attributes::NightVisionCapable::Id, credsIssuerConfig), // make_unique(Id, "min-viewport", Attributes::MinViewport::Id, credsIssuerConfig), // make_unique(Id, "rate-distortion-trade-off-points", Attributes::RateDistortionTradeOffPoints::Id, - credsIssuerConfig), // - make_unique(Id, "max-pre-roll-buffer-size", Attributes::MaxPreRollBufferSize::Id, credsIssuerConfig), // + credsIssuerConfig), // + make_unique(Id, "max-content-buffer-size", Attributes::MaxContentBufferSize::Id, credsIssuerConfig), // make_unique(Id, "microphone-capabilities", Attributes::MicrophoneCapabilities::Id, credsIssuerConfig), // make_unique(Id, "speaker-capabilities", Attributes::SpeakerCapabilities::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 8a0e26cbca4bc1..ac4e3adbbbebc3 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -18513,10 +18513,10 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("RateDistortionTradeOffPoints", 1, value); } - case CameraAvStreamManagement::Attributes::MaxPreRollBufferSize::Id: { + case CameraAvStreamManagement::Attributes::MaxContentBufferSize::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("MaxPreRollBufferSize", 1, value); + return DataModelLogger::LogValue("MaxContentBufferSize", 1, value); } case CameraAvStreamManagement::Attributes::MicrophoneCapabilities::Id: { chip::app::Clusters::CameraAvStreamManagement::Structs::AudioCapabilitiesStruct::DecodableType value; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp index a5739f1228aad6..0b5178d3bcb208 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp @@ -4181,8 +4181,8 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id) return "MinViewport"; case chip::app::Clusters::CameraAvStreamManagement::Attributes::RateDistortionTradeOffPoints::Id: return "RateDistortionTradeOffPoints"; - case chip::app::Clusters::CameraAvStreamManagement::Attributes::MaxPreRollBufferSize::Id: - return "MaxPreRollBufferSize"; + case chip::app::Clusters::CameraAvStreamManagement::Attributes::MaxContentBufferSize::Id: + return "MaxContentBufferSize"; case chip::app::Clusters::CameraAvStreamManagement::Attributes::MicrophoneCapabilities::Id: return "MicrophoneCapabilities"; case chip::app::Clusters::CameraAvStreamManagement::Attributes::SpeakerCapabilities::Id: diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 4dc01523ea8db8..bf6bff38ba079b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -150650,7 +150650,7 @@ class SubscribeAttributeZoneManagementClusterRevision : public SubscribeAttribut | * NightVisionCapable | 0x0003 | | * MinViewport | 0x0004 | | * RateDistortionTradeOffPoints | 0x0005 | -| * MaxPreRollBufferSize | 0x0006 | +| * MaxContentBufferSize | 0x0006 | | * MicrophoneCapabilities | 0x0007 | | * SpeakerCapabilities | 0x0008 | | * TwoWayTalkSupport | 0x0009 | @@ -152134,34 +152134,34 @@ class SubscribeAttributeCameraAvStreamManagementRateDistortionTradeOffPoints : p #if MTR_ENABLE_PROVISIONAL /* - * Attribute MaxPreRollBufferSize + * Attribute MaxContentBufferSize */ -class ReadCameraAvStreamManagementMaxPreRollBufferSize : public ReadAttribute { +class ReadCameraAvStreamManagementMaxContentBufferSize : public ReadAttribute { public: - ReadCameraAvStreamManagementMaxPreRollBufferSize() - : ReadAttribute("max-pre-roll-buffer-size") + ReadCameraAvStreamManagementMaxContentBufferSize() + : ReadAttribute("max-content-buffer-size") { } - ~ReadCameraAvStreamManagementMaxPreRollBufferSize() + ~ReadCameraAvStreamManagementMaxContentBufferSize() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvStreamManagement::Id; - constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvStreamManagement::Attributes::MaxPreRollBufferSize::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvStreamManagement::Attributes::MaxContentBufferSize::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVStreamManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeMaxPreRollBufferSizeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVStreamManagement.MaxPreRollBufferSize response %@", [value description]); + [cluster readAttributeMaxContentBufferSizeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVStreamManagement.MaxContentBufferSize response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { - LogNSError("CameraAVStreamManagement MaxPreRollBufferSize read Error", error); + LogNSError("CameraAVStreamManagement MaxContentBufferSize read Error", error); RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); } SetCommandExitStatus(error); @@ -152170,21 +152170,21 @@ class ReadCameraAvStreamManagementMaxPreRollBufferSize : public ReadAttribute { } }; -class SubscribeAttributeCameraAvStreamManagementMaxPreRollBufferSize : public SubscribeAttribute { +class SubscribeAttributeCameraAvStreamManagementMaxContentBufferSize : public SubscribeAttribute { public: - SubscribeAttributeCameraAvStreamManagementMaxPreRollBufferSize() - : SubscribeAttribute("max-pre-roll-buffer-size") + SubscribeAttributeCameraAvStreamManagementMaxContentBufferSize() + : SubscribeAttribute("max-content-buffer-size") { } - ~SubscribeAttributeCameraAvStreamManagementMaxPreRollBufferSize() + ~SubscribeAttributeCameraAvStreamManagementMaxContentBufferSize() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvStreamManagement::Id; - constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvStreamManagement::Attributes::MaxPreRollBufferSize::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvStreamManagement::Attributes::MaxContentBufferSize::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); @@ -152199,10 +152199,10 @@ class SubscribeAttributeCameraAvStreamManagementMaxPreRollBufferSize : public Su if (mAutoResubscribe.HasValue()) { params.resubscribeAutomatically = mAutoResubscribe.Value(); } - [cluster subscribeAttributeMaxPreRollBufferSizeWithParams:params + [cluster subscribeAttributeMaxContentBufferSizeWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVStreamManagement.MaxPreRollBufferSize response %@", [value description]); + NSLog(@"CameraAVStreamManagement.MaxContentBufferSize response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { @@ -181984,8 +181984,8 @@ void registerClusterCameraAvStreamManagement(Commands & commands) make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), //