From 4880753d8e019a08bbd8428f9e7514f0849e31a8 Mon Sep 17 00:00:00 2001 From: Pradip De Date: Wed, 13 Nov 2024 22:11:35 +0000 Subject: [PATCH] Removal of 2 redundant attributes in CameraAVStreamMgmt cluster. (#36478) SDK update for corresponding Spec change. Remove the CurrentSnapshotConfig and CurrentVideoCodecs as they are captured by the Allocated Video and Snapshot stream attributes. Also, fix a field name in the Snapshotstream allocation command. Run ZAP regen for the corresponding changes. --- .../camera-av-stream-management-cluster.xml | 72 ++- .../zcl/zcl-with-test-extensions.json | 1 - src/app/zap-templates/zcl/zcl.json | 1 - .../data_model/controller-clusters.matter | 58 ++- .../chip/devicecontroller/ChipClusters.java | 137 ++---- .../devicecontroller/ClusterIDMapping.java | 58 ++- .../devicecontroller/ClusterInfoMapping.java | 48 +- .../devicecontroller/ClusterReadMapping.java | 11 - .../CameraAvStreamManagementCluster.kt | 416 ++++-------------- .../CHIPAttributeTLVValueDecoder.cpp | 117 ----- .../python/chip/clusters/CHIPClusters.py | 109 ++--- .../python/chip/clusters/Objects.py | 148 +++---- .../MTRAttributeSpecifiedCheck.mm | 6 - .../MTRAttributeTLVValueDecoder.mm | 42 -- .../CHIP/zap-generated/MTRBaseClusters.h | 14 - .../CHIP/zap-generated/MTRBaseClusters.mm | 121 ----- .../CHIP/zap-generated/MTRClusterConstants.h | 56 ++- .../CHIP/zap-generated/MTRClusterNames.mm | 8 - .../CHIP/zap-generated/MTRClusters.h | 6 - .../CHIP/zap-generated/MTRClusters.mm | 21 - .../zap-generated/MTRCommandPayloadsObjc.h | 2 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 8 +- .../zap-generated/cluster-objects.cpp | 10 +- .../zap-generated/cluster-objects.h | 33 +- .../app-common/zap-generated/ids/Attributes.h | 62 ++- .../zap-generated/cluster/Commands.h | 72 ++- .../cluster/logging/DataModelLogger.cpp | 10 - .../cluster/logging/EntryToText.cpp | 4 - .../zap-generated/cluster/Commands.h | 291 ++---------- 29 files changed, 423 insertions(+), 1519 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 24c66bcc7a7a9c..516fe8753a3ef8 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: 1.3-3824-g29c49ca54 +Git: 1.3-3830-g1f08d6f40 --> @@ -239,62 +239,48 @@ Git: 1.3-3824-g29c49ca54 - - CurrentVideoCodecs - - - - - - CurrentSnapshotConfig - - - - - FabricsUsingCamera - + FabricsUsingCamera + AllocatedVideoStreams - + AllocatedAudioStreams - + AllocatedSnapshotStreams - + RankedVideoStreamPrioritiesList - - - + SoftRecordingPrivacyModeEnabled - + SoftLivestreamPrivacyModeEnabled - + HardPrivacyModeOn - + NightVision @@ -305,7 +291,7 @@ Git: 1.3-3824-g29c49ca54 - + NightVisionIllum @@ -316,7 +302,7 @@ Git: 1.3-3824-g29c49ca54 - + Viewport @@ -324,7 +310,7 @@ Git: 1.3-3824-g29c49ca54 - + SpeakerMuted @@ -335,7 +321,7 @@ Git: 1.3-3824-g29c49ca54 - + SpeakerVolumeLevel @@ -346,7 +332,7 @@ Git: 1.3-3824-g29c49ca54 - + SpeakerMaxLevel @@ -356,7 +342,7 @@ Git: 1.3-3824-g29c49ca54 - + SpeakerMinLevel @@ -366,7 +352,7 @@ Git: 1.3-3824-g29c49ca54 - + MicrophoneMuted @@ -374,7 +360,7 @@ Git: 1.3-3824-g29c49ca54 - + MicrophoneVolumeLevel @@ -382,21 +368,21 @@ Git: 1.3-3824-g29c49ca54 - + MicrophoneMaxLevel - + MicrophoneMinLevel - + MicrophoneAGCEnabled @@ -404,7 +390,7 @@ Git: 1.3-3824-g29c49ca54 - + ImageRotation @@ -412,7 +398,7 @@ Git: 1.3-3824-g29c49ca54 - + ImageFlipHorizontal @@ -420,7 +406,7 @@ Git: 1.3-3824-g29c49ca54 - + ImageFlipVertical @@ -428,7 +414,7 @@ Git: 1.3-3824-g29c49ca54 - + LocalVideoRecordingEnabled @@ -439,7 +425,7 @@ Git: 1.3-3824-g29c49ca54 - + LocalSnapshotRecordingEnabled @@ -450,13 +436,13 @@ Git: 1.3-3824-g29c49ca54 - + StatusLightEnabled - + StatusLightBrightness @@ -546,7 +532,7 @@ Git: 1.3-3824-g29c49ca54 This command SHALL allocate a snapshot stream on the device and return an allocated snapshot stream identifier. - + diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 39301cdc30cecc..0912be1df2db37 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -677,7 +677,6 @@ "MinViewport", "MicrophoneCapabilities", "SpeakerCapabilities", - "CurrentSnapshotConfig", "Viewport" ] }, diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index c2de6acabf2951..3a62c4c84ca6eb 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -671,7 +671,6 @@ "MinViewport", "MicrophoneCapabilities", "SpeakerCapabilities", - "CurrentSnapshotConfig", "Viewport" ] }, diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 95f102ce08c545..31da395b05cd31 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9705,35 +9705,33 @@ provisional cluster CameraAvStreamManagement = 1361 { readonly attribute int32u maxNetworkBandwidth = 11; readonly attribute optional int16u currentFrameRate = 12; attribute access(read: manage, write: manage) optional boolean HDRModeEnabled = 13; - readonly attribute optional VideoCodecEnum currentVideoCodecs[] = 14; - readonly attribute optional SnapshotParamsStruct currentSnapshotConfig = 15; - readonly attribute fabric_idx fabricsUsingCamera[] = 16; - readonly attribute optional VideoStreamStruct allocatedVideoStreams[] = 17; - readonly attribute optional AudioStreamStruct allocatedAudioStreams[] = 18; - readonly attribute optional SnapshotStreamStruct allocatedSnapshotStreams[] = 19; - attribute access(read: administer, write: administer) optional StreamTypeEnum rankedVideoStreamPrioritiesList[] = 20; - attribute optional boolean softRecordingPrivacyModeEnabled = 21; - attribute optional boolean softLivestreamPrivacyModeEnabled = 22; - readonly attribute optional boolean hardPrivacyModeOn = 23; - attribute access(read: manage, write: manage) optional TriStateAutoEnum nightVision = 24; - attribute access(read: manage, write: manage) optional TriStateAutoEnum nightVisionIllum = 25; - attribute access(read: manage, write: manage) optional ViewportStruct viewport = 26; - attribute access(read: manage, write: manage) optional boolean speakerMuted = 27; - attribute access(read: manage, write: manage) optional int8u speakerVolumeLevel = 28; - readonly attribute access(read: manage) optional int8u speakerMaxLevel = 29; - readonly attribute access(read: manage) optional int8u speakerMinLevel = 30; - attribute access(read: manage, write: manage) optional boolean microphoneMuted = 31; - attribute access(read: manage, write: manage) optional int8u microphoneVolumeLevel = 32; - readonly attribute access(read: manage) optional int8u microphoneMaxLevel = 33; - readonly attribute access(read: manage) optional int8u microphoneMinLevel = 34; - attribute access(read: manage, write: manage) optional boolean microphoneAGCEnabled = 35; - attribute access(read: manage, write: manage) optional int16u imageRotation = 36; - attribute access(read: manage, write: manage) optional boolean imageFlipHorizontal = 37; - attribute access(read: manage, write: manage) optional boolean imageFlipVertical = 38; - attribute access(read: manage, write: manage) optional boolean localVideoRecordingEnabled = 39; - attribute access(read: manage, write: manage) optional boolean localSnapshotRecordingEnabled = 40; - attribute access(read: manage, write: manage) optional boolean statusLightEnabled = 41; - attribute access(read: manage, write: manage) optional ThreeLevelAutoEnum statusLightBrightness = 42; + readonly attribute fabric_idx fabricsUsingCamera[] = 14; + readonly attribute optional VideoStreamStruct allocatedVideoStreams[] = 15; + readonly attribute optional AudioStreamStruct allocatedAudioStreams[] = 16; + readonly attribute optional SnapshotStreamStruct allocatedSnapshotStreams[] = 17; + readonly attribute optional StreamTypeEnum rankedVideoStreamPrioritiesList[] = 18; + attribute optional boolean softRecordingPrivacyModeEnabled = 19; + attribute optional boolean softLivestreamPrivacyModeEnabled = 20; + readonly attribute optional boolean hardPrivacyModeOn = 21; + attribute access(read: manage, write: manage) optional TriStateAutoEnum nightVision = 22; + attribute access(read: manage, write: manage) optional TriStateAutoEnum nightVisionIllum = 23; + attribute access(read: manage, write: manage) optional ViewportStruct viewport = 24; + attribute access(read: manage, write: manage) optional boolean speakerMuted = 25; + attribute access(read: manage, write: manage) optional int8u speakerVolumeLevel = 26; + readonly attribute access(read: manage) optional int8u speakerMaxLevel = 27; + readonly attribute access(read: manage) optional int8u speakerMinLevel = 28; + attribute access(read: manage, write: manage) optional boolean microphoneMuted = 29; + attribute access(read: manage, write: manage) optional int8u microphoneVolumeLevel = 30; + readonly attribute access(read: manage) optional int8u microphoneMaxLevel = 31; + readonly attribute access(read: manage) optional int8u microphoneMinLevel = 32; + attribute access(read: manage, write: manage) optional boolean microphoneAGCEnabled = 33; + attribute access(read: manage, write: manage) optional int16u imageRotation = 34; + attribute access(read: manage, write: manage) optional boolean imageFlipHorizontal = 35; + attribute access(read: manage, write: manage) optional boolean imageFlipVertical = 36; + attribute access(read: manage, write: manage) optional boolean localVideoRecordingEnabled = 37; + attribute access(read: manage, write: manage) optional boolean localSnapshotRecordingEnabled = 38; + attribute access(read: manage, write: manage) optional boolean statusLightEnabled = 39; + attribute access(read: manage, write: manage) optional ThreeLevelAutoEnum statusLightBrightness = 40; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -9790,7 +9788,7 @@ provisional cluster CameraAvStreamManagement = 1361 { request struct SnapshotStreamAllocateRequest { ImageCodecEnum imageCodec = 0; - int16u frameRate = 1; + int16u maxFrameRate = 1; int32u bitRate = 2; VideoResolutionStruct minResolution = 3; VideoResolutionStruct maxResolution = 4; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index a37be0ed915865..228e0236ed0785 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -59738,35 +59738,33 @@ public static class CameraAvStreamManagementCluster extends BaseChipCluster { private static final long MAX_NETWORK_BANDWIDTH_ATTRIBUTE_ID = 11L; private static final long CURRENT_FRAME_RATE_ATTRIBUTE_ID = 12L; private static final long HDR_MODE_ENABLED_ATTRIBUTE_ID = 13L; - private static final long CURRENT_VIDEO_CODECS_ATTRIBUTE_ID = 14L; - private static final long CURRENT_SNAPSHOT_CONFIG_ATTRIBUTE_ID = 15L; - private static final long FABRICS_USING_CAMERA_ATTRIBUTE_ID = 16L; - private static final long ALLOCATED_VIDEO_STREAMS_ATTRIBUTE_ID = 17L; - private static final long ALLOCATED_AUDIO_STREAMS_ATTRIBUTE_ID = 18L; - private static final long ALLOCATED_SNAPSHOT_STREAMS_ATTRIBUTE_ID = 19L; - private static final long RANKED_VIDEO_STREAM_PRIORITIES_LIST_ATTRIBUTE_ID = 20L; - private static final long SOFT_RECORDING_PRIVACY_MODE_ENABLED_ATTRIBUTE_ID = 21L; - private static final long SOFT_LIVESTREAM_PRIVACY_MODE_ENABLED_ATTRIBUTE_ID = 22L; - private static final long HARD_PRIVACY_MODE_ON_ATTRIBUTE_ID = 23L; - private static final long NIGHT_VISION_ATTRIBUTE_ID = 24L; - private static final long NIGHT_VISION_ILLUM_ATTRIBUTE_ID = 25L; - private static final long VIEWPORT_ATTRIBUTE_ID = 26L; - private static final long SPEAKER_MUTED_ATTRIBUTE_ID = 27L; - private static final long SPEAKER_VOLUME_LEVEL_ATTRIBUTE_ID = 28L; - private static final long SPEAKER_MAX_LEVEL_ATTRIBUTE_ID = 29L; - private static final long SPEAKER_MIN_LEVEL_ATTRIBUTE_ID = 30L; - private static final long MICROPHONE_MUTED_ATTRIBUTE_ID = 31L; - private static final long MICROPHONE_VOLUME_LEVEL_ATTRIBUTE_ID = 32L; - private static final long MICROPHONE_MAX_LEVEL_ATTRIBUTE_ID = 33L; - private static final long MICROPHONE_MIN_LEVEL_ATTRIBUTE_ID = 34L; - private static final long MICROPHONE_AGC_ENABLED_ATTRIBUTE_ID = 35L; - private static final long IMAGE_ROTATION_ATTRIBUTE_ID = 36L; - private static final long IMAGE_FLIP_HORIZONTAL_ATTRIBUTE_ID = 37L; - private static final long IMAGE_FLIP_VERTICAL_ATTRIBUTE_ID = 38L; - private static final long LOCAL_VIDEO_RECORDING_ENABLED_ATTRIBUTE_ID = 39L; - private static final long LOCAL_SNAPSHOT_RECORDING_ENABLED_ATTRIBUTE_ID = 40L; - private static final long STATUS_LIGHT_ENABLED_ATTRIBUTE_ID = 41L; - private static final long STATUS_LIGHT_BRIGHTNESS_ATTRIBUTE_ID = 42L; + private static final long FABRICS_USING_CAMERA_ATTRIBUTE_ID = 14L; + private static final long ALLOCATED_VIDEO_STREAMS_ATTRIBUTE_ID = 15L; + private static final long ALLOCATED_AUDIO_STREAMS_ATTRIBUTE_ID = 16L; + private static final long ALLOCATED_SNAPSHOT_STREAMS_ATTRIBUTE_ID = 17L; + private static final long RANKED_VIDEO_STREAM_PRIORITIES_LIST_ATTRIBUTE_ID = 18L; + private static final long SOFT_RECORDING_PRIVACY_MODE_ENABLED_ATTRIBUTE_ID = 19L; + private static final long SOFT_LIVESTREAM_PRIVACY_MODE_ENABLED_ATTRIBUTE_ID = 20L; + private static final long HARD_PRIVACY_MODE_ON_ATTRIBUTE_ID = 21L; + private static final long NIGHT_VISION_ATTRIBUTE_ID = 22L; + private static final long NIGHT_VISION_ILLUM_ATTRIBUTE_ID = 23L; + private static final long VIEWPORT_ATTRIBUTE_ID = 24L; + private static final long SPEAKER_MUTED_ATTRIBUTE_ID = 25L; + private static final long SPEAKER_VOLUME_LEVEL_ATTRIBUTE_ID = 26L; + private static final long SPEAKER_MAX_LEVEL_ATTRIBUTE_ID = 27L; + private static final long SPEAKER_MIN_LEVEL_ATTRIBUTE_ID = 28L; + private static final long MICROPHONE_MUTED_ATTRIBUTE_ID = 29L; + private static final long MICROPHONE_VOLUME_LEVEL_ATTRIBUTE_ID = 30L; + private static final long MICROPHONE_MAX_LEVEL_ATTRIBUTE_ID = 31L; + private static final long MICROPHONE_MIN_LEVEL_ATTRIBUTE_ID = 32L; + private static final long MICROPHONE_AGC_ENABLED_ATTRIBUTE_ID = 33L; + private static final long IMAGE_ROTATION_ATTRIBUTE_ID = 34L; + private static final long IMAGE_FLIP_HORIZONTAL_ATTRIBUTE_ID = 35L; + private static final long IMAGE_FLIP_VERTICAL_ATTRIBUTE_ID = 36L; + private static final long LOCAL_VIDEO_RECORDING_ENABLED_ATTRIBUTE_ID = 37L; + private static final long LOCAL_SNAPSHOT_RECORDING_ENABLED_ATTRIBUTE_ID = 38L; + private static final long STATUS_LIGHT_ENABLED_ATTRIBUTE_ID = 39L; + private static final long STATUS_LIGHT_BRIGHTNESS_ATTRIBUTE_ID = 40L; private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L; @@ -59980,11 +59978,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void snapshotStreamAllocate(SnapshotStreamAllocateResponseCallback callback, Integer imageCodec, Integer frameRate, Long bitRate, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct minResolution, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct maxResolution, Integer quality) { - snapshotStreamAllocate(callback, imageCodec, frameRate, bitRate, minResolution, maxResolution, quality, 0); + public void snapshotStreamAllocate(SnapshotStreamAllocateResponseCallback callback, Integer imageCodec, Integer maxFrameRate, Long bitRate, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct minResolution, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct maxResolution, Integer quality) { + snapshotStreamAllocate(callback, imageCodec, maxFrameRate, bitRate, minResolution, maxResolution, quality, 0); } - public void snapshotStreamAllocate(SnapshotStreamAllocateResponseCallback callback, Integer imageCodec, Integer frameRate, Long bitRate, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct minResolution, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct maxResolution, Integer quality, int timedInvokeTimeoutMs) { + public void snapshotStreamAllocate(SnapshotStreamAllocateResponseCallback callback, Integer imageCodec, Integer maxFrameRate, Long bitRate, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct minResolution, ChipStructs.CameraAvStreamManagementClusterVideoResolutionStruct maxResolution, Integer quality, int timedInvokeTimeoutMs) { final long commandId = 7L; ArrayList elements = new ArrayList<>(); @@ -59992,9 +59990,9 @@ public void snapshotStreamAllocate(SnapshotStreamAllocateResponseCallback callba BaseTLVType imageCodectlvValue = new UIntType(imageCodec); elements.add(new StructElement(imageCodecFieldID, imageCodectlvValue)); - final long frameRateFieldID = 1L; - BaseTLVType frameRatetlvValue = new UIntType(frameRate); - elements.add(new StructElement(frameRateFieldID, frameRatetlvValue)); + final long maxFrameRateFieldID = 1L; + BaseTLVType maxFrameRatetlvValue = new UIntType(maxFrameRate); + elements.add(new StructElement(maxFrameRateFieldID, maxFrameRatetlvValue)); final long bitRateFieldID = 2L; BaseTLVType bitRatetlvValue = new UIntType(bitRate); @@ -60130,14 +60128,6 @@ public interface SupportedSnapshotParamsAttributeCallback extends BaseAttributeC void onSuccess(List value); } - public interface CurrentVideoCodecsAttributeCallback extends BaseAttributeCallback { - void onSuccess(List value); - } - - public interface CurrentSnapshotConfigAttributeCallback extends BaseAttributeCallback { - void onSuccess(ChipStructs.CameraAvStreamManagementClusterSnapshotParamsStruct value); - } - public interface FabricsUsingCameraAttributeCallback extends BaseAttributeCallback { void onSuccess(List value); } @@ -60551,58 +60541,6 @@ public void onSuccess(byte[] tlv) { }, HDR_MODE_ENABLED_ATTRIBUTE_ID, minInterval, maxInterval); } - public void readCurrentVideoCodecsAttribute( - CurrentVideoCodecsAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_VIDEO_CODECS_ATTRIBUTE_ID); - - readAttribute(new ReportCallbackImpl(callback, path) { - @Override - public void onSuccess(byte[] tlv) { - List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); - callback.onSuccess(value); - } - }, CURRENT_VIDEO_CODECS_ATTRIBUTE_ID, true); - } - - public void subscribeCurrentVideoCodecsAttribute( - CurrentVideoCodecsAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_VIDEO_CODECS_ATTRIBUTE_ID); - - subscribeAttribute(new ReportCallbackImpl(callback, path) { - @Override - public void onSuccess(byte[] tlv) { - List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); - callback.onSuccess(value); - } - }, CURRENT_VIDEO_CODECS_ATTRIBUTE_ID, minInterval, maxInterval); - } - - public void readCurrentSnapshotConfigAttribute( - CurrentSnapshotConfigAttributeCallback callback) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SNAPSHOT_CONFIG_ATTRIBUTE_ID); - - readAttribute(new ReportCallbackImpl(callback, path) { - @Override - public void onSuccess(byte[] tlv) { - ChipStructs.CameraAvStreamManagementClusterSnapshotParamsStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); - callback.onSuccess(value); - } - }, CURRENT_SNAPSHOT_CONFIG_ATTRIBUTE_ID, true); - } - - public void subscribeCurrentSnapshotConfigAttribute( - CurrentSnapshotConfigAttributeCallback callback, int minInterval, int maxInterval) { - ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_SNAPSHOT_CONFIG_ATTRIBUTE_ID); - - subscribeAttribute(new ReportCallbackImpl(callback, path) { - @Override - public void onSuccess(byte[] tlv) { - ChipStructs.CameraAvStreamManagementClusterSnapshotParamsStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); - callback.onSuccess(value); - } - }, CURRENT_SNAPSHOT_CONFIG_ATTRIBUTE_ID, minInterval, maxInterval); - } - public void readFabricsUsingCameraAttribute( FabricsUsingCameraAttributeCallback callback) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FABRICS_USING_CAMERA_ATTRIBUTE_ID); @@ -60720,15 +60658,6 @@ public void onSuccess(byte[] tlv) { }, RANKED_VIDEO_STREAM_PRIORITIES_LIST_ATTRIBUTE_ID, true); } - public void writeRankedVideoStreamPrioritiesListAttribute(DefaultClusterCallback callback, ArrayList value) { - writeRankedVideoStreamPrioritiesListAttribute(callback, value, 0); - } - - public void writeRankedVideoStreamPrioritiesListAttribute(DefaultClusterCallback callback, ArrayList value, int timedWriteTimeoutMs) { - BaseTLVType tlvValue = ArrayType.generateArrayType(value, (elementvalue) -> new UIntType(elementvalue)); - writeAttribute(new WriteAttributesCallbackImpl(callback), RANKED_VIDEO_STREAM_PRIORITIES_LIST_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs); - } - public void subscribeRankedVideoStreamPrioritiesListAttribute( RankedVideoStreamPrioritiesListAttributeCallback callback, int minInterval, int maxInterval) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, RANKED_VIDEO_STREAM_PRIORITIES_LIST_ATTRIBUTE_ID); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index 0f40fb5c326ba0..86a43781fec889 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -17087,35 +17087,33 @@ public enum Attribute { MaxNetworkBandwidth(11L), CurrentFrameRate(12L), HDRModeEnabled(13L), - CurrentVideoCodecs(14L), - CurrentSnapshotConfig(15L), - FabricsUsingCamera(16L), - AllocatedVideoStreams(17L), - AllocatedAudioStreams(18L), - AllocatedSnapshotStreams(19L), - RankedVideoStreamPrioritiesList(20L), - SoftRecordingPrivacyModeEnabled(21L), - SoftLivestreamPrivacyModeEnabled(22L), - HardPrivacyModeOn(23L), - NightVision(24L), - NightVisionIllum(25L), - Viewport(26L), - SpeakerMuted(27L), - SpeakerVolumeLevel(28L), - SpeakerMaxLevel(29L), - SpeakerMinLevel(30L), - MicrophoneMuted(31L), - MicrophoneVolumeLevel(32L), - MicrophoneMaxLevel(33L), - MicrophoneMinLevel(34L), - MicrophoneAGCEnabled(35L), - ImageRotation(36L), - ImageFlipHorizontal(37L), - ImageFlipVertical(38L), - LocalVideoRecordingEnabled(39L), - LocalSnapshotRecordingEnabled(40L), - StatusLightEnabled(41L), - StatusLightBrightness(42L), + FabricsUsingCamera(14L), + AllocatedVideoStreams(15L), + AllocatedAudioStreams(16L), + AllocatedSnapshotStreams(17L), + RankedVideoStreamPrioritiesList(18L), + SoftRecordingPrivacyModeEnabled(19L), + SoftLivestreamPrivacyModeEnabled(20L), + HardPrivacyModeOn(21L), + NightVision(22L), + NightVisionIllum(23L), + Viewport(24L), + SpeakerMuted(25L), + SpeakerVolumeLevel(26L), + SpeakerMaxLevel(27L), + SpeakerMinLevel(28L), + MicrophoneMuted(29L), + MicrophoneVolumeLevel(30L), + MicrophoneMaxLevel(31L), + MicrophoneMinLevel(32L), + MicrophoneAGCEnabled(33L), + ImageRotation(34L), + ImageFlipHorizontal(35L), + ImageFlipVertical(36L), + LocalVideoRecordingEnabled(37L), + LocalSnapshotRecordingEnabled(38L), + StatusLightEnabled(39L), + StatusLightBrightness(40L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), @@ -17276,7 +17274,7 @@ public static VideoStreamDeallocateCommandField value(int id) throws NoSuchField } throw new NoSuchFieldError(); } - }public enum SnapshotStreamAllocateCommandField {ImageCodec(0),FrameRate(1),BitRate(2),MinResolution(3),MaxResolution(4),Quality(5),; + }public enum SnapshotStreamAllocateCommandField {ImageCodec(0),MaxFrameRate(1),BitRate(2),MinResolution(3),MaxResolution(4),Quality(5),; private final int id; SnapshotStreamAllocateCommandField(int id) { this.id = id; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index d60e57afa2496e..42e96815ef9b43 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -20252,48 +20252,6 @@ public void onError(Exception ex) { } } - public static class DelegatedCameraAvStreamManagementClusterCurrentVideoCodecsAttributeCallback implements ChipClusters.CameraAvStreamManagementCluster.CurrentVideoCodecsAttributeCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(List valueList) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); - responseValues.put(commandResponseInfo, valueList); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception ex) { - callback.onFailure(ex); - } - } - - public static class DelegatedCameraAvStreamManagementClusterCurrentSnapshotConfigAttributeCallback implements ChipClusters.CameraAvStreamManagementCluster.CurrentSnapshotConfigAttributeCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(ChipStructs.CameraAvStreamManagementClusterSnapshotParamsStruct value) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.CameraAvStreamManagementClusterSnapshotParamsStruct"); - responseValues.put(commandResponseInfo, value); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception ex) { - callback.onFailure(ex); - } - } - public static class DelegatedCameraAvStreamManagementClusterFabricsUsingCameraAttributeCallback implements ChipClusters.CameraAvStreamManagementCluster.FabricsUsingCameraAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -29807,8 +29765,8 @@ public Map> getCommandMap() { CommandParameterInfo cameraAvStreamManagementsnapshotStreamAllocateimageCodecCommandParameterInfo = new CommandParameterInfo("imageCodec", Integer.class, Integer.class); cameraAvStreamManagementsnapshotStreamAllocateCommandParams.put("imageCodec",cameraAvStreamManagementsnapshotStreamAllocateimageCodecCommandParameterInfo); - CommandParameterInfo cameraAvStreamManagementsnapshotStreamAllocateframeRateCommandParameterInfo = new CommandParameterInfo("frameRate", Integer.class, Integer.class); - cameraAvStreamManagementsnapshotStreamAllocateCommandParams.put("frameRate",cameraAvStreamManagementsnapshotStreamAllocateframeRateCommandParameterInfo); + CommandParameterInfo cameraAvStreamManagementsnapshotStreamAllocatemaxFrameRateCommandParameterInfo = new CommandParameterInfo("maxFrameRate", Integer.class, Integer.class); + cameraAvStreamManagementsnapshotStreamAllocateCommandParams.put("maxFrameRate",cameraAvStreamManagementsnapshotStreamAllocatemaxFrameRateCommandParameterInfo); CommandParameterInfo cameraAvStreamManagementsnapshotStreamAllocatebitRateCommandParameterInfo = new CommandParameterInfo("bitRate", Long.class, Long.class); cameraAvStreamManagementsnapshotStreamAllocateCommandParams.put("bitRate",cameraAvStreamManagementsnapshotStreamAllocatebitRateCommandParameterInfo); @@ -29825,7 +29783,7 @@ public Map> getCommandMap() { commandArguments.get("imageCodec") , (Integer) - commandArguments.get("frameRate") + commandArguments.get("maxFrameRate") , (Long) commandArguments.get("bitRate") diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index eb1dcbafc176d5..85d8c246765215 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -18406,17 +18406,6 @@ private static Map readCameraAvStreamManagementInteract readCameraAvStreamManagementHDRModeEnabledCommandParams ); result.put("readHDRModeEnabledAttribute", readCameraAvStreamManagementHDRModeEnabledAttributeInteractionInfo); - Map readCameraAvStreamManagementCurrentVideoCodecsCommandParams = new LinkedHashMap(); - InteractionInfo readCameraAvStreamManagementCurrentVideoCodecsAttributeInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.CameraAvStreamManagementCluster) cluster).readCurrentVideoCodecsAttribute( - (ChipClusters.CameraAvStreamManagementCluster.CurrentVideoCodecsAttributeCallback) callback - ); - }, - () -> new ClusterInfoMapping.DelegatedCameraAvStreamManagementClusterCurrentVideoCodecsAttributeCallback(), - readCameraAvStreamManagementCurrentVideoCodecsCommandParams - ); - result.put("readCurrentVideoCodecsAttribute", readCameraAvStreamManagementCurrentVideoCodecsAttributeInteractionInfo); Map readCameraAvStreamManagementFabricsUsingCameraCommandParams = new LinkedHashMap(); InteractionInfo readCameraAvStreamManagementFabricsUsingCameraAttributeInteractionInfo = 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 9a8e562d2fda11..ffcad10cbf9ef1 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 @@ -133,29 +133,6 @@ class CameraAvStreamManagementCluster( object SubscriptionEstablished : SupportedSnapshotParamsAttributeSubscriptionState() } - class CurrentVideoCodecsAttribute(val value: List?) - - sealed class CurrentVideoCodecsAttributeSubscriptionState { - data class Success(val value: List?) : CurrentVideoCodecsAttributeSubscriptionState() - - data class Error(val exception: Exception) : CurrentVideoCodecsAttributeSubscriptionState() - - object SubscriptionEstablished : CurrentVideoCodecsAttributeSubscriptionState() - } - - class CurrentSnapshotConfigAttribute( - val value: CameraAvStreamManagementClusterSnapshotParamsStruct? - ) - - sealed class CurrentSnapshotConfigAttributeSubscriptionState { - data class Success(val value: CameraAvStreamManagementClusterSnapshotParamsStruct?) : - CurrentSnapshotConfigAttributeSubscriptionState() - - data class Error(val exception: Exception) : CurrentSnapshotConfigAttributeSubscriptionState() - - object SubscriptionEstablished : CurrentSnapshotConfigAttributeSubscriptionState() - } - class FabricsUsingCameraAttribute(val value: List) sealed class FabricsUsingCameraAttributeSubscriptionState { @@ -511,7 +488,7 @@ class CameraAvStreamManagementCluster( suspend fun snapshotStreamAllocate( imageCodec: UByte, - frameRate: UShort, + maxFrameRate: UShort, bitRate: UInt, minResolution: CameraAvStreamManagementClusterVideoResolutionStruct, maxResolution: CameraAvStreamManagementClusterVideoResolutionStruct, @@ -526,8 +503,8 @@ class CameraAvStreamManagementCluster( val TAG_IMAGE_CODEC_REQ: Int = 0 tlvWriter.put(ContextSpecificTag(TAG_IMAGE_CODEC_REQ), imageCodec) - val TAG_FRAME_RATE_REQ: Int = 1 - tlvWriter.put(ContextSpecificTag(TAG_FRAME_RATE_REQ), frameRate) + val TAG_MAX_FRAME_RATE_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_MAX_FRAME_RATE_REQ), maxFrameRate) val TAG_BIT_RATE_REQ: Int = 2 tlvWriter.put(ContextSpecificTag(TAG_BIT_RATE_REQ), bitRate) @@ -2039,206 +2016,8 @@ class CameraAvStreamManagementCluster( } } - suspend fun readCurrentVideoCodecsAttribute(): CurrentVideoCodecsAttribute { - val ATTRIBUTE_ID: UInt = 14u - - val attributePath = - AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) - - val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) - - val response = controller.read(readRequest) - - if (response.successes.isEmpty()) { - logger.log(Level.WARNING, "Read command failed") - throw IllegalStateException("Read command failed with failures: ${response.failures}") - } - - logger.log(Level.FINE, "Read command succeeded") - - val attributeData = - response.successes.filterIsInstance().firstOrNull { - it.path.attributeId == ATTRIBUTE_ID - } - - requireNotNull(attributeData) { "Currentvideocodecs attribute not found in response" } - - // Decode the TLV data into the appropriate type - val tlvReader = TlvReader(attributeData.data) - val decodedValue: List? = - if (tlvReader.isNextTag(AnonymousTag)) { - buildList { - tlvReader.enterArray(AnonymousTag) - while (!tlvReader.isEndOfContainer()) { - add(tlvReader.getUByte(AnonymousTag)) - } - tlvReader.exitContainer() - } - } else { - null - } - - return CurrentVideoCodecsAttribute(decodedValue) - } - - suspend fun subscribeCurrentVideoCodecsAttribute( - minInterval: Int, - maxInterval: Int, - ): Flow { - val ATTRIBUTE_ID: UInt = 14u - val attributePaths = - listOf( - AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) - ) - - val subscribeRequest: SubscribeRequest = - SubscribeRequest( - eventPaths = emptyList(), - attributePaths = attributePaths, - minInterval = Duration.ofSeconds(minInterval.toLong()), - maxInterval = Duration.ofSeconds(maxInterval.toLong()), - ) - - return controller.subscribe(subscribeRequest).transform { subscriptionState -> - when (subscriptionState) { - is SubscriptionState.SubscriptionErrorNotification -> { - emit( - CurrentVideoCodecsAttributeSubscriptionState.Error( - Exception( - "Subscription terminated with error code: ${subscriptionState.terminationCause}" - ) - ) - ) - } - is SubscriptionState.NodeStateUpdate -> { - val attributeData = - subscriptionState.updateState.successes - .filterIsInstance() - .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } - - requireNotNull(attributeData) { - "Currentvideocodecs attribute not found in Node State update" - } - - // Decode the TLV data into the appropriate type - val tlvReader = TlvReader(attributeData.data) - val decodedValue: List? = - if (tlvReader.isNextTag(AnonymousTag)) { - buildList { - tlvReader.enterArray(AnonymousTag) - while (!tlvReader.isEndOfContainer()) { - add(tlvReader.getUByte(AnonymousTag)) - } - tlvReader.exitContainer() - } - } else { - null - } - - decodedValue?.let { emit(CurrentVideoCodecsAttributeSubscriptionState.Success(it)) } - } - SubscriptionState.SubscriptionEstablished -> { - emit(CurrentVideoCodecsAttributeSubscriptionState.SubscriptionEstablished) - } - } - } - } - - suspend fun readCurrentSnapshotConfigAttribute(): CurrentSnapshotConfigAttribute { - val ATTRIBUTE_ID: UInt = 15u - - val attributePath = - AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) - - val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) - - val response = controller.read(readRequest) - - if (response.successes.isEmpty()) { - logger.log(Level.WARNING, "Read command failed") - throw IllegalStateException("Read command failed with failures: ${response.failures}") - } - - logger.log(Level.FINE, "Read command succeeded") - - val attributeData = - response.successes.filterIsInstance().firstOrNull { - it.path.attributeId == ATTRIBUTE_ID - } - - requireNotNull(attributeData) { "Currentsnapshotconfig attribute not found in response" } - - // Decode the TLV data into the appropriate type - val tlvReader = TlvReader(attributeData.data) - val decodedValue: CameraAvStreamManagementClusterSnapshotParamsStruct? = - if (tlvReader.isNextTag(AnonymousTag)) { - CameraAvStreamManagementClusterSnapshotParamsStruct.fromTlv(AnonymousTag, tlvReader) - } else { - null - } - - return CurrentSnapshotConfigAttribute(decodedValue) - } - - suspend fun subscribeCurrentSnapshotConfigAttribute( - minInterval: Int, - maxInterval: Int, - ): Flow { - val ATTRIBUTE_ID: UInt = 15u - val attributePaths = - listOf( - AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) - ) - - val subscribeRequest: SubscribeRequest = - SubscribeRequest( - eventPaths = emptyList(), - attributePaths = attributePaths, - minInterval = Duration.ofSeconds(minInterval.toLong()), - maxInterval = Duration.ofSeconds(maxInterval.toLong()), - ) - - return controller.subscribe(subscribeRequest).transform { subscriptionState -> - when (subscriptionState) { - is SubscriptionState.SubscriptionErrorNotification -> { - emit( - CurrentSnapshotConfigAttributeSubscriptionState.Error( - Exception( - "Subscription terminated with error code: ${subscriptionState.terminationCause}" - ) - ) - ) - } - is SubscriptionState.NodeStateUpdate -> { - val attributeData = - subscriptionState.updateState.successes - .filterIsInstance() - .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } - - requireNotNull(attributeData) { - "Currentsnapshotconfig attribute not found in Node State update" - } - - // Decode the TLV data into the appropriate type - val tlvReader = TlvReader(attributeData.data) - val decodedValue: CameraAvStreamManagementClusterSnapshotParamsStruct? = - if (tlvReader.isNextTag(AnonymousTag)) { - CameraAvStreamManagementClusterSnapshotParamsStruct.fromTlv(AnonymousTag, tlvReader) - } else { - null - } - - decodedValue?.let { emit(CurrentSnapshotConfigAttributeSubscriptionState.Success(it)) } - } - SubscriptionState.SubscriptionEstablished -> { - emit(CurrentSnapshotConfigAttributeSubscriptionState.SubscriptionEstablished) - } - } - } - } - suspend fun readFabricsUsingCameraAttribute(): FabricsUsingCameraAttribute { - val ATTRIBUTE_ID: UInt = 16u + val ATTRIBUTE_ID: UInt = 14u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2279,7 +2058,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 16u + val ATTRIBUTE_ID: UInt = 14u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2335,7 +2114,7 @@ class CameraAvStreamManagementCluster( } suspend fun readAllocatedVideoStreamsAttribute(): AllocatedVideoStreamsAttribute { - val ATTRIBUTE_ID: UInt = 17u + val ATTRIBUTE_ID: UInt = 15u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2380,7 +2159,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 17u + val ATTRIBUTE_ID: UInt = 15u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2445,7 +2224,7 @@ class CameraAvStreamManagementCluster( } suspend fun readAllocatedAudioStreamsAttribute(): AllocatedAudioStreamsAttribute { - val ATTRIBUTE_ID: UInt = 18u + val ATTRIBUTE_ID: UInt = 16u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2490,7 +2269,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 18u + val ATTRIBUTE_ID: UInt = 16u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2555,7 +2334,7 @@ class CameraAvStreamManagementCluster( } suspend fun readAllocatedSnapshotStreamsAttribute(): AllocatedSnapshotStreamsAttribute { - val ATTRIBUTE_ID: UInt = 19u + val ATTRIBUTE_ID: UInt = 17u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2602,7 +2381,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 19u + val ATTRIBUTE_ID: UInt = 17u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2668,7 +2447,7 @@ class CameraAvStreamManagementCluster( suspend fun readRankedVideoStreamPrioritiesListAttribute(): RankedVideoStreamPrioritiesListAttribute { - val ATTRIBUTE_ID: UInt = 20u + val ATTRIBUTE_ID: UInt = 18u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2711,58 +2490,11 @@ class CameraAvStreamManagementCluster( return RankedVideoStreamPrioritiesListAttribute(decodedValue) } - suspend fun writeRankedVideoStreamPrioritiesListAttribute( - value: List, - timedWriteTimeout: Duration? = null, - ) { - val ATTRIBUTE_ID: UInt = 20u - - val tlvWriter = TlvWriter() - tlvWriter.startArray(AnonymousTag) - for (item in value.iterator()) { - tlvWriter.put(AnonymousTag, item) - } - tlvWriter.endArray() - - val writeRequests: WriteRequests = - WriteRequests( - requests = - listOf( - WriteRequest( - attributePath = - AttributePath(endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID), - tlvPayload = tlvWriter.getEncoded(), - ) - ), - timedRequest = timedWriteTimeout, - ) - - val response: WriteResponse = controller.write(writeRequests) - - when (response) { - is WriteResponse.Success -> { - logger.log(Level.FINE, "Write command succeeded") - } - is WriteResponse.PartialWriteFailure -> { - val aggregatedErrorMessage = - response.failures.joinToString("\n") { failure -> - "Error at ${failure.attributePath}: ${failure.ex.message}" - } - - response.failures.forEach { failure -> - logger.log(Level.WARNING, "Error at ${failure.attributePath}: ${failure.ex.message}") - } - - throw IllegalStateException("Write command failed with errors: \n$aggregatedErrorMessage") - } - } - } - suspend fun subscribeRankedVideoStreamPrioritiesListAttribute( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 20u + val ATTRIBUTE_ID: UInt = 18u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2824,7 +2556,7 @@ class CameraAvStreamManagementCluster( } suspend fun readSoftRecordingPrivacyModeEnabledAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 21u + val ATTRIBUTE_ID: UInt = 19u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2865,7 +2597,7 @@ class CameraAvStreamManagementCluster( value: Boolean, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 21u + val ATTRIBUTE_ID: UInt = 19u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -2908,7 +2640,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 21u + val ATTRIBUTE_ID: UInt = 19u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -2962,7 +2694,7 @@ class CameraAvStreamManagementCluster( } suspend fun readSoftLivestreamPrivacyModeEnabledAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 22u + val ATTRIBUTE_ID: UInt = 20u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3003,7 +2735,7 @@ class CameraAvStreamManagementCluster( value: Boolean, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 22u + val ATTRIBUTE_ID: UInt = 20u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -3046,7 +2778,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 22u + val ATTRIBUTE_ID: UInt = 20u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3100,7 +2832,7 @@ class CameraAvStreamManagementCluster( } suspend fun readHardPrivacyModeOnAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 23u + val ATTRIBUTE_ID: UInt = 21u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3139,7 +2871,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 23u + val ATTRIBUTE_ID: UInt = 21u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3193,7 +2925,7 @@ class CameraAvStreamManagementCluster( } suspend fun readNightVisionAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 24u + val ATTRIBUTE_ID: UInt = 22u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3229,7 +2961,7 @@ class CameraAvStreamManagementCluster( } suspend fun writeNightVisionAttribute(value: UByte, timedWriteTimeout: Duration? = null) { - val ATTRIBUTE_ID: UInt = 24u + val ATTRIBUTE_ID: UInt = 22u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -3272,7 +3004,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 24u + val ATTRIBUTE_ID: UInt = 22u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3324,7 +3056,7 @@ class CameraAvStreamManagementCluster( } suspend fun readNightVisionIllumAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 25u + val ATTRIBUTE_ID: UInt = 23u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3360,7 +3092,7 @@ class CameraAvStreamManagementCluster( } suspend fun writeNightVisionIllumAttribute(value: UByte, timedWriteTimeout: Duration? = null) { - val ATTRIBUTE_ID: UInt = 25u + val ATTRIBUTE_ID: UInt = 23u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -3403,7 +3135,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 25u + val ATTRIBUTE_ID: UInt = 23u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3457,7 +3189,7 @@ class CameraAvStreamManagementCluster( } suspend fun readViewportAttribute(): ViewportAttribute { - val ATTRIBUTE_ID: UInt = 26u + val ATTRIBUTE_ID: UInt = 24u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3496,7 +3228,7 @@ class CameraAvStreamManagementCluster( value: CameraAvStreamManagementClusterViewportStruct, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 26u + val ATTRIBUTE_ID: UInt = 24u val tlvWriter = TlvWriter() value.toTlv(AnonymousTag, tlvWriter) @@ -3539,7 +3271,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 26u + val ATTRIBUTE_ID: UInt = 24u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3591,7 +3323,7 @@ class CameraAvStreamManagementCluster( } suspend fun readSpeakerMutedAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 27u + val ATTRIBUTE_ID: UInt = 25u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3627,7 +3359,7 @@ class CameraAvStreamManagementCluster( } suspend fun writeSpeakerMutedAttribute(value: Boolean, timedWriteTimeout: Duration? = null) { - val ATTRIBUTE_ID: UInt = 27u + val ATTRIBUTE_ID: UInt = 25u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -3670,7 +3402,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 27u + val ATTRIBUTE_ID: UInt = 25u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3722,7 +3454,7 @@ class CameraAvStreamManagementCluster( } suspend fun readSpeakerVolumeLevelAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 28u + val ATTRIBUTE_ID: UInt = 26u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3758,7 +3490,7 @@ class CameraAvStreamManagementCluster( } suspend fun writeSpeakerVolumeLevelAttribute(value: UByte, timedWriteTimeout: Duration? = null) { - val ATTRIBUTE_ID: UInt = 28u + val ATTRIBUTE_ID: UInt = 26u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -3801,7 +3533,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 28u + val ATTRIBUTE_ID: UInt = 26u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3855,7 +3587,7 @@ class CameraAvStreamManagementCluster( } suspend fun readSpeakerMaxLevelAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 29u + val ATTRIBUTE_ID: UInt = 27u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3894,7 +3626,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 29u + val ATTRIBUTE_ID: UInt = 27u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3948,7 +3680,7 @@ class CameraAvStreamManagementCluster( } suspend fun readSpeakerMinLevelAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 30u + val ATTRIBUTE_ID: UInt = 28u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -3987,7 +3719,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 30u + val ATTRIBUTE_ID: UInt = 28u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4041,7 +3773,7 @@ class CameraAvStreamManagementCluster( } suspend fun readMicrophoneMutedAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 31u + val ATTRIBUTE_ID: UInt = 29u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4077,7 +3809,7 @@ class CameraAvStreamManagementCluster( } suspend fun writeMicrophoneMutedAttribute(value: Boolean, timedWriteTimeout: Duration? = null) { - val ATTRIBUTE_ID: UInt = 31u + val ATTRIBUTE_ID: UInt = 29u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -4120,7 +3852,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 31u + val ATTRIBUTE_ID: UInt = 29u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4174,7 +3906,7 @@ class CameraAvStreamManagementCluster( } suspend fun readMicrophoneVolumeLevelAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 32u + val ATTRIBUTE_ID: UInt = 30u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4213,7 +3945,7 @@ class CameraAvStreamManagementCluster( value: UByte, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 32u + val ATTRIBUTE_ID: UInt = 30u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -4256,7 +3988,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 32u + val ATTRIBUTE_ID: UInt = 30u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4310,7 +4042,7 @@ class CameraAvStreamManagementCluster( } suspend fun readMicrophoneMaxLevelAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 33u + val ATTRIBUTE_ID: UInt = 31u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4349,7 +4081,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 33u + val ATTRIBUTE_ID: UInt = 31u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4403,7 +4135,7 @@ class CameraAvStreamManagementCluster( } suspend fun readMicrophoneMinLevelAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 34u + val ATTRIBUTE_ID: UInt = 32u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4442,7 +4174,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 34u + val ATTRIBUTE_ID: UInt = 32u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4496,7 +4228,7 @@ class CameraAvStreamManagementCluster( } suspend fun readMicrophoneAGCEnabledAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 35u + val ATTRIBUTE_ID: UInt = 33u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4535,7 +4267,7 @@ class CameraAvStreamManagementCluster( value: Boolean, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 35u + val ATTRIBUTE_ID: UInt = 33u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -4578,7 +4310,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 35u + val ATTRIBUTE_ID: UInt = 33u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4632,7 +4364,7 @@ class CameraAvStreamManagementCluster( } suspend fun readImageRotationAttribute(): UShort? { - val ATTRIBUTE_ID: UInt = 36u + val ATTRIBUTE_ID: UInt = 34u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4668,7 +4400,7 @@ class CameraAvStreamManagementCluster( } suspend fun writeImageRotationAttribute(value: UShort, timedWriteTimeout: Duration? = null) { - val ATTRIBUTE_ID: UInt = 36u + val ATTRIBUTE_ID: UInt = 34u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -4711,7 +4443,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 36u + val ATTRIBUTE_ID: UInt = 34u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4763,7 +4495,7 @@ class CameraAvStreamManagementCluster( } suspend fun readImageFlipHorizontalAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 37u + val ATTRIBUTE_ID: UInt = 35u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4802,7 +4534,7 @@ class CameraAvStreamManagementCluster( value: Boolean, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 37u + val ATTRIBUTE_ID: UInt = 35u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -4845,7 +4577,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 37u + val ATTRIBUTE_ID: UInt = 35u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4899,7 +4631,7 @@ class CameraAvStreamManagementCluster( } suspend fun readImageFlipVerticalAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 38u + val ATTRIBUTE_ID: UInt = 36u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -4935,7 +4667,7 @@ class CameraAvStreamManagementCluster( } suspend fun writeImageFlipVerticalAttribute(value: Boolean, timedWriteTimeout: Duration? = null) { - val ATTRIBUTE_ID: UInt = 38u + val ATTRIBUTE_ID: UInt = 36u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -4978,7 +4710,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 38u + val ATTRIBUTE_ID: UInt = 36u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5032,7 +4764,7 @@ class CameraAvStreamManagementCluster( } suspend fun readLocalVideoRecordingEnabledAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 39u + val ATTRIBUTE_ID: UInt = 37u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5071,7 +4803,7 @@ class CameraAvStreamManagementCluster( value: Boolean, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 39u + val ATTRIBUTE_ID: UInt = 37u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -5114,7 +4846,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 39u + val ATTRIBUTE_ID: UInt = 37u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5168,7 +4900,7 @@ class CameraAvStreamManagementCluster( } suspend fun readLocalSnapshotRecordingEnabledAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 40u + val ATTRIBUTE_ID: UInt = 38u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5209,7 +4941,7 @@ class CameraAvStreamManagementCluster( value: Boolean, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 40u + val ATTRIBUTE_ID: UInt = 38u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -5252,7 +4984,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 40u + val ATTRIBUTE_ID: UInt = 38u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5306,7 +5038,7 @@ class CameraAvStreamManagementCluster( } suspend fun readStatusLightEnabledAttribute(): Boolean? { - val ATTRIBUTE_ID: UInt = 41u + val ATTRIBUTE_ID: UInt = 39u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5345,7 +5077,7 @@ class CameraAvStreamManagementCluster( value: Boolean, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 41u + val ATTRIBUTE_ID: UInt = 39u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -5388,7 +5120,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 41u + val ATTRIBUTE_ID: UInt = 39u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5442,7 +5174,7 @@ class CameraAvStreamManagementCluster( } suspend fun readStatusLightBrightnessAttribute(): UByte? { - val ATTRIBUTE_ID: UInt = 42u + val ATTRIBUTE_ID: UInt = 40u val attributePath = AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) @@ -5481,7 +5213,7 @@ class CameraAvStreamManagementCluster( value: UByte, timedWriteTimeout: Duration? = null, ) { - val ATTRIBUTE_ID: UInt = 42u + val ATTRIBUTE_ID: UInt = 40u val tlvWriter = TlvWriter() tlvWriter.put(AnonymousTag, value) @@ -5524,7 +5256,7 @@ class CameraAvStreamManagementCluster( minInterval: Int, maxInterval: Int, ): Flow { - val ATTRIBUTE_ID: UInt = 42u + val ATTRIBUTE_ID: UInt = 40u val attributePaths = listOf( AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index d307822772fe53..deddd974e4515e 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -40493,123 +40493,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jnivalue, value); return value; } - case Attributes::CurrentVideoCodecs::Id: { - using TypeInfo = Attributes::CurrentVideoCodecs::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - chip::JniReferences::GetInstance().CreateArrayList(value); - - auto iter_value_0 = cppValue.begin(); - while (iter_value_0.Next()) - { - auto & entry_0 = iter_value_0.GetValue(); - jobject newElement_0; - std::string newElement_0ClassName = "java/lang/Integer"; - std::string newElement_0CtorSignature = "(I)V"; - jint jninewElement_0 = static_cast(entry_0); - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0); - chip::JniReferences::GetInstance().AddToList(value, newElement_0); - } - return value; - } - case Attributes::CurrentSnapshotConfig::Id: { - using TypeInfo = Attributes::CurrentSnapshotConfig::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - jobject value_resolution; - jobject value_resolution_width; - std::string value_resolution_widthClassName = "java/lang/Integer"; - std::string value_resolution_widthCtorSignature = "(I)V"; - jint jnivalue_resolution_width = static_cast(cppValue.resolution.width); - chip::JniReferences::GetInstance().CreateBoxedObject(value_resolution_widthClassName.c_str(), - value_resolution_widthCtorSignature.c_str(), - jnivalue_resolution_width, value_resolution_width); - jobject value_resolution_height; - std::string value_resolution_heightClassName = "java/lang/Integer"; - std::string value_resolution_heightCtorSignature = "(I)V"; - jint jnivalue_resolution_height = static_cast(cppValue.resolution.height); - chip::JniReferences::GetInstance().CreateBoxedObject(value_resolution_heightClassName.c_str(), - value_resolution_heightCtorSignature.c_str(), - jnivalue_resolution_height, value_resolution_height); - - { - jclass videoResolutionStructStructClass_1; - err = chip::JniReferences::GetInstance().GetLocalClassRef( - env, "chip/devicecontroller/ChipStructs$CameraAvStreamManagementClusterVideoResolutionStruct", - videoResolutionStructStructClass_1); - if (err != CHIP_NO_ERROR) - { - ChipLogError(Zcl, "Could not find class ChipStructs$CameraAvStreamManagementClusterVideoResolutionStruct"); - return nullptr; - } - - jmethodID videoResolutionStructStructCtor_1; - err = chip::JniReferences::GetInstance().FindMethod(env, videoResolutionStructStructClass_1, "", - "(Ljava/lang/Integer;Ljava/lang/Integer;)V", - &videoResolutionStructStructCtor_1); - if (err != CHIP_NO_ERROR || videoResolutionStructStructCtor_1 == nullptr) - { - ChipLogError(Zcl, - "Could not find ChipStructs$CameraAvStreamManagementClusterVideoResolutionStruct constructor"); - return nullptr; - } - - value_resolution = env->NewObject(videoResolutionStructStructClass_1, videoResolutionStructStructCtor_1, - value_resolution_width, value_resolution_height); - } - jobject value_maxFrameRate; - std::string value_maxFrameRateClassName = "java/lang/Integer"; - std::string value_maxFrameRateCtorSignature = "(I)V"; - jint jnivalue_maxFrameRate = static_cast(cppValue.maxFrameRate); - chip::JniReferences::GetInstance().CreateBoxedObject(value_maxFrameRateClassName.c_str(), - value_maxFrameRateCtorSignature.c_str(), - jnivalue_maxFrameRate, value_maxFrameRate); - jobject value_imageCodec; - std::string value_imageCodecClassName = "java/lang/Integer"; - std::string value_imageCodecCtorSignature = "(I)V"; - jint jnivalue_imageCodec = static_cast(cppValue.imageCodec); - chip::JniReferences::GetInstance().CreateBoxedObject( - value_imageCodecClassName.c_str(), value_imageCodecCtorSignature.c_str(), jnivalue_imageCodec, value_imageCodec); - - { - jclass snapshotParamsStructStructClass_0; - err = chip::JniReferences::GetInstance().GetLocalClassRef( - env, "chip/devicecontroller/ChipStructs$CameraAvStreamManagementClusterSnapshotParamsStruct", - snapshotParamsStructStructClass_0); - if (err != CHIP_NO_ERROR) - { - ChipLogError(Zcl, "Could not find class ChipStructs$CameraAvStreamManagementClusterSnapshotParamsStruct"); - return nullptr; - } - - jmethodID snapshotParamsStructStructCtor_0; - err = chip::JniReferences::GetInstance().FindMethod( - env, snapshotParamsStructStructClass_0, "", - "(Lchip/devicecontroller/ChipStructs$CameraAvStreamManagementClusterVideoResolutionStruct;Ljava/lang/" - "Integer;Ljava/lang/Integer;)V", - &snapshotParamsStructStructCtor_0); - if (err != CHIP_NO_ERROR || snapshotParamsStructStructCtor_0 == nullptr) - { - ChipLogError(Zcl, "Could not find ChipStructs$CameraAvStreamManagementClusterSnapshotParamsStruct constructor"); - return nullptr; - } - - value = env->NewObject(snapshotParamsStructStructClass_0, snapshotParamsStructStructCtor_0, value_resolution, - value_maxFrameRate, value_imageCodec); - } - return value; - } case Attributes::FabricsUsingCamera::Id: { using TypeInfo = Attributes::FabricsUsingCamera::TypeInfo; TypeInfo::DecodableType cppValue; diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index ac906271d32e02..971bb232a097f3 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -12447,7 +12447,7 @@ class ChipClusters: "commandName": "SnapshotStreamAllocate", "args": { "imageCodec": "int", - "frameRate": "int", + "maxFrameRate": "int", "bitRate": "int", "minResolution": "VideoResolutionStruct", "maxResolution": "VideoResolutionStruct", @@ -12564,193 +12564,180 @@ class ChipClusters: "writable": True, }, 0x0000000E: { - "attributeName": "CurrentVideoCodecs", + "attributeName": "FabricsUsingCamera", "attributeId": 0x0000000E, "type": "int", "reportable": True, }, 0x0000000F: { - "attributeName": "CurrentSnapshotConfig", + "attributeName": "AllocatedVideoStreams", "attributeId": 0x0000000F, "type": "", "reportable": True, }, 0x00000010: { - "attributeName": "FabricsUsingCamera", + "attributeName": "AllocatedAudioStreams", "attributeId": 0x00000010, - "type": "int", + "type": "", "reportable": True, }, 0x00000011: { - "attributeName": "AllocatedVideoStreams", + "attributeName": "AllocatedSnapshotStreams", "attributeId": 0x00000011, "type": "", "reportable": True, }, 0x00000012: { - "attributeName": "AllocatedAudioStreams", + "attributeName": "RankedVideoStreamPrioritiesList", "attributeId": 0x00000012, - "type": "", + "type": "int", "reportable": True, }, 0x00000013: { - "attributeName": "AllocatedSnapshotStreams", + "attributeName": "SoftRecordingPrivacyModeEnabled", "attributeId": 0x00000013, - "type": "", + "type": "bool", "reportable": True, + "writable": True, }, 0x00000014: { - "attributeName": "RankedVideoStreamPrioritiesList", + "attributeName": "SoftLivestreamPrivacyModeEnabled", "attributeId": 0x00000014, - "type": "int", + "type": "bool", "reportable": True, "writable": True, }, 0x00000015: { - "attributeName": "SoftRecordingPrivacyModeEnabled", + "attributeName": "HardPrivacyModeOn", "attributeId": 0x00000015, "type": "bool", "reportable": True, - "writable": True, }, 0x00000016: { - "attributeName": "SoftLivestreamPrivacyModeEnabled", + "attributeName": "NightVision", "attributeId": 0x00000016, - "type": "bool", + "type": "int", "reportable": True, "writable": True, }, 0x00000017: { - "attributeName": "HardPrivacyModeOn", + "attributeName": "NightVisionIllum", "attributeId": 0x00000017, - "type": "bool", + "type": "int", "reportable": True, + "writable": True, }, 0x00000018: { - "attributeName": "NightVision", + "attributeName": "Viewport", "attributeId": 0x00000018, - "type": "int", + "type": "", "reportable": True, "writable": True, }, 0x00000019: { - "attributeName": "NightVisionIllum", + "attributeName": "SpeakerMuted", "attributeId": 0x00000019, - "type": "int", + "type": "bool", "reportable": True, "writable": True, }, 0x0000001A: { - "attributeName": "Viewport", + "attributeName": "SpeakerVolumeLevel", "attributeId": 0x0000001A, - "type": "", + "type": "int", "reportable": True, "writable": True, }, 0x0000001B: { - "attributeName": "SpeakerMuted", + "attributeName": "SpeakerMaxLevel", "attributeId": 0x0000001B, - "type": "bool", + "type": "int", "reportable": True, - "writable": True, }, 0x0000001C: { - "attributeName": "SpeakerVolumeLevel", + "attributeName": "SpeakerMinLevel", "attributeId": 0x0000001C, "type": "int", "reportable": True, - "writable": True, }, 0x0000001D: { - "attributeName": "SpeakerMaxLevel", + "attributeName": "MicrophoneMuted", "attributeId": 0x0000001D, - "type": "int", + "type": "bool", "reportable": True, + "writable": True, }, 0x0000001E: { - "attributeName": "SpeakerMinLevel", + "attributeName": "MicrophoneVolumeLevel", "attributeId": 0x0000001E, "type": "int", "reportable": True, + "writable": True, }, 0x0000001F: { - "attributeName": "MicrophoneMuted", + "attributeName": "MicrophoneMaxLevel", "attributeId": 0x0000001F, - "type": "bool", + "type": "int", "reportable": True, - "writable": True, }, 0x00000020: { - "attributeName": "MicrophoneVolumeLevel", + "attributeName": "MicrophoneMinLevel", "attributeId": 0x00000020, "type": "int", "reportable": True, - "writable": True, }, 0x00000021: { - "attributeName": "MicrophoneMaxLevel", + "attributeName": "MicrophoneAGCEnabled", "attributeId": 0x00000021, - "type": "int", + "type": "bool", "reportable": True, + "writable": True, }, 0x00000022: { - "attributeName": "MicrophoneMinLevel", + "attributeName": "ImageRotation", "attributeId": 0x00000022, "type": "int", "reportable": True, + "writable": True, }, 0x00000023: { - "attributeName": "MicrophoneAGCEnabled", + "attributeName": "ImageFlipHorizontal", "attributeId": 0x00000023, "type": "bool", "reportable": True, "writable": True, }, 0x00000024: { - "attributeName": "ImageRotation", + "attributeName": "ImageFlipVertical", "attributeId": 0x00000024, - "type": "int", + "type": "bool", "reportable": True, "writable": True, }, 0x00000025: { - "attributeName": "ImageFlipHorizontal", + "attributeName": "LocalVideoRecordingEnabled", "attributeId": 0x00000025, "type": "bool", "reportable": True, "writable": True, }, 0x00000026: { - "attributeName": "ImageFlipVertical", + "attributeName": "LocalSnapshotRecordingEnabled", "attributeId": 0x00000026, "type": "bool", "reportable": True, "writable": True, }, 0x00000027: { - "attributeName": "LocalVideoRecordingEnabled", + "attributeName": "StatusLightEnabled", "attributeId": 0x00000027, "type": "bool", "reportable": True, "writable": True, }, 0x00000028: { - "attributeName": "LocalSnapshotRecordingEnabled", - "attributeId": 0x00000028, - "type": "bool", - "reportable": True, - "writable": True, - }, - 0x00000029: { - "attributeName": "StatusLightEnabled", - "attributeId": 0x00000029, - "type": "bool", - "reportable": True, - "writable": True, - }, - 0x0000002A: { "attributeName": "StatusLightBrightness", - "attributeId": 0x0000002A, + "attributeId": 0x00000028, "type": "int", "reportable": True, "writable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index c9a162ac0b5af8..b27196c7512fce 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -44790,35 +44790,33 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="maxNetworkBandwidth", Tag=0x0000000B, Type=uint), ClusterObjectFieldDescriptor(Label="currentFrameRate", Tag=0x0000000C, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="HDRModeEnabled", Tag=0x0000000D, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="currentVideoCodecs", Tag=0x0000000E, Type=typing.Optional[typing.List[CameraAvStreamManagement.Enums.VideoCodecEnum]]), - ClusterObjectFieldDescriptor(Label="currentSnapshotConfig", Tag=0x0000000F, Type=typing.Optional[CameraAvStreamManagement.Structs.SnapshotParamsStruct]), - ClusterObjectFieldDescriptor(Label="fabricsUsingCamera", Tag=0x00000010, Type=typing.List[uint]), - ClusterObjectFieldDescriptor(Label="allocatedVideoStreams", Tag=0x00000011, Type=typing.Optional[typing.List[CameraAvStreamManagement.Structs.VideoStreamStruct]]), - ClusterObjectFieldDescriptor(Label="allocatedAudioStreams", Tag=0x00000012, Type=typing.Optional[typing.List[CameraAvStreamManagement.Structs.AudioStreamStruct]]), - ClusterObjectFieldDescriptor(Label="allocatedSnapshotStreams", Tag=0x00000013, Type=typing.Optional[typing.List[CameraAvStreamManagement.Structs.SnapshotStreamStruct]]), - ClusterObjectFieldDescriptor(Label="rankedVideoStreamPrioritiesList", Tag=0x00000014, Type=typing.Optional[typing.List[CameraAvStreamManagement.Enums.StreamTypeEnum]]), - ClusterObjectFieldDescriptor(Label="softRecordingPrivacyModeEnabled", Tag=0x00000015, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="softLivestreamPrivacyModeEnabled", Tag=0x00000016, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="hardPrivacyModeOn", Tag=0x00000017, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="nightVision", Tag=0x00000018, Type=typing.Optional[CameraAvStreamManagement.Enums.TriStateAutoEnum]), - ClusterObjectFieldDescriptor(Label="nightVisionIllum", Tag=0x00000019, Type=typing.Optional[CameraAvStreamManagement.Enums.TriStateAutoEnum]), - ClusterObjectFieldDescriptor(Label="viewport", Tag=0x0000001A, Type=typing.Optional[CameraAvStreamManagement.Structs.ViewportStruct]), - ClusterObjectFieldDescriptor(Label="speakerMuted", Tag=0x0000001B, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="speakerVolumeLevel", Tag=0x0000001C, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="speakerMaxLevel", Tag=0x0000001D, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="speakerMinLevel", Tag=0x0000001E, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="microphoneMuted", Tag=0x0000001F, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="microphoneVolumeLevel", Tag=0x00000020, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="microphoneMaxLevel", Tag=0x00000021, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="microphoneMinLevel", Tag=0x00000022, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="microphoneAGCEnabled", Tag=0x00000023, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="imageRotation", Tag=0x00000024, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="imageFlipHorizontal", Tag=0x00000025, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="imageFlipVertical", Tag=0x00000026, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="localVideoRecordingEnabled", Tag=0x00000027, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="localSnapshotRecordingEnabled", Tag=0x00000028, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="statusLightEnabled", Tag=0x00000029, Type=typing.Optional[bool]), - ClusterObjectFieldDescriptor(Label="statusLightBrightness", Tag=0x0000002A, Type=typing.Optional[Globals.Enums.ThreeLevelAutoEnum]), + ClusterObjectFieldDescriptor(Label="fabricsUsingCamera", Tag=0x0000000E, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="allocatedVideoStreams", Tag=0x0000000F, Type=typing.Optional[typing.List[CameraAvStreamManagement.Structs.VideoStreamStruct]]), + ClusterObjectFieldDescriptor(Label="allocatedAudioStreams", Tag=0x00000010, Type=typing.Optional[typing.List[CameraAvStreamManagement.Structs.AudioStreamStruct]]), + ClusterObjectFieldDescriptor(Label="allocatedSnapshotStreams", Tag=0x00000011, Type=typing.Optional[typing.List[CameraAvStreamManagement.Structs.SnapshotStreamStruct]]), + ClusterObjectFieldDescriptor(Label="rankedVideoStreamPrioritiesList", Tag=0x00000012, Type=typing.Optional[typing.List[CameraAvStreamManagement.Enums.StreamTypeEnum]]), + ClusterObjectFieldDescriptor(Label="softRecordingPrivacyModeEnabled", Tag=0x00000013, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="softLivestreamPrivacyModeEnabled", Tag=0x00000014, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="hardPrivacyModeOn", Tag=0x00000015, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="nightVision", Tag=0x00000016, Type=typing.Optional[CameraAvStreamManagement.Enums.TriStateAutoEnum]), + ClusterObjectFieldDescriptor(Label="nightVisionIllum", Tag=0x00000017, Type=typing.Optional[CameraAvStreamManagement.Enums.TriStateAutoEnum]), + ClusterObjectFieldDescriptor(Label="viewport", Tag=0x00000018, Type=typing.Optional[CameraAvStreamManagement.Structs.ViewportStruct]), + ClusterObjectFieldDescriptor(Label="speakerMuted", Tag=0x00000019, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="speakerVolumeLevel", Tag=0x0000001A, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="speakerMaxLevel", Tag=0x0000001B, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="speakerMinLevel", Tag=0x0000001C, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="microphoneMuted", Tag=0x0000001D, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="microphoneVolumeLevel", Tag=0x0000001E, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="microphoneMaxLevel", Tag=0x0000001F, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="microphoneMinLevel", Tag=0x00000020, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="microphoneAGCEnabled", Tag=0x00000021, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="imageRotation", Tag=0x00000022, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="imageFlipHorizontal", Tag=0x00000023, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="imageFlipVertical", Tag=0x00000024, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="localVideoRecordingEnabled", Tag=0x00000025, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="localSnapshotRecordingEnabled", Tag=0x00000026, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="statusLightEnabled", Tag=0x00000027, Type=typing.Optional[bool]), + ClusterObjectFieldDescriptor(Label="statusLightBrightness", Tag=0x00000028, Type=typing.Optional[Globals.Enums.ThreeLevelAutoEnum]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), @@ -44840,8 +44838,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: maxNetworkBandwidth: uint = 0 currentFrameRate: typing.Optional[uint] = None HDRModeEnabled: typing.Optional[bool] = None - currentVideoCodecs: typing.Optional[typing.List[CameraAvStreamManagement.Enums.VideoCodecEnum]] = None - currentSnapshotConfig: typing.Optional[CameraAvStreamManagement.Structs.SnapshotParamsStruct] = None fabricsUsingCamera: typing.List[uint] = field(default_factory=lambda: []) allocatedVideoStreams: typing.Optional[typing.List[CameraAvStreamManagement.Structs.VideoStreamStruct]] = None allocatedAudioStreams: typing.Optional[typing.List[CameraAvStreamManagement.Structs.AudioStreamStruct]] = None @@ -45294,7 +45290,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="imageCodec", Tag=0, Type=CameraAvStreamManagement.Enums.ImageCodecEnum), - ClusterObjectFieldDescriptor(Label="frameRate", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="maxFrameRate", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="bitRate", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="minResolution", Tag=3, Type=CameraAvStreamManagement.Structs.VideoResolutionStruct), ClusterObjectFieldDescriptor(Label="maxResolution", Tag=4, Type=CameraAvStreamManagement.Structs.VideoResolutionStruct), @@ -45302,7 +45298,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) imageCodec: CameraAvStreamManagement.Enums.ImageCodecEnum = 0 - frameRate: uint = 0 + maxFrameRate: uint = 0 bitRate: uint = 0 minResolution: CameraAvStreamManagement.Structs.VideoResolutionStruct = field(default_factory=lambda: CameraAvStreamManagement.Structs.VideoResolutionStruct()) maxResolution: CameraAvStreamManagement.Structs.VideoResolutionStruct = field(default_factory=lambda: CameraAvStreamManagement.Structs.VideoResolutionStruct()) @@ -45619,38 +45615,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: typing.Optional[bool] = None - @dataclass - class CurrentVideoCodecs(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x00000551 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000000E - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[CameraAvStreamManagement.Enums.VideoCodecEnum]]) - - value: typing.Optional[typing.List[CameraAvStreamManagement.Enums.VideoCodecEnum]] = None - - @dataclass - class CurrentSnapshotConfig(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x00000551 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x0000000F - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[CameraAvStreamManagement.Structs.SnapshotParamsStruct]) - - value: typing.Optional[CameraAvStreamManagement.Structs.SnapshotParamsStruct] = None - @dataclass class FabricsUsingCamera(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -45659,7 +45623,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000010 + return 0x0000000E @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45675,7 +45639,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000011 + return 0x0000000F @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45691,7 +45655,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000012 + return 0x00000010 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45707,7 +45671,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000013 + return 0x00000011 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45723,7 +45687,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000014 + return 0x00000012 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45739,7 +45703,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000015 + return 0x00000013 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45755,7 +45719,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000016 + return 0x00000014 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45771,7 +45735,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000017 + return 0x00000015 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45787,7 +45751,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000018 + return 0x00000016 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45803,7 +45767,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000019 + return 0x00000017 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45819,7 +45783,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000001A + return 0x00000018 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45835,7 +45799,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000001B + return 0x00000019 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45851,7 +45815,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000001C + return 0x0000001A @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45867,7 +45831,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000001D + return 0x0000001B @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45883,7 +45847,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000001E + return 0x0000001C @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45899,7 +45863,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000001F + return 0x0000001D @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45915,7 +45879,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000020 + return 0x0000001E @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45931,7 +45895,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000021 + return 0x0000001F @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45947,7 +45911,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000022 + return 0x00000020 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45963,7 +45927,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000023 + return 0x00000021 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45979,7 +45943,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000024 + return 0x00000022 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -45995,7 +45959,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000025 + return 0x00000023 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -46011,7 +45975,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000026 + return 0x00000024 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -46027,7 +45991,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000027 + return 0x00000025 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -46043,7 +46007,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000028 + return 0x00000026 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -46059,7 +46023,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000029 + return 0x00000027 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -46075,7 +46039,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000002A + return 0x00000028 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm index 3f55a10f842d97..ce5c71d23f1d69 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm @@ -5637,12 +5637,6 @@ static BOOL AttributeIsSpecifiedInCameraAVStreamManagementCluster(AttributeId aA case Attributes::HDRModeEnabled::Id: { return YES; } - case Attributes::CurrentVideoCodecs::Id: { - return YES; - } - case Attributes::CurrentSnapshotConfig::Id: { - return YES; - } case Attributes::FabricsUsingCamera::Id: { return YES; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 571793a7edb0f8..975c3b63f4a587 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -17210,48 +17210,6 @@ static id _Nullable DecodeAttributeValueForCameraAVStreamManagementCluster(Attri value = [NSNumber numberWithBool:cppValue]; return value; } - case Attributes::CurrentVideoCodecs::Id: { - using TypeInfo = Attributes::CurrentVideoCodecs::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - NSArray * _Nonnull value; - { // Scope for our temporary variables - auto * array_0 = [NSMutableArray new]; - auto iter_0 = cppValue.begin(); - while (iter_0.Next()) { - auto & entry_0 = iter_0.GetValue(); - NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; - [array_0 addObject:newElement_0]; - } - CHIP_ERROR err = iter_0.GetStatus(); - if (err != CHIP_NO_ERROR) { - *aError = err; - return nil; - } - value = array_0; - } - return value; - } - case Attributes::CurrentSnapshotConfig::Id: { - using TypeInfo = Attributes::CurrentSnapshotConfig::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nonnull value; - value = [MTRCameraAVStreamManagementClusterSnapshotParamsStruct new]; - value.resolution = [MTRCameraAVStreamManagementClusterVideoResolutionStruct new]; - value.resolution.width = [NSNumber numberWithUnsignedShort:cppValue.resolution.width]; - value.resolution.height = [NSNumber numberWithUnsignedShort:cppValue.resolution.height]; - value.maxFrameRate = [NSNumber numberWithUnsignedShort:cppValue.maxFrameRate]; - value.imageCodec = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.imageCodec)]; - return value; - } case Attributes::FabricsUsingCamera::Id: { using TypeInfo = Attributes::FabricsUsingCamera::TypeInfo; TypeInfo::DecodableType cppValue; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 92212cc373fd2f..32c79ee20f13cf 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14286,18 +14286,6 @@ MTR_PROVISIONALLY_AVAILABLE reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; + (void)readAttributeHDRModeEnabledWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)readAttributeCurrentVideoCodecsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeCurrentVideoCodecsWithParams:(MTRSubscribeParams *)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeCurrentVideoCodecsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - -- (void)readAttributeCurrentSnapshotConfigWithCompletion:(void (^)(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeCurrentSnapshotConfigWithParams:(MTRSubscribeParams *)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeCurrentSnapshotConfigWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - - (void)readAttributeFabricsUsingCameraWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeFabricsUsingCameraWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished @@ -14323,8 +14311,6 @@ MTR_PROVISIONALLY_AVAILABLE + (void)readAttributeAllocatedSnapshotStreamsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeRankedVideoStreamPrioritiesListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeRankedVideoStreamPrioritiesListWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 07e00f7088e73b..ea02951aa50907 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -98867,78 +98867,6 @@ + (void)readAttributeHDRModeEnabledWithClusterStateCache:(MTRClusterStateCacheCo completion:completion]; } -- (void)readAttributeCurrentVideoCodecsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion -{ - using TypeInfo = CameraAvStreamManagement::Attributes::CurrentVideoCodecs::TypeInfo; - [self.device _readKnownAttributeWithEndpointID:self.endpointID - clusterID:@(TypeInfo::GetClusterId()) - attributeID:@(TypeInfo::GetAttributeId()) - params:nil - queue:self.callbackQueue - completion:completion]; -} - -- (void)subscribeAttributeCurrentVideoCodecsWithParams:(MTRSubscribeParams * _Nonnull)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler -{ - using TypeInfo = CameraAvStreamManagement::Attributes::CurrentVideoCodecs::TypeInfo; - [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID - clusterID:@(TypeInfo::GetClusterId()) - attributeID:@(TypeInfo::GetAttributeId()) - params:params - queue:self.callbackQueue - reportHandler:reportHandler - subscriptionEstablished:subscriptionEstablished]; -} - -+ (void)readAttributeCurrentVideoCodecsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion -{ - using TypeInfo = CameraAvStreamManagement::Attributes::CurrentVideoCodecs::TypeInfo; - [clusterStateCacheContainer - _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) - clusterID:TypeInfo::GetClusterId() - attributeID:TypeInfo::GetAttributeId() - queue:queue - completion:completion]; -} - -- (void)readAttributeCurrentSnapshotConfigWithCompletion:(void (^)(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error))completion -{ - using TypeInfo = CameraAvStreamManagement::Attributes::CurrentSnapshotConfig::TypeInfo; - [self.device _readKnownAttributeWithEndpointID:self.endpointID - clusterID:@(TypeInfo::GetClusterId()) - attributeID:@(TypeInfo::GetAttributeId()) - params:nil - queue:self.callbackQueue - completion:completion]; -} - -- (void)subscribeAttributeCurrentSnapshotConfigWithParams:(MTRSubscribeParams * _Nonnull)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error))reportHandler -{ - using TypeInfo = CameraAvStreamManagement::Attributes::CurrentSnapshotConfig::TypeInfo; - [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID - clusterID:@(TypeInfo::GetClusterId()) - attributeID:@(TypeInfo::GetAttributeId()) - params:params - queue:self.callbackQueue - reportHandler:reportHandler - subscriptionEstablished:subscriptionEstablished]; -} - -+ (void)readAttributeCurrentSnapshotConfigWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error))completion -{ - using TypeInfo = CameraAvStreamManagement::Attributes::CurrentSnapshotConfig::TypeInfo; - [clusterStateCacheContainer - _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) - clusterID:TypeInfo::GetClusterId() - attributeID:TypeInfo::GetAttributeId() - queue:queue - completion:completion]; -} - - (void)readAttributeFabricsUsingCameraWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { using TypeInfo = CameraAvStreamManagement::Attributes::FabricsUsingCamera::TypeInfo; @@ -99094,55 +99022,6 @@ - (void)readAttributeRankedVideoStreamPrioritiesListWithCompletion:(void (^)(NSA completion:completion]; } -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSArray * _Nonnull)value completion:(MTRStatusCompletion)completion -{ - [self writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSArray * _Nonnull) value params:nil completion:completion]; -} -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSArray * _Nonnull)value params:(MTRWriteParams * _Nullable)params completion:(MTRStatusCompletion)completion -{ - // Make a copy of params before we go async. - params = [params copy]; - value = [value copy]; - - auto * bridge = new MTRDefaultSuccessCallbackBridge(self.callbackQueue, ^(id _Nullable ignored, NSError * _Nullable error) { completion(error); }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, DefaultSuccessCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - chip::Optional timedWriteTimeout; - if (params != nil) { - if (params.timedWriteTimeout != nil){ - timedWriteTimeout.SetValue(params.timedWriteTimeout.unsignedShortValue); - } - } - - ListFreer listFreer; - using TypeInfo = CameraAvStreamManagement::Attributes::RankedVideoStreamPrioritiesList::TypeInfo; - TypeInfo::Type cppValue; - { - using ListType_0 = std::remove_reference_t; - using ListMemberType_0 = ListMemberTypeGetter::Type; - if (value.count != 0) { - auto * listHolder_0 = new ListHolder(value.count); - if (listHolder_0 == nullptr || listHolder_0->mList == nullptr) { - return CHIP_ERROR_INVALID_ARGUMENT; - } - listFreer.add(listHolder_0); - for (size_t i_0 = 0; i_0 < value.count; ++i_0) { - if ( ! [value[i_0] isKindOfClass: [NSNumber class]] ) { - // Wrong kind of value. - return CHIP_ERROR_INVALID_ARGUMENT; - } - auto element_0 = (NSNumber *)value[i_0]; - listHolder_0->mList[i_0] = static_castmList[i_0])>>(element_0.unsignedCharValue); - } - cppValue = ListType_0(listHolder_0->mList, value.count); - } else { - cppValue = ListType_0(); - } - } - - chip::Controller::ClusterBase cppCluster(exchangeManager, session, self.endpointID.unsignedShortValue); - return cppCluster.WriteAttribute(cppValue, bridge, successCb, failureCb, timedWriteTimeout); }); - std::move(*bridge).DispatchAction(self.device); -} - - (void)subscribeAttributeRankedVideoStreamPrioritiesListWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 7587e25a241fc0..e58a3a60d8eee1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -4649,35 +4649,33 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMaxNetworkBandwidthID MTR_PROVISIONALLY_AVAILABLE = 0x0000000B, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeCurrentFrameRateID MTR_PROVISIONALLY_AVAILABLE = 0x0000000C, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeHDRModeEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x0000000D, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeCurrentVideoCodecsID MTR_PROVISIONALLY_AVAILABLE = 0x0000000E, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeCurrentSnapshotConfigID MTR_PROVISIONALLY_AVAILABLE = 0x0000000F, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeFabricsUsingCameraID MTR_PROVISIONALLY_AVAILABLE = 0x00000010, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAllocatedVideoStreamsID MTR_PROVISIONALLY_AVAILABLE = 0x00000011, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAllocatedAudioStreamsID MTR_PROVISIONALLY_AVAILABLE = 0x00000012, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAllocatedSnapshotStreamsID MTR_PROVISIONALLY_AVAILABLE = 0x00000013, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeRankedVideoStreamPrioritiesListID MTR_PROVISIONALLY_AVAILABLE = 0x00000014, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSoftRecordingPrivacyModeEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000015, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSoftLivestreamPrivacyModeEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000016, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeHardPrivacyModeOnID MTR_PROVISIONALLY_AVAILABLE = 0x00000017, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeNightVisionID MTR_PROVISIONALLY_AVAILABLE = 0x00000018, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeNightVisionIllumID MTR_PROVISIONALLY_AVAILABLE = 0x00000019, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeViewportID MTR_PROVISIONALLY_AVAILABLE = 0x0000001A, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerMutedID MTR_PROVISIONALLY_AVAILABLE = 0x0000001B, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerVolumeLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001C, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerMaxLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001D, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerMinLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001E, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneMutedID MTR_PROVISIONALLY_AVAILABLE = 0x0000001F, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneVolumeLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000020, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneMaxLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000021, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneMinLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000022, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneAGCEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000023, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeImageRotationID MTR_PROVISIONALLY_AVAILABLE = 0x00000024, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeImageFlipHorizontalID MTR_PROVISIONALLY_AVAILABLE = 0x00000025, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeImageFlipVerticalID MTR_PROVISIONALLY_AVAILABLE = 0x00000026, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeLocalVideoRecordingEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000027, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeLocalSnapshotRecordingEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000028, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeStatusLightEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000029, - MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeStatusLightBrightnessID MTR_PROVISIONALLY_AVAILABLE = 0x0000002A, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeFabricsUsingCameraID MTR_PROVISIONALLY_AVAILABLE = 0x0000000E, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAllocatedVideoStreamsID MTR_PROVISIONALLY_AVAILABLE = 0x0000000F, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAllocatedAudioStreamsID MTR_PROVISIONALLY_AVAILABLE = 0x00000010, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAllocatedSnapshotStreamsID MTR_PROVISIONALLY_AVAILABLE = 0x00000011, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeRankedVideoStreamPrioritiesListID MTR_PROVISIONALLY_AVAILABLE = 0x00000012, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSoftRecordingPrivacyModeEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000013, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSoftLivestreamPrivacyModeEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000014, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeHardPrivacyModeOnID MTR_PROVISIONALLY_AVAILABLE = 0x00000015, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeNightVisionID MTR_PROVISIONALLY_AVAILABLE = 0x00000016, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeNightVisionIllumID MTR_PROVISIONALLY_AVAILABLE = 0x00000017, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeViewportID MTR_PROVISIONALLY_AVAILABLE = 0x00000018, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerMutedID MTR_PROVISIONALLY_AVAILABLE = 0x00000019, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerVolumeLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001A, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerMaxLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001B, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSpeakerMinLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001C, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneMutedID MTR_PROVISIONALLY_AVAILABLE = 0x0000001D, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneVolumeLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001E, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneMaxLevelID MTR_PROVISIONALLY_AVAILABLE = 0x0000001F, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneMinLevelID MTR_PROVISIONALLY_AVAILABLE = 0x00000020, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeMicrophoneAGCEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000021, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeImageRotationID MTR_PROVISIONALLY_AVAILABLE = 0x00000022, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeImageFlipHorizontalID MTR_PROVISIONALLY_AVAILABLE = 0x00000023, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeImageFlipVerticalID MTR_PROVISIONALLY_AVAILABLE = 0x00000024, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeLocalVideoRecordingEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000025, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeLocalSnapshotRecordingEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000026, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeStatusLightEnabledID MTR_PROVISIONALLY_AVAILABLE = 0x00000027, + MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeStatusLightBrightnessID MTR_PROVISIONALLY_AVAILABLE = 0x00000028, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm index 0791fc4952832b..96b2c0cd3bf3e6 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm @@ -7783,14 +7783,6 @@ result = @"HDRModeEnabled"; break; - case MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeCurrentVideoCodecsID: - result = @"CurrentVideoCodecs"; - break; - - case MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeCurrentSnapshotConfigID: - result = @"CurrentSnapshotConfig"; - break; - case MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeFabricsUsingCameraID: result = @"FabricsUsingCamera"; break; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 4c28d0ddd343da..9babe0a6251f1e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -6674,10 +6674,6 @@ MTR_PROVISIONALLY_AVAILABLE - (void)writeAttributeHDRModeEnabledWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE; - (void)writeAttributeHDRModeEnabledWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; -- (NSDictionary * _Nullable)readAttributeCurrentVideoCodecsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - -- (NSDictionary * _Nullable)readAttributeCurrentSnapshotConfigWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - - (NSDictionary * _Nullable)readAttributeFabricsUsingCameraWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeAllocatedVideoStreamsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; @@ -6687,8 +6683,6 @@ MTR_PROVISIONALLY_AVAILABLE - (NSDictionary * _Nullable)readAttributeAllocatedSnapshotStreamsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeRankedVideoStreamPrioritiesListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE; -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeSoftRecordingPrivacyModeEnabledWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (void)writeAttributeSoftRecordingPrivacyModeEnabledWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 500aa41148ae4e..1d6828deddb868 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -19397,16 +19397,6 @@ - (void)writeAttributeHDRModeEnabledWithValue:(NSDictionary *)da [self.device writeAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeHDRModeEnabledID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; } -- (NSDictionary * _Nullable)readAttributeCurrentVideoCodecsWithParams:(MTRReadParams * _Nullable)params -{ - return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeCurrentVideoCodecsID) params:params]; -} - -- (NSDictionary * _Nullable)readAttributeCurrentSnapshotConfigWithParams:(MTRReadParams * _Nullable)params -{ - return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeCurrentSnapshotConfigID) params:params]; -} - - (NSDictionary * _Nullable)readAttributeFabricsUsingCameraWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeFabricsUsingCameraID) params:params]; @@ -19432,17 +19422,6 @@ - (void)writeAttributeHDRModeEnabledWithValue:(NSDictionary *)da return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeRankedVideoStreamPrioritiesListID) params:params]; } -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs -{ - [self writeAttributeRankedVideoStreamPrioritiesListWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil]; -} -- (void)writeAttributeRankedVideoStreamPrioritiesListWithValue:(NSDictionary *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params -{ - NSNumber * timedWriteTimeout = params.timedWriteTimeout; - - [self.device writeAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeRankedVideoStreamPrioritiesListID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; -} - - (NSDictionary * _Nullable)readAttributeSoftRecordingPrivacyModeEnabledWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVStreamManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeSoftRecordingPrivacyModeEnabledID) params:params]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index c6dbb8e975f8f3..573d6581ced8f0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -11226,7 +11226,7 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nonnull imageCodec MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull frameRate MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull maxFrameRate MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull bitRate MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index b737f253cbd64b..6d8ddd60910f47 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -32619,7 +32619,7 @@ - (instancetype)init _imageCodec = @(0); - _frameRate = @(0); + _maxFrameRate = @(0); _bitRate = @(0); @@ -32639,7 +32639,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRCameraAVStreamManagementClusterSnapshotStreamAllocateParams alloc] init]; other.imageCodec = self.imageCodec; - other.frameRate = self.frameRate; + other.maxFrameRate = self.maxFrameRate; other.bitRate = self.bitRate; other.minResolution = self.minResolution; other.maxResolution = self.maxResolution; @@ -32652,7 +32652,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: imageCodec:%@; frameRate:%@; bitRate:%@; minResolution:%@; maxResolution:%@; quality:%@; >", NSStringFromClass([self class]), _imageCodec, _frameRate, _bitRate, _minResolution, _maxResolution, _quality]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: imageCodec:%@; maxFrameRate:%@; bitRate:%@; minResolution:%@; maxResolution:%@; quality:%@; >", NSStringFromClass([self class]), _imageCodec, _maxFrameRate, _bitRate, _minResolution, _maxResolution, _quality]; return descriptionString; } @@ -32668,7 +32668,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader encodableStruct.imageCodec = static_cast>(self.imageCodec.unsignedCharValue); } { - encodableStruct.frameRate = self.frameRate.unsignedShortValue; + encodableStruct.maxFrameRate = self.maxFrameRate.unsignedShortValue; } { encodableStruct.bitRate = self.bitRate.unsignedIntValue; 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 f2c2ea2ef58377..4879ae5213c65d 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 @@ -29749,7 +29749,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kImageCodec), imageCodec); - encoder.Encode(to_underlying(Fields::kFrameRate), frameRate); + encoder.Encode(to_underlying(Fields::kMaxFrameRate), maxFrameRate); encoder.Encode(to_underlying(Fields::kBitRate), bitRate); encoder.Encode(to_underlying(Fields::kMinResolution), minResolution); encoder.Encode(to_underlying(Fields::kMaxResolution), maxResolution); @@ -29775,9 +29775,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, imageCodec); } - else if (__context_tag == to_underlying(Fields::kFrameRate)) + else if (__context_tag == to_underlying(Fields::kMaxFrameRate)) { - err = DataModel::Decode(reader, frameRate); + err = DataModel::Decode(reader, maxFrameRate); } else if (__context_tag == to_underlying(Fields::kBitRate)) { @@ -30023,10 +30023,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre return DataModel::Decode(reader, currentFrameRate); case Attributes::HDRModeEnabled::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, HDRModeEnabled); - case Attributes::CurrentVideoCodecs::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, currentVideoCodecs); - case Attributes::CurrentSnapshotConfig::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, currentSnapshotConfig); case Attributes::FabricsUsingCamera::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, fabricsUsingCamera); case Attributes::AllocatedVideoStreams::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 35e26825283dad..2357a87dd9d9fa 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 @@ -41542,7 +41542,7 @@ namespace SnapshotStreamAllocate { enum class Fields : uint8_t { kImageCodec = 0, - kFrameRate = 1, + kMaxFrameRate = 1, kBitRate = 2, kMinResolution = 3, kMaxResolution = 4, @@ -41557,7 +41557,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::CameraAvStreamManagement::Id; } ImageCodecEnum imageCodec = static_cast(0); - uint16_t frameRate = static_cast(0); + uint16_t maxFrameRate = static_cast(0); uint32_t bitRate = static_cast(0); Structs::VideoResolutionStruct::Type minResolution; Structs::VideoResolutionStruct::Type maxResolution; @@ -41577,7 +41577,7 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::CameraAvStreamManagement::Id; } ImageCodecEnum imageCodec = static_cast(0); - uint16_t frameRate = static_cast(0); + uint16_t maxFrameRate = static_cast(0); uint32_t bitRate = static_cast(0); Structs::VideoResolutionStruct::DecodableType minResolution; Structs::VideoResolutionStruct::DecodableType maxResolution; @@ -41932,31 +41932,6 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace HDRModeEnabled -namespace CurrentVideoCodecs { -struct TypeInfo -{ - using Type = chip::app::DataModel::List; - using DecodableType = chip::app::DataModel::DecodableList; - using DecodableArgType = - const chip::app::DataModel::DecodableList &; - - static constexpr ClusterId GetClusterId() { return Clusters::CameraAvStreamManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::CurrentVideoCodecs::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace CurrentVideoCodecs -namespace CurrentSnapshotConfig { -struct TypeInfo -{ - using Type = chip::app::Clusters::CameraAvStreamManagement::Structs::SnapshotParamsStruct::Type; - using DecodableType = chip::app::Clusters::CameraAvStreamManagement::Structs::SnapshotParamsStruct::DecodableType; - using DecodableArgType = const chip::app::Clusters::CameraAvStreamManagement::Structs::SnapshotParamsStruct::DecodableType &; - - static constexpr ClusterId GetClusterId() { return Clusters::CameraAvStreamManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::CurrentSnapshotConfig::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace CurrentSnapshotConfig namespace FabricsUsingCamera { struct TypeInfo { @@ -42343,8 +42318,6 @@ struct TypeInfo Attributes::MaxNetworkBandwidth::TypeInfo::DecodableType maxNetworkBandwidth = static_cast(0); Attributes::CurrentFrameRate::TypeInfo::DecodableType currentFrameRate = static_cast(0); Attributes::HDRModeEnabled::TypeInfo::DecodableType HDRModeEnabled = static_cast(0); - Attributes::CurrentVideoCodecs::TypeInfo::DecodableType currentVideoCodecs; - Attributes::CurrentSnapshotConfig::TypeInfo::DecodableType currentSnapshotConfig; Attributes::FabricsUsingCamera::TypeInfo::DecodableType fabricsUsingCamera; Attributes::AllocatedVideoStreams::TypeInfo::DecodableType allocatedVideoStreams; Attributes::AllocatedAudioStreams::TypeInfo::DecodableType allocatedAudioStreams; 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 e0fa3a25fdaf2a..5d12daa8564976 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 @@ -6922,120 +6922,112 @@ namespace HDRModeEnabled { static constexpr AttributeId Id = 0x0000000D; } // namespace HDRModeEnabled -namespace CurrentVideoCodecs { -static constexpr AttributeId Id = 0x0000000E; -} // namespace CurrentVideoCodecs - -namespace CurrentSnapshotConfig { -static constexpr AttributeId Id = 0x0000000F; -} // namespace CurrentSnapshotConfig - namespace FabricsUsingCamera { -static constexpr AttributeId Id = 0x00000010; +static constexpr AttributeId Id = 0x0000000E; } // namespace FabricsUsingCamera namespace AllocatedVideoStreams { -static constexpr AttributeId Id = 0x00000011; +static constexpr AttributeId Id = 0x0000000F; } // namespace AllocatedVideoStreams namespace AllocatedAudioStreams { -static constexpr AttributeId Id = 0x00000012; +static constexpr AttributeId Id = 0x00000010; } // namespace AllocatedAudioStreams namespace AllocatedSnapshotStreams { -static constexpr AttributeId Id = 0x00000013; +static constexpr AttributeId Id = 0x00000011; } // namespace AllocatedSnapshotStreams namespace RankedVideoStreamPrioritiesList { -static constexpr AttributeId Id = 0x00000014; +static constexpr AttributeId Id = 0x00000012; } // namespace RankedVideoStreamPrioritiesList namespace SoftRecordingPrivacyModeEnabled { -static constexpr AttributeId Id = 0x00000015; +static constexpr AttributeId Id = 0x00000013; } // namespace SoftRecordingPrivacyModeEnabled namespace SoftLivestreamPrivacyModeEnabled { -static constexpr AttributeId Id = 0x00000016; +static constexpr AttributeId Id = 0x00000014; } // namespace SoftLivestreamPrivacyModeEnabled namespace HardPrivacyModeOn { -static constexpr AttributeId Id = 0x00000017; +static constexpr AttributeId Id = 0x00000015; } // namespace HardPrivacyModeOn namespace NightVision { -static constexpr AttributeId Id = 0x00000018; +static constexpr AttributeId Id = 0x00000016; } // namespace NightVision namespace NightVisionIllum { -static constexpr AttributeId Id = 0x00000019; +static constexpr AttributeId Id = 0x00000017; } // namespace NightVisionIllum namespace Viewport { -static constexpr AttributeId Id = 0x0000001A; +static constexpr AttributeId Id = 0x00000018; } // namespace Viewport namespace SpeakerMuted { -static constexpr AttributeId Id = 0x0000001B; +static constexpr AttributeId Id = 0x00000019; } // namespace SpeakerMuted namespace SpeakerVolumeLevel { -static constexpr AttributeId Id = 0x0000001C; +static constexpr AttributeId Id = 0x0000001A; } // namespace SpeakerVolumeLevel namespace SpeakerMaxLevel { -static constexpr AttributeId Id = 0x0000001D; +static constexpr AttributeId Id = 0x0000001B; } // namespace SpeakerMaxLevel namespace SpeakerMinLevel { -static constexpr AttributeId Id = 0x0000001E; +static constexpr AttributeId Id = 0x0000001C; } // namespace SpeakerMinLevel namespace MicrophoneMuted { -static constexpr AttributeId Id = 0x0000001F; +static constexpr AttributeId Id = 0x0000001D; } // namespace MicrophoneMuted namespace MicrophoneVolumeLevel { -static constexpr AttributeId Id = 0x00000020; +static constexpr AttributeId Id = 0x0000001E; } // namespace MicrophoneVolumeLevel namespace MicrophoneMaxLevel { -static constexpr AttributeId Id = 0x00000021; +static constexpr AttributeId Id = 0x0000001F; } // namespace MicrophoneMaxLevel namespace MicrophoneMinLevel { -static constexpr AttributeId Id = 0x00000022; +static constexpr AttributeId Id = 0x00000020; } // namespace MicrophoneMinLevel namespace MicrophoneAGCEnabled { -static constexpr AttributeId Id = 0x00000023; +static constexpr AttributeId Id = 0x00000021; } // namespace MicrophoneAGCEnabled namespace ImageRotation { -static constexpr AttributeId Id = 0x00000024; +static constexpr AttributeId Id = 0x00000022; } // namespace ImageRotation namespace ImageFlipHorizontal { -static constexpr AttributeId Id = 0x00000025; +static constexpr AttributeId Id = 0x00000023; } // namespace ImageFlipHorizontal namespace ImageFlipVertical { -static constexpr AttributeId Id = 0x00000026; +static constexpr AttributeId Id = 0x00000024; } // namespace ImageFlipVertical namespace LocalVideoRecordingEnabled { -static constexpr AttributeId Id = 0x00000027; +static constexpr AttributeId Id = 0x00000025; } // namespace LocalVideoRecordingEnabled namespace LocalSnapshotRecordingEnabled { -static constexpr AttributeId Id = 0x00000028; +static constexpr AttributeId Id = 0x00000026; } // namespace LocalSnapshotRecordingEnabled namespace StatusLightEnabled { -static constexpr AttributeId Id = 0x00000029; +static constexpr AttributeId Id = 0x00000027; } // namespace StatusLightEnabled namespace StatusLightBrightness { -static constexpr AttributeId Id = 0x0000002A; +static constexpr AttributeId Id = 0x00000028; } // namespace StatusLightBrightness namespace GeneratedCommandList { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 3fca8853155172..b0c00980d3e42d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -13736,35 +13736,33 @@ class ZoneManagementRemoveZone : public ClusterCommand | * MaxNetworkBandwidth | 0x000B | | * CurrentFrameRate | 0x000C | | * HDRModeEnabled | 0x000D | -| * CurrentVideoCodecs | 0x000E | -| * CurrentSnapshotConfig | 0x000F | -| * FabricsUsingCamera | 0x0010 | -| * AllocatedVideoStreams | 0x0011 | -| * AllocatedAudioStreams | 0x0012 | -| * AllocatedSnapshotStreams | 0x0013 | -| * RankedVideoStreamPrioritiesList | 0x0014 | -| * SoftRecordingPrivacyModeEnabled | 0x0015 | -| * SoftLivestreamPrivacyModeEnabled | 0x0016 | -| * HardPrivacyModeOn | 0x0017 | -| * NightVision | 0x0018 | -| * NightVisionIllum | 0x0019 | -| * Viewport | 0x001A | -| * SpeakerMuted | 0x001B | -| * SpeakerVolumeLevel | 0x001C | -| * SpeakerMaxLevel | 0x001D | -| * SpeakerMinLevel | 0x001E | -| * MicrophoneMuted | 0x001F | -| * MicrophoneVolumeLevel | 0x0020 | -| * MicrophoneMaxLevel | 0x0021 | -| * MicrophoneMinLevel | 0x0022 | -| * MicrophoneAGCEnabled | 0x0023 | -| * ImageRotation | 0x0024 | -| * ImageFlipHorizontal | 0x0025 | -| * ImageFlipVertical | 0x0026 | -| * LocalVideoRecordingEnabled | 0x0027 | -| * LocalSnapshotRecordingEnabled | 0x0028 | -| * StatusLightEnabled | 0x0029 | -| * StatusLightBrightness | 0x002A | +| * FabricsUsingCamera | 0x000E | +| * AllocatedVideoStreams | 0x000F | +| * AllocatedAudioStreams | 0x0010 | +| * AllocatedSnapshotStreams | 0x0011 | +| * RankedVideoStreamPrioritiesList | 0x0012 | +| * SoftRecordingPrivacyModeEnabled | 0x0013 | +| * SoftLivestreamPrivacyModeEnabled | 0x0014 | +| * HardPrivacyModeOn | 0x0015 | +| * NightVision | 0x0016 | +| * NightVisionIllum | 0x0017 | +| * Viewport | 0x0018 | +| * SpeakerMuted | 0x0019 | +| * SpeakerVolumeLevel | 0x001A | +| * SpeakerMaxLevel | 0x001B | +| * SpeakerMinLevel | 0x001C | +| * MicrophoneMuted | 0x001D | +| * MicrophoneVolumeLevel | 0x001E | +| * MicrophoneMaxLevel | 0x001F | +| * MicrophoneMinLevel | 0x0020 | +| * MicrophoneAGCEnabled | 0x0021 | +| * ImageRotation | 0x0022 | +| * ImageFlipHorizontal | 0x0023 | +| * ImageFlipVertical | 0x0024 | +| * LocalVideoRecordingEnabled | 0x0025 | +| * LocalSnapshotRecordingEnabled | 0x0026 | +| * StatusLightEnabled | 0x0027 | +| * StatusLightBrightness | 0x0028 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * AttributeList | 0xFFFB | @@ -14004,7 +14002,7 @@ class CameraAvStreamManagementSnapshotStreamAllocate : public ClusterCommand mComplex_MaxResolution(&mRequest.maxResolution) { AddArgument("ImageCodec", 0, UINT8_MAX, &mRequest.imageCodec); - AddArgument("FrameRate", 0, UINT16_MAX, &mRequest.frameRate); + AddArgument("MaxFrameRate", 0, UINT16_MAX, &mRequest.maxFrameRate); AddArgument("BitRate", 0, UINT32_MAX, &mRequest.bitRate); AddArgument("MinResolution", &mComplex_MinResolution); AddArgument("MaxResolution", &mComplex_MaxResolution); @@ -26768,8 +26766,6 @@ void registerClusterCameraAvStreamManagement(Commands & commands, CredentialIssu make_unique(Id, "max-network-bandwidth", Attributes::MaxNetworkBandwidth::Id, credsIssuerConfig), // make_unique(Id, "current-frame-rate", Attributes::CurrentFrameRate::Id, credsIssuerConfig), // make_unique(Id, "hdrmode-enabled", Attributes::HDRModeEnabled::Id, credsIssuerConfig), // - make_unique(Id, "current-video-codecs", Attributes::CurrentVideoCodecs::Id, credsIssuerConfig), // - make_unique(Id, "current-snapshot-config", Attributes::CurrentSnapshotConfig::Id, credsIssuerConfig), // make_unique(Id, "fabrics-using-camera", Attributes::FabricsUsingCamera::Id, credsIssuerConfig), // make_unique(Id, "allocated-video-streams", Attributes::AllocatedVideoStreams::Id, credsIssuerConfig), // make_unique(Id, "allocated-audio-streams", Attributes::AllocatedAudioStreams::Id, credsIssuerConfig), // @@ -26844,12 +26840,6 @@ void registerClusterCameraAvStreamManagement(Commands & commands, CredentialIssu WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "hdrmode-enabled", 0, 1, Attributes::HDRModeEnabled::Id, WriteCommandType::kWrite, credsIssuerConfig), // - make_unique>>( - Id, "current-video-codecs", Attributes::CurrentVideoCodecs::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>( - Id, "current-snapshot-config", Attributes::CurrentSnapshotConfig::Id, WriteCommandType::kForceWrite, - credsIssuerConfig), // make_unique>>( Id, "fabrics-using-camera", Attributes::FabricsUsingCamera::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( - Id, "ranked-video-stream-priorities-list", Attributes::RankedVideoStreamPrioritiesList::Id, WriteCommandType::kWrite, - credsIssuerConfig), // + Id, "ranked-video-stream-priorities-list", Attributes::RankedVideoStreamPrioritiesList::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "soft-recording-privacy-mode-enabled", 0, 1, Attributes::SoftRecordingPrivacyModeEnabled::Id, WriteCommandType::kWrite, credsIssuerConfig), // @@ -26947,8 +26937,6 @@ void registerClusterCameraAvStreamManagement(Commands & commands, CredentialIssu make_unique(Id, "max-network-bandwidth", Attributes::MaxNetworkBandwidth::Id, credsIssuerConfig), // make_unique(Id, "current-frame-rate", Attributes::CurrentFrameRate::Id, credsIssuerConfig), // make_unique(Id, "hdrmode-enabled", Attributes::HDRModeEnabled::Id, credsIssuerConfig), // - make_unique(Id, "current-video-codecs", Attributes::CurrentVideoCodecs::Id, credsIssuerConfig), // - make_unique(Id, "current-snapshot-config", Attributes::CurrentSnapshotConfig::Id, credsIssuerConfig), // make_unique(Id, "fabrics-using-camera", Attributes::FabricsUsingCamera::Id, credsIssuerConfig), // make_unique(Id, "allocated-video-streams", Attributes::AllocatedVideoStreams::Id, credsIssuerConfig), // make_unique(Id, "allocated-audio-streams", Attributes::AllocatedAudioStreams::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 6fb87819ce70df..1ea513ea1d3f95 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -18563,16 +18563,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("HDRModeEnabled", 1, value); } - case CameraAvStreamManagement::Attributes::CurrentVideoCodecs::Id: { - chip::app::DataModel::DecodableList value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("CurrentVideoCodecs", 1, value); - } - case CameraAvStreamManagement::Attributes::CurrentSnapshotConfig::Id: { - chip::app::Clusters::CameraAvStreamManagement::Structs::SnapshotParamsStruct::DecodableType value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("CurrentSnapshotConfig", 1, value); - } case CameraAvStreamManagement::Attributes::FabricsUsingCamera::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, 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 753378db6fa9e7..3977ee180be1e2 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp @@ -4197,10 +4197,6 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id) return "CurrentFrameRate"; case chip::app::Clusters::CameraAvStreamManagement::Attributes::HDRModeEnabled::Id: return "HDRModeEnabled"; - case chip::app::Clusters::CameraAvStreamManagement::Attributes::CurrentVideoCodecs::Id: - return "CurrentVideoCodecs"; - case chip::app::Clusters::CameraAvStreamManagement::Attributes::CurrentSnapshotConfig::Id: - return "CurrentSnapshotConfig"; case chip::app::Clusters::CameraAvStreamManagement::Attributes::FabricsUsingCamera::Id: return "FabricsUsingCamera"; case chip::app::Clusters::CameraAvStreamManagement::Attributes::AllocatedVideoStreams::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 6e8b57d2d8baab..2d9b737038535e 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -150659,35 +150659,33 @@ class SubscribeAttributeZoneManagementClusterRevision : public SubscribeAttribut | * MaxNetworkBandwidth | 0x000B | | * CurrentFrameRate | 0x000C | | * HDRModeEnabled | 0x000D | -| * CurrentVideoCodecs | 0x000E | -| * CurrentSnapshotConfig | 0x000F | -| * FabricsUsingCamera | 0x0010 | -| * AllocatedVideoStreams | 0x0011 | -| * AllocatedAudioStreams | 0x0012 | -| * AllocatedSnapshotStreams | 0x0013 | -| * RankedVideoStreamPrioritiesList | 0x0014 | -| * SoftRecordingPrivacyModeEnabled | 0x0015 | -| * SoftLivestreamPrivacyModeEnabled | 0x0016 | -| * HardPrivacyModeOn | 0x0017 | -| * NightVision | 0x0018 | -| * NightVisionIllum | 0x0019 | -| * Viewport | 0x001A | -| * SpeakerMuted | 0x001B | -| * SpeakerVolumeLevel | 0x001C | -| * SpeakerMaxLevel | 0x001D | -| * SpeakerMinLevel | 0x001E | -| * MicrophoneMuted | 0x001F | -| * MicrophoneVolumeLevel | 0x0020 | -| * MicrophoneMaxLevel | 0x0021 | -| * MicrophoneMinLevel | 0x0022 | -| * MicrophoneAGCEnabled | 0x0023 | -| * ImageRotation | 0x0024 | -| * ImageFlipHorizontal | 0x0025 | -| * ImageFlipVertical | 0x0026 | -| * LocalVideoRecordingEnabled | 0x0027 | -| * LocalSnapshotRecordingEnabled | 0x0028 | -| * StatusLightEnabled | 0x0029 | -| * StatusLightBrightness | 0x002A | +| * FabricsUsingCamera | 0x000E | +| * AllocatedVideoStreams | 0x000F | +| * AllocatedAudioStreams | 0x0010 | +| * AllocatedSnapshotStreams | 0x0011 | +| * RankedVideoStreamPrioritiesList | 0x0012 | +| * SoftRecordingPrivacyModeEnabled | 0x0013 | +| * SoftLivestreamPrivacyModeEnabled | 0x0014 | +| * HardPrivacyModeOn | 0x0015 | +| * NightVision | 0x0016 | +| * NightVisionIllum | 0x0017 | +| * Viewport | 0x0018 | +| * SpeakerMuted | 0x0019 | +| * SpeakerVolumeLevel | 0x001A | +| * SpeakerMaxLevel | 0x001B | +| * SpeakerMinLevel | 0x001C | +| * MicrophoneMuted | 0x001D | +| * MicrophoneVolumeLevel | 0x001E | +| * MicrophoneMaxLevel | 0x001F | +| * MicrophoneMinLevel | 0x0020 | +| * MicrophoneAGCEnabled | 0x0021 | +| * ImageRotation | 0x0022 | +| * ImageFlipHorizontal | 0x0023 | +| * ImageFlipVertical | 0x0024 | +| * LocalVideoRecordingEnabled | 0x0025 | +| * LocalSnapshotRecordingEnabled | 0x0026 | +| * StatusLightEnabled | 0x0027 | +| * StatusLightBrightness | 0x0028 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * AttributeList | 0xFFFB | @@ -151138,7 +151136,7 @@ class CameraAvStreamManagementSnapshotStreamAllocate : public ClusterCommand { AddArgument("ImageCodec", 0, UINT8_MAX, &mRequest.imageCodec); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - AddArgument("FrameRate", 0, UINT16_MAX, &mRequest.frameRate); + AddArgument("MaxFrameRate", 0, UINT16_MAX, &mRequest.maxFrameRate); #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL AddArgument("BitRate", 0, UINT32_MAX, &mRequest.bitRate); @@ -151170,7 +151168,7 @@ class CameraAvStreamManagementSnapshotStreamAllocate : public ClusterCommand { params.imageCodec = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.imageCodec)]; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - params.frameRate = [NSNumber numberWithUnsignedShort:mRequest.frameRate]; + params.maxFrameRate = [NSNumber numberWithUnsignedShort:mRequest.maxFrameRate]; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL params.bitRate = [NSNumber numberWithUnsignedInt:mRequest.bitRate]; @@ -152633,176 +152631,6 @@ class SubscribeAttributeCameraAvStreamManagementHDRModeEnabled : public Subscrib #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL -/* - * Attribute CurrentVideoCodecs - */ -class ReadCameraAvStreamManagementCurrentVideoCodecs : public ReadAttribute { -public: - ReadCameraAvStreamManagementCurrentVideoCodecs() - : ReadAttribute("current-video-codecs") - { - } - - ~ReadCameraAvStreamManagementCurrentVideoCodecs() - { - } - - 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::CurrentVideoCodecs::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 readAttributeCurrentVideoCodecsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVStreamManagement.CurrentVideoCodecs response %@", [value description]); - if (error == nil) { - RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); - } else { - LogNSError("CameraAVStreamManagement CurrentVideoCodecs read Error", error); - RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); - } - SetCommandExitStatus(error); - }]; - return CHIP_NO_ERROR; - } -}; - -class SubscribeAttributeCameraAvStreamManagementCurrentVideoCodecs : public SubscribeAttribute { -public: - SubscribeAttributeCameraAvStreamManagementCurrentVideoCodecs() - : SubscribeAttribute("current-video-codecs") - { - } - - ~SubscribeAttributeCameraAvStreamManagementCurrentVideoCodecs() - { - } - - 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::CurrentVideoCodecs::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); - __auto_type * cluster = [[MTRBaseClusterCameraAVStreamManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; - if (mKeepSubscriptions.HasValue()) { - params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); - } - if (mFabricFiltered.HasValue()) { - params.filterByFabric = mFabricFiltered.Value(); - } - if (mAutoResubscribe.HasValue()) { - params.resubscribeAutomatically = mAutoResubscribe.Value(); - } - [cluster subscribeAttributeCurrentVideoCodecsWithParams:params - subscriptionEstablished:^() { mSubscriptionEstablished = YES; } - reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVStreamManagement.CurrentVideoCodecs response %@", [value description]); - if (error == nil) { - RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); - } else { - RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); - } - SetCommandExitStatus(error); - }]; - - return CHIP_NO_ERROR; - } -}; - -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - -/* - * Attribute CurrentSnapshotConfig - */ -class ReadCameraAvStreamManagementCurrentSnapshotConfig : public ReadAttribute { -public: - ReadCameraAvStreamManagementCurrentSnapshotConfig() - : ReadAttribute("current-snapshot-config") - { - } - - ~ReadCameraAvStreamManagementCurrentSnapshotConfig() - { - } - - 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::CurrentSnapshotConfig::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 readAttributeCurrentSnapshotConfigWithCompletion:^(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVStreamManagement.CurrentSnapshotConfig response %@", [value description]); - if (error == nil) { - RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); - } else { - LogNSError("CameraAVStreamManagement CurrentSnapshotConfig read Error", error); - RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); - } - SetCommandExitStatus(error); - }]; - return CHIP_NO_ERROR; - } -}; - -class SubscribeAttributeCameraAvStreamManagementCurrentSnapshotConfig : public SubscribeAttribute { -public: - SubscribeAttributeCameraAvStreamManagementCurrentSnapshotConfig() - : SubscribeAttribute("current-snapshot-config") - { - } - - ~SubscribeAttributeCameraAvStreamManagementCurrentSnapshotConfig() - { - } - - 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::CurrentSnapshotConfig::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); - __auto_type * cluster = [[MTRBaseClusterCameraAVStreamManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; - if (mKeepSubscriptions.HasValue()) { - params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); - } - if (mFabricFiltered.HasValue()) { - params.filterByFabric = mFabricFiltered.Value(); - } - if (mAutoResubscribe.HasValue()) { - params.resubscribeAutomatically = mAutoResubscribe.Value(); - } - [cluster subscribeAttributeCurrentSnapshotConfigWithParams:params - subscriptionEstablished:^() { mSubscriptionEstablished = YES; } - reportHandler:^(MTRCameraAVStreamManagementClusterSnapshotParamsStruct * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVStreamManagement.CurrentSnapshotConfig response %@", [value description]); - if (error == nil) { - RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); - } else { - RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); - } - SetCommandExitStatus(error); - }]; - - return CHIP_NO_ERROR; - } -}; - -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - /* * Attribute FabricsUsingCamera */ @@ -153180,58 +153008,6 @@ class ReadCameraAvStreamManagementRankedVideoStreamPrioritiesList : public ReadA } }; -class WriteCameraAvStreamManagementRankedVideoStreamPrioritiesList : public WriteAttribute { -public: - WriteCameraAvStreamManagementRankedVideoStreamPrioritiesList() - : WriteAttribute("ranked-video-stream-priorities-list") - , mComplex(&mValue) - { - AddArgument("attr-name", "ranked-video-stream-priorities-list"); - AddArgument("attr-value", &mComplex); - WriteAttribute::AddArguments(); - } - - ~WriteCameraAvStreamManagementRankedVideoStreamPrioritiesList() - { - } - - 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::RankedVideoStreamPrioritiesList::Id; - - ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") WriteAttribute (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); - __auto_type * cluster = [[MTRBaseClusterCameraAVStreamManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRWriteParams alloc] init]; - params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; - NSArray * _Nonnull value; - { // Scope for our temporary variables - auto * array_0 = [NSMutableArray new]; - for (auto & entry_0 : mValue) { - NSNumber * newElement_0; - newElement_0 = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_0)]; - [array_0 addObject:newElement_0]; - } - value = array_0; - } - - [cluster writeAttributeRankedVideoStreamPrioritiesListWithValue:value params:params completion:^(NSError * _Nullable error) { - if (error != nil) { - LogNSError("CameraAVStreamManagement RankedVideoStreamPrioritiesList write Error", error); - RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); - } - SetCommandExitStatus(error); - }]; - return CHIP_NO_ERROR; - } - -private: - chip::app::DataModel::List mValue; - TypedComplexArgument> mComplex; -}; - class SubscribeAttributeCameraAvStreamManagementRankedVideoStreamPrioritiesList : public SubscribeAttribute { public: SubscribeAttributeCameraAvStreamManagementRankedVideoStreamPrioritiesList() @@ -181286,14 +181062,6 @@ void registerClusterCameraAvStreamManagement(Commands & commands) make_unique(), // make_unique(), // #endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // -#endif // MTR_ENABLE_PROVISIONAL -#if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // -#endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // @@ -181312,7 +181080,6 @@ void registerClusterCameraAvStreamManagement(Commands & commands) #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), // - make_unique(), // make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL