Skip to content

Commit 9042253

Browse files
gmarcosbgmarcosb
committed
Regenerated using ./scripts/tools/zap_regen_all.py
1 parent 0ef694b commit 9042253

File tree

18 files changed

+1314
-142
lines changed

18 files changed

+1314
-142
lines changed

‎src/app/zap_cluster_list.json

+256-86
Large diffs are not rendered by default.

‎src/controller/data_model/controller-clusters.matter

+3-3
Original file line numberDiff line numberDiff line change
@@ -10167,7 +10167,7 @@ cluster PushAvStreamTransport = 1365 {
1016710167
kInterleaved = 0;
1016810168
}
1016910169

10170-
enum StreamTypeEnum : enum8 {
10170+
enum StreamUsageEnum : enum8 {
1017110171
kInternal = 0;
1017210172
kRecording = 1;
1017310173
kAnalysis = 2;
@@ -10240,11 +10240,11 @@ cluster PushAvStreamTransport = 1365 {
1024010240
}
1024110241

1024210242
struct TransportOptionsStruct {
10243-
StreamTypeEnum streamType = 0;
10243+
StreamUsageEnum streamUsage = 0;
1024410244
optional int16u videoStreamID = 1;
1024510245
optional int16u audioStreamID = 2;
1024610246
int16u endpointID = 3;
10247-
long_char_string<256> url = 4;
10247+
long_char_string<2000> url = 4;
1024810248
TransportTriggerOptionsStruct triggerOptions = 5;
1024910249
IngestMethodsEnum ingestMethod = 6;
1025010250
ContainerFormatEnum containerFormat = 7;

‎src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -15256,7 +15256,7 @@ public String toString() {
1525615256
}
1525715257
}
1525815258
public static class PushAvStreamTransportClusterTransportOptionsStruct {
15259-
public Integer streamType;
15259+
public Integer streamUsage;
1526015260
public Optional<Integer> videoStreamID;
1526115261
public Optional<Integer> audioStreamID;
1526215262
public Integer endpointID;
@@ -15267,7 +15267,7 @@ public static class PushAvStreamTransportClusterTransportOptionsStruct {
1526715267
public ChipStructs.PushAvStreamTransportClusterContainerOptionsStruct containerOptions;
1526815268
public Optional<ChipStructs.PushAvStreamTransportClusterMetadataOptionsStruct> metadataOptions;
1526915269
public Optional<Long> expiryTime;
15270-
private static final long STREAM_TYPE_ID = 0L;
15270+
private static final long STREAM_USAGE_ID = 0L;
1527115271
private static final long VIDEO_STREAM_ID_ID = 1L;
1527215272
private static final long AUDIO_STREAM_ID_ID = 2L;
1527315273
private static final long ENDPOINT_ID_ID = 3L;
@@ -15280,7 +15280,7 @@ public static class PushAvStreamTransportClusterTransportOptionsStruct {
1528015280
private static final long EXPIRY_TIME_ID = 10L;
1528115281

1528215282
public PushAvStreamTransportClusterTransportOptionsStruct(
15283-
Integer streamType,
15283+
Integer streamUsage,
1528415284
Optional<Integer> videoStreamID,
1528515285
Optional<Integer> audioStreamID,
1528615286
Integer endpointID,
@@ -15292,7 +15292,7 @@ public PushAvStreamTransportClusterTransportOptionsStruct(
1529215292
Optional<ChipStructs.PushAvStreamTransportClusterMetadataOptionsStruct> metadataOptions,
1529315293
Optional<Long> expiryTime
1529415294
) {
15295-
this.streamType = streamType;
15295+
this.streamUsage = streamUsage;
1529615296
this.videoStreamID = videoStreamID;
1529715297
this.audioStreamID = audioStreamID;
1529815298
this.endpointID = endpointID;
@@ -15307,7 +15307,7 @@ public PushAvStreamTransportClusterTransportOptionsStruct(
1530715307

1530815308
public StructType encodeTlv() {
1530915309
ArrayList<StructElement> values = new ArrayList<>();
15310-
values.add(new StructElement(STREAM_TYPE_ID, new UIntType(streamType)));
15310+
values.add(new StructElement(STREAM_USAGE_ID, new UIntType(streamUsage)));
1531115311
values.add(new StructElement(VIDEO_STREAM_ID_ID, videoStreamID.<BaseTLVType>map((nonOptionalvideoStreamID) -> new UIntType(nonOptionalvideoStreamID)).orElse(new EmptyType())));
1531215312
values.add(new StructElement(AUDIO_STREAM_ID_ID, audioStreamID.<BaseTLVType>map((nonOptionalaudioStreamID) -> new UIntType(nonOptionalaudioStreamID)).orElse(new EmptyType())));
1531315313
values.add(new StructElement(ENDPOINT_ID_ID, new UIntType(endpointID)));
@@ -15326,7 +15326,7 @@ public static PushAvStreamTransportClusterTransportOptionsStruct decodeTlv(BaseT
1532615326
if (tlvValue == null || tlvValue.type() != TLVType.Struct) {
1532715327
return null;
1532815328
}
15329-
Integer streamType = null;
15329+
Integer streamUsage = null;
1533015330
Optional<Integer> videoStreamID = Optional.empty();
1533115331
Optional<Integer> audioStreamID = Optional.empty();
1533215332
Integer endpointID = null;
@@ -15338,10 +15338,10 @@ public static PushAvStreamTransportClusterTransportOptionsStruct decodeTlv(BaseT
1533815338
Optional<ChipStructs.PushAvStreamTransportClusterMetadataOptionsStruct> metadataOptions = Optional.empty();
1533915339
Optional<Long> expiryTime = Optional.empty();
1534015340
for (StructElement element: ((StructType)tlvValue).value()) {
15341-
if (element.contextTagNum() == STREAM_TYPE_ID) {
15341+
if (element.contextTagNum() == STREAM_USAGE_ID) {
1534215342
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
1534315343
UIntType castingValue = element.value(UIntType.class);
15344-
streamType = castingValue.value(Integer.class);
15344+
streamUsage = castingValue.value(Integer.class);
1534515345
}
1534615346
} else if (element.contextTagNum() == VIDEO_STREAM_ID_ID) {
1534715347
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -15396,7 +15396,7 @@ public static PushAvStreamTransportClusterTransportOptionsStruct decodeTlv(BaseT
1539615396
}
1539715397
}
1539815398
return new PushAvStreamTransportClusterTransportOptionsStruct(
15399-
streamType,
15399+
streamUsage,
1540015400
videoStreamID,
1540115401
audioStreamID,
1540215402
endpointID,
@@ -15414,8 +15414,8 @@ public static PushAvStreamTransportClusterTransportOptionsStruct decodeTlv(BaseT
1541415414
public String toString() {
1541515415
StringBuilder output = new StringBuilder();
1541615416
output.append("PushAvStreamTransportClusterTransportOptionsStruct {\n");
15417-
output.append("\tstreamType: ");
15418-
output.append(streamType);
15417+
output.append("\tstreamUsage: ");
15418+
output.append(streamUsage);
1541915419
output.append("\n");
1542015420
output.append("\tvideoStreamID: ");
1542115421
output.append(videoStreamID);

‎src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import matter.tlv.TlvReader
2424
import matter.tlv.TlvWriter
2525

2626
class PushAvStreamTransportClusterTransportOptionsStruct(
27-
val streamType: UInt,
27+
val streamUsage: UInt,
2828
val videoStreamID: Optional<UInt>,
2929
val audioStreamID: Optional<UInt>,
3030
val endpointID: UInt,
@@ -38,7 +38,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
3838
) {
3939
override fun toString(): String = buildString {
4040
append("PushAvStreamTransportClusterTransportOptionsStruct {\n")
41-
append("\tstreamType : $streamType\n")
41+
append("\tstreamUsage : $streamUsage\n")
4242
append("\tvideoStreamID : $videoStreamID\n")
4343
append("\taudioStreamID : $audioStreamID\n")
4444
append("\tendpointID : $endpointID\n")
@@ -55,7 +55,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
5555
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
5656
tlvWriter.apply {
5757
startStructure(tlvTag)
58-
put(ContextSpecificTag(TAG_STREAM_TYPE), streamType)
58+
put(ContextSpecificTag(TAG_STREAM_USAGE), streamUsage)
5959
if (videoStreamID.isPresent) {
6060
val optvideoStreamID = videoStreamID.get()
6161
put(ContextSpecificTag(TAG_VIDEO_STREAM_ID), optvideoStreamID)
@@ -83,7 +83,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
8383
}
8484

8585
companion object {
86-
private const val TAG_STREAM_TYPE = 0
86+
private const val TAG_STREAM_USAGE = 0
8787
private const val TAG_VIDEO_STREAM_ID = 1
8888
private const val TAG_AUDIO_STREAM_ID = 2
8989
private const val TAG_ENDPOINT_ID = 3
@@ -100,7 +100,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
100100
tlvReader: TlvReader,
101101
): PushAvStreamTransportClusterTransportOptionsStruct {
102102
tlvReader.enterStructure(tlvTag)
103-
val streamType = tlvReader.getUInt(ContextSpecificTag(TAG_STREAM_TYPE))
103+
val streamUsage = tlvReader.getUInt(ContextSpecificTag(TAG_STREAM_USAGE))
104104
val videoStreamID =
105105
if (tlvReader.isNextTag(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) {
106106
Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_VIDEO_STREAM_ID)))
@@ -148,7 +148,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
148148
tlvReader.exitContainer()
149149

150150
return PushAvStreamTransportClusterTransportOptionsStruct(
151-
streamType,
151+
streamUsage,
152152
videoStreamID,
153153
audioStreamID,
154154
endpointID,

‎src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportOptionsStruct.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import matter.tlv.TlvReader
2424
import matter.tlv.TlvWriter
2525

2626
class PushAvStreamTransportClusterTransportOptionsStruct(
27-
val streamType: UByte,
27+
val streamUsage: UByte,
2828
val videoStreamID: Optional<UShort>,
2929
val audioStreamID: Optional<UShort>,
3030
val endpointID: UShort,
@@ -38,7 +38,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
3838
) {
3939
override fun toString(): String = buildString {
4040
append("PushAvStreamTransportClusterTransportOptionsStruct {\n")
41-
append("\tstreamType : $streamType\n")
41+
append("\tstreamUsage : $streamUsage\n")
4242
append("\tvideoStreamID : $videoStreamID\n")
4343
append("\taudioStreamID : $audioStreamID\n")
4444
append("\tendpointID : $endpointID\n")
@@ -55,7 +55,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
5555
fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
5656
tlvWriter.apply {
5757
startStructure(tlvTag)
58-
put(ContextSpecificTag(TAG_STREAM_TYPE), streamType)
58+
put(ContextSpecificTag(TAG_STREAM_USAGE), streamUsage)
5959
if (videoStreamID.isPresent) {
6060
val optvideoStreamID = videoStreamID.get()
6161
put(ContextSpecificTag(TAG_VIDEO_STREAM_ID), optvideoStreamID)
@@ -83,7 +83,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
8383
}
8484

8585
companion object {
86-
private const val TAG_STREAM_TYPE = 0
86+
private const val TAG_STREAM_USAGE = 0
8787
private const val TAG_VIDEO_STREAM_ID = 1
8888
private const val TAG_AUDIO_STREAM_ID = 2
8989
private const val TAG_ENDPOINT_ID = 3
@@ -100,7 +100,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
100100
tlvReader: TlvReader,
101101
): PushAvStreamTransportClusterTransportOptionsStruct {
102102
tlvReader.enterStructure(tlvTag)
103-
val streamType = tlvReader.getUByte(ContextSpecificTag(TAG_STREAM_TYPE))
103+
val streamUsage = tlvReader.getUByte(ContextSpecificTag(TAG_STREAM_USAGE))
104104
val videoStreamID =
105105
if (tlvReader.isNextTag(ContextSpecificTag(TAG_VIDEO_STREAM_ID))) {
106106
Optional.of(tlvReader.getUShort(ContextSpecificTag(TAG_VIDEO_STREAM_ID)))
@@ -148,7 +148,7 @@ class PushAvStreamTransportClusterTransportOptionsStruct(
148148
tlvReader.exitContainer()
149149

150150
return PushAvStreamTransportClusterTransportOptionsStruct(
151-
streamType,
151+
streamUsage,
152152
videoStreamID,
153153
audioStreamID,
154154
endpointID,

‎src/controller/python/chip/clusters/Objects.py

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/cluster-enums.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)