Skip to content

Commit 7481f60

Browse files
authored
PushAV Stream Transport cluster xml update (#39077)
* alchemy generated xml * zap regen
1 parent a085a45 commit 7481f60

File tree

20 files changed

+127
-20
lines changed

20 files changed

+127
-20
lines changed

src/app/zap-templates/zcl/data-model/chip/push-av-stream-transport-cluster.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717
<!--
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/app_clusters/PushAVStreamTransport.adoc
20-
Parameters: in-progress
21-
Git: 0.7-summer-2025-ncr-195-gdc1151679
20+
Parameters:
21+
Git: 0.7-summer-2025-ncr-432-g11358ab17
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="Cameras"/>
@@ -83,7 +83,7 @@ Git: 0.7-summer-2025-ncr-195-gdc1151679
8383
<item fieldId="1" name="IngestMethod" type="IngestMethodsEnum" min="0x00" max="0x00"/>
8484
</struct>
8585

86-
<struct name="TransportConfigurationStruct" apiMaturity="provisional">
86+
<struct name="TransportConfigurationStruct" apiMaturity="provisional" isFabricScoped="true">
8787
<cluster code="0x0555"/>
8888
<item fieldId="0" name="ConnectionID" type="int16u"/>
8989
<item fieldId="1" name="TransportStatus" type="TransportStatusEnum" min="0x00" max="0x01"/>

src/controller/data_model/controller-clusters.matter

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10333,10 +10333,11 @@ provisional cluster PushAvStreamTransport = 1365 {
1033310333
optional epoch_s expiryTime = 8;
1033410334
}
1033510335

10336-
struct TransportConfigurationStruct {
10336+
fabric_scoped struct TransportConfigurationStruct {
1033710337
int16u connectionID = 0;
1033810338
TransportStatusEnum transportStatus = 1;
1033910339
optional TransportOptionsStruct transportOptions = 2;
10340+
fabric_idx fabricIndex = 254;
1034010341
}
1034110342

1034210343
struct SupportedFormatStruct {

src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60566,6 +60566,11 @@ public void onSuccess(byte[] tlv) {
6056660566

6056760567
public void readCurrentConnectionsAttribute(
6056860568
CurrentConnectionsAttributeCallback callback) {
60569+
readCurrentConnectionsAttributeWithFabricFilter(callback, true);
60570+
}
60571+
60572+
public void readCurrentConnectionsAttributeWithFabricFilter(
60573+
CurrentConnectionsAttributeCallback callback, boolean isFabricFiltered) {
6056960574
ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_CONNECTIONS_ATTRIBUTE_ID);
6057060575

6057160576
readAttribute(new ReportCallbackImpl(callback, path) {
@@ -60574,7 +60579,7 @@ public void onSuccess(byte[] tlv) {
6057460579
List<ChipStructs.PushAvStreamTransportClusterTransportConfigurationStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
6057560580
callback.onSuccess(value);
6057660581
}
60577-
}, CURRENT_CONNECTIONS_ATTRIBUTE_ID, true);
60582+
}, CURRENT_CONNECTIONS_ATTRIBUTE_ID, isFabricFiltered);
6057860583
}
6057960584

6058060585
public void subscribeCurrentConnectionsAttribute(

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15984,25 +15984,30 @@ public static class PushAvStreamTransportClusterTransportConfigurationStruct {
1598415984
public Integer connectionID;
1598515985
public Integer transportStatus;
1598615986
public Optional<ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct> transportOptions;
15987+
public Integer fabricIndex;
1598715988
private static final long CONNECTION_ID_ID = 0L;
1598815989
private static final long TRANSPORT_STATUS_ID = 1L;
1598915990
private static final long TRANSPORT_OPTIONS_ID = 2L;
15991+
private static final long FABRIC_INDEX_ID = 254L;
1599015992

1599115993
public PushAvStreamTransportClusterTransportConfigurationStruct(
1599215994
Integer connectionID,
1599315995
Integer transportStatus,
15994-
Optional<ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct> transportOptions
15996+
Optional<ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct> transportOptions,
15997+
Integer fabricIndex
1599515998
) {
1599615999
this.connectionID = connectionID;
1599716000
this.transportStatus = transportStatus;
1599816001
this.transportOptions = transportOptions;
16002+
this.fabricIndex = fabricIndex;
1599916003
}
1600016004

1600116005
public StructType encodeTlv() {
1600216006
ArrayList<StructElement> values = new ArrayList<>();
1600316007
values.add(new StructElement(CONNECTION_ID_ID, new UIntType(connectionID)));
1600416008
values.add(new StructElement(TRANSPORT_STATUS_ID, new UIntType(transportStatus)));
1600516009
values.add(new StructElement(TRANSPORT_OPTIONS_ID, transportOptions.<BaseTLVType>map((nonOptionaltransportOptions) -> nonOptionaltransportOptions.encodeTlv()).orElse(new EmptyType())));
16010+
values.add(new StructElement(FABRIC_INDEX_ID, new UIntType(fabricIndex)));
1600616011

1600716012
return new StructType(values);
1600816013
}
@@ -16014,6 +16019,7 @@ public static PushAvStreamTransportClusterTransportConfigurationStruct decodeTlv
1601416019
Integer connectionID = null;
1601516020
Integer transportStatus = null;
1601616021
Optional<ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct> transportOptions = Optional.empty();
16022+
Integer fabricIndex = null;
1601716023
for (StructElement element: ((StructType)tlvValue).value()) {
1601816024
if (element.contextTagNum() == CONNECTION_ID_ID) {
1601916025
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
@@ -16030,12 +16036,18 @@ public static PushAvStreamTransportClusterTransportConfigurationStruct decodeTlv
1603016036
StructType castingValue = element.value(StructType.class);
1603116037
transportOptions = Optional.of(ChipStructs.PushAvStreamTransportClusterTransportOptionsStruct.decodeTlv(castingValue));
1603216038
}
16039+
} else if (element.contextTagNum() == FABRIC_INDEX_ID) {
16040+
if (element.value(BaseTLVType.class).type() == TLVType.UInt) {
16041+
UIntType castingValue = element.value(UIntType.class);
16042+
fabricIndex = castingValue.value(Integer.class);
16043+
}
1603316044
}
1603416045
}
1603516046
return new PushAvStreamTransportClusterTransportConfigurationStruct(
1603616047
connectionID,
1603716048
transportStatus,
16038-
transportOptions
16049+
transportOptions,
16050+
fabricIndex
1603916051
);
1604016052
}
1604116053

@@ -16052,6 +16064,9 @@ public String toString() {
1605216064
output.append("\ttransportOptions: ");
1605316065
output.append(transportOptions);
1605416066
output.append("\n");
16067+
output.append("\tfabricIndex: ");
16068+
output.append(fabricIndex);
16069+
output.append("\n");
1605516070
output.append("}\n");
1605616071
return output.toString();
1605716072
}

src/controller/java/generated/java/chip/devicecontroller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
2727
val connectionID: UInt,
2828
val transportStatus: UInt,
2929
val transportOptions: Optional<PushAvStreamTransportClusterTransportOptionsStruct>,
30+
val fabricIndex: UInt,
3031
) {
3132
override fun toString(): String = buildString {
3233
append("PushAvStreamTransportClusterTransportConfigurationStruct {\n")
3334
append("\tconnectionID : $connectionID\n")
3435
append("\ttransportStatus : $transportStatus\n")
3536
append("\ttransportOptions : $transportOptions\n")
37+
append("\tfabricIndex : $fabricIndex\n")
3638
append("}\n")
3739
}
3840

@@ -45,6 +47,7 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
4547
val opttransportOptions = transportOptions.get()
4648
opttransportOptions.toTlv(ContextSpecificTag(TAG_TRANSPORT_OPTIONS), this)
4749
}
50+
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
4851
endStructure()
4952
}
5053
}
@@ -53,6 +56,7 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
5356
private const val TAG_CONNECTION_ID = 0
5457
private const val TAG_TRANSPORT_STATUS = 1
5558
private const val TAG_TRANSPORT_OPTIONS = 2
59+
private const val TAG_FABRIC_INDEX = 254
5660

5761
fun fromTlv(
5862
tlvTag: Tag,
@@ -72,13 +76,15 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
7276
} else {
7377
Optional.empty()
7478
}
79+
val fabricIndex = tlvReader.getUInt(ContextSpecificTag(TAG_FABRIC_INDEX))
7580

7681
tlvReader.exitContainer()
7782

7883
return PushAvStreamTransportClusterTransportConfigurationStruct(
7984
connectionID,
8085
transportStatus,
8186
transportOptions,
87+
fabricIndex,
8288
)
8389
}
8490
}

src/controller/java/generated/java/matter/controller/cluster/structs/PushAvStreamTransportClusterTransportConfigurationStruct.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
2727
val connectionID: UShort,
2828
val transportStatus: UByte,
2929
val transportOptions: Optional<PushAvStreamTransportClusterTransportOptionsStruct>,
30+
val fabricIndex: UByte,
3031
) {
3132
override fun toString(): String = buildString {
3233
append("PushAvStreamTransportClusterTransportConfigurationStruct {\n")
3334
append("\tconnectionID : $connectionID\n")
3435
append("\ttransportStatus : $transportStatus\n")
3536
append("\ttransportOptions : $transportOptions\n")
37+
append("\tfabricIndex : $fabricIndex\n")
3638
append("}\n")
3739
}
3840

@@ -45,6 +47,7 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
4547
val opttransportOptions = transportOptions.get()
4648
opttransportOptions.toTlv(ContextSpecificTag(TAG_TRANSPORT_OPTIONS), this)
4749
}
50+
put(ContextSpecificTag(TAG_FABRIC_INDEX), fabricIndex)
4851
endStructure()
4952
}
5053
}
@@ -53,6 +56,7 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
5356
private const val TAG_CONNECTION_ID = 0
5457
private const val TAG_TRANSPORT_STATUS = 1
5558
private const val TAG_TRANSPORT_OPTIONS = 2
59+
private const val TAG_FABRIC_INDEX = 254
5660

5761
fun fromTlv(
5862
tlvTag: Tag,
@@ -72,13 +76,15 @@ class PushAvStreamTransportClusterTransportConfigurationStruct(
7276
} else {
7377
Optional.empty()
7478
}
79+
val fabricIndex = tlvReader.getUByte(ContextSpecificTag(TAG_FABRIC_INDEX))
7580

7681
tlvReader.exitContainer()
7782

7883
return PushAvStreamTransportClusterTransportConfigurationStruct(
7984
connectionID,
8085
transportStatus,
8186
transportOptions,
87+
fabricIndex,
8288
)
8389
}
8490
}

src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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.mm

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zzz_generated/app-common/clusters/PushAvStreamTransport/Commands.ipp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace AllocatePushTransportResponse {
6262
CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
6363
{
6464
DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
65-
encoder.Encode(to_underlying(Fields::kTransportConfiguration), transportConfiguration);
65+
encoder.EncodeForWrite(to_underlying(Fields::kTransportConfiguration), transportConfiguration);
6666
return encoder.Finalize();
6767
}
6868

@@ -250,7 +250,7 @@ namespace FindTransportResponse {
250250
CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
251251
{
252252
DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
253-
encoder.Encode(to_underlying(Fields::kTransportConfigurations), transportConfigurations);
253+
encoder.EncodeForWrite(to_underlying(Fields::kTransportConfigurations), transportConfigurations);
254254
return encoder.Finalize();
255255
}
256256

0 commit comments

Comments
 (0)