Skip to content

Commit 8e5895e

Browse files
sayondeepesp
sayondeep
authored and
esp
committed
Update to latest spec changes
1 parent 1babf8b commit 8e5895e

11 files changed

+237
-198
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

Lines changed: 31 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7465,10 +7465,9 @@ provisional cluster PushAvStreamTransport = 1365 {
74657465
kInvalidStream = 3;
74667466
kInvalidURL = 4;
74677467
kInvalidZone = 5;
7468-
kUnsupportedContainerFormat = 6;
7469-
kUnsupportedIngestMethod = 7;
7470-
kInvalidTriggerType = 8;
7471-
kInvalidTransportStatus = 9;
7468+
kInvalidCombination = 6;
7469+
kInvalidTriggerType = 7;
7470+
kInvalidTransportStatus = 8;
74727471
}
74737472

74747473
shared enum StreamUsageEnum : enum8 {
@@ -7500,14 +7499,6 @@ provisional cluster PushAvStreamTransport = 1365 {
75007499
kMetadata = 0x2;
75017500
}
75027501

7503-
bitmap SupportedContainerFormatsBitmap : bitmap8 {
7504-
kCMAF = 0x1;
7505-
}
7506-
7507-
bitmap SupportedIngestMethodsBitmap : bitmap8 {
7508-
kCMAFIngest = 0x1;
7509-
}
7510-
75117502
struct TransportMotionTriggerTimeControlStruct {
75127503
int16u initialDuration = 0;
75137504
int16u augmentationDuration = 1;
@@ -7516,8 +7507,8 @@ provisional cluster PushAvStreamTransport = 1365 {
75167507
}
75177508

75187509
struct TransportZoneOptionsStruct {
7519-
nullable int16u zone = 1;
7520-
optional int8u sensitivity = 2;
7510+
nullable int16u zone = 0;
7511+
optional int8u sensitivity = 1;
75217512
}
75227513

75237514
struct TransportTriggerOptionsStruct {
@@ -7532,6 +7523,7 @@ provisional cluster PushAvStreamTransport = 1365 {
75327523
int16u chunkDuration = 0;
75337524
optional octet_string<16> CENCKey = 1;
75347525
optional boolean metadataEnabled = 2;
7526+
optional octet_string<16> CENCKeyID = 3;
75357527
}
75367528

75377529
struct ContainerOptionsStruct {
@@ -7547,9 +7539,8 @@ provisional cluster PushAvStreamTransport = 1365 {
75477539
long_char_string<2000> url = 4;
75487540
TransportTriggerOptionsStruct triggerOptions = 5;
75497541
IngestMethodsEnum ingestMethod = 6;
7550-
ContainerFormatEnum containerFormat = 7;
7551-
ContainerOptionsStruct containerOptions = 8;
7552-
optional epoch_s expiryTime = 9;
7542+
ContainerOptionsStruct containerOptions = 7;
7543+
optional epoch_s expiryTime = 8;
75537544
}
75547545

75557546
struct TransportConfigurationStruct {
@@ -7558,6 +7549,11 @@ provisional cluster PushAvStreamTransport = 1365 {
75587549
optional TransportOptionsStruct transportOptions = 2;
75597550
}
75607551

7552+
struct SupportedFormatStruct {
7553+
ContainerFormatEnum containerFormat = 0;
7554+
IngestMethodsEnum ingestMethod = 1;
7555+
}
7556+
75617557
info event PushTransportBegin = 0 {
75627558
int16u connectionID = 0;
75637559
TransportTriggerTypeEnum triggerType = 1;
@@ -7570,9 +7566,8 @@ provisional cluster PushAvStreamTransport = 1365 {
75707566
optional TriggerActivationReasonEnum activationReason = 2;
75717567
}
75727568

7573-
readonly attribute SupportedContainerFormatsBitmap supportedContainerFormats = 0;
7574-
readonly attribute SupportedIngestMethodsBitmap supportedIngestMethods = 1;
7575-
readonly attribute TransportConfigurationStruct currentConnections[] = 2;
7569+
readonly attribute SupportedFormatStruct supportedFormats[] = 0;
7570+
readonly attribute TransportConfigurationStruct currentConnections[] = 1;
75767571
readonly attribute command_id generatedCommandList[] = 65528;
75777572
readonly attribute command_id acceptedCommandList[] = 65529;
75787573
readonly attribute event_id eventList[] = 65530;
@@ -7647,10 +7642,9 @@ provisional cluster PushAvStreamTransport = 1365 {
76477642
kInvalidStream = 3;
76487643
kInvalidURL = 4;
76497644
kInvalidZone = 5;
7650-
kUnsupportedContainerFormat = 6;
7651-
kUnsupportedIngestMethod = 7;
7652-
kInvalidTriggerType = 8;
7653-
kInvalidTransportStatus = 9;
7645+
kInvalidCombination = 6;
7646+
kInvalidTriggerType = 7;
7647+
kInvalidTransportStatus = 8;
76547648
}
76557649

76567650
shared enum StreamUsageEnum : enum8 {
@@ -7682,14 +7676,6 @@ provisional cluster PushAvStreamTransport = 1365 {
76827676
kMetadata = 0x2;
76837677
}
76847678

7685-
bitmap SupportedContainerFormatsBitmap : bitmap8 {
7686-
kCMAF = 0x1;
7687-
}
7688-
7689-
bitmap SupportedIngestMethodsBitmap : bitmap8 {
7690-
kCMAFIngest = 0x1;
7691-
}
7692-
76937679
struct TransportMotionTriggerTimeControlStruct {
76947680
int16u initialDuration = 0;
76957681
int16u augmentationDuration = 1;
@@ -7698,8 +7684,8 @@ provisional cluster PushAvStreamTransport = 1365 {
76987684
}
76997685

77007686
struct TransportZoneOptionsStruct {
7701-
nullable int16u zone = 1;
7702-
optional int8u sensitivity = 2;
7687+
nullable int16u zone = 0;
7688+
optional int8u sensitivity = 1;
77037689
}
77047690

77057691
struct TransportTriggerOptionsStruct {
@@ -7714,6 +7700,7 @@ provisional cluster PushAvStreamTransport = 1365 {
77147700
int16u chunkDuration = 0;
77157701
optional octet_string<16> CENCKey = 1;
77167702
optional boolean metadataEnabled = 2;
7703+
optional octet_string<16> CENCKeyID = 3;
77177704
}
77187705

77197706
struct ContainerOptionsStruct {
@@ -7729,9 +7716,8 @@ provisional cluster PushAvStreamTransport = 1365 {
77297716
long_char_string<2000> url = 4;
77307717
TransportTriggerOptionsStruct triggerOptions = 5;
77317718
IngestMethodsEnum ingestMethod = 6;
7732-
ContainerFormatEnum containerFormat = 7;
7733-
ContainerOptionsStruct containerOptions = 8;
7734-
optional epoch_s expiryTime = 9;
7719+
ContainerOptionsStruct containerOptions = 7;
7720+
optional epoch_s expiryTime = 8;
77357721
}
77367722

77377723
struct TransportConfigurationStruct {
@@ -7740,6 +7726,11 @@ provisional cluster PushAvStreamTransport = 1365 {
77407726
optional TransportOptionsStruct transportOptions = 2;
77417727
}
77427728

7729+
struct SupportedFormatStruct {
7730+
ContainerFormatEnum containerFormat = 0;
7731+
IngestMethodsEnum ingestMethod = 1;
7732+
}
7733+
77437734
info event PushTransportBegin = 0 {
77447735
int16u connectionID = 0;
77457736
TransportTriggerTypeEnum triggerType = 1;
@@ -7752,9 +7743,8 @@ provisional cluster PushAvStreamTransport = 1365 {
77527743
optional TriggerActivationReasonEnum activationReason = 2;
77537744
}
77547745

7755-
readonly attribute SupportedContainerFormatsBitmap supportedContainerFormats = 0;
7756-
readonly attribute SupportedIngestMethodsBitmap supportedIngestMethods = 1;
7757-
readonly attribute TransportConfigurationStruct currentConnections[] = 2;
7746+
readonly attribute SupportedFormatStruct supportedFormats[] = 0;
7747+
readonly attribute TransportConfigurationStruct currentConnections[] = 1;
77587748
readonly attribute command_id generatedCommandList[] = 65528;
77597749
readonly attribute command_id acceptedCommandList[] = 65529;
77607750
readonly attribute event_id eventList[] = 65530;
@@ -10183,8 +10173,7 @@ endpoint 1 {
1018310173
}
1018410174

1018510175
server cluster PushAvStreamTransport {
10186-
ram attribute supportedContainerFormats;
10187-
ram attribute supportedIngestMethods;
10176+
callback attribute supportedFormats;
1018810177
callback attribute currentConnections;
1018910178
callback attribute generatedCommandList;
1019010179
callback attribute acceptedCommandList;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@
15821582
"storageOption": "External",
15831583
"singleton": 0,
15841584
"bounded": 0,
1585-
"defaultValue": "",
1585+
"defaultValue": null,
15861586
"reportable": 1,
15871587
"minInterval": 1,
15881588
"maxInterval": 65534,
@@ -21583,40 +21583,24 @@
2158321583
],
2158421584
"attributes": [
2158521585
{
21586-
"name": "SupportedContainerFormats",
21586+
"name": "SupportedFormats",
2158721587
"code": 0,
2158821588
"mfgCode": null,
2158921589
"side": "server",
21590-
"type": "SupportedContainerFormatsBitmap",
21591-
"included": 1,
21592-
"storageOption": "RAM",
21593-
"singleton": 0,
21594-
"bounded": 0,
21595-
"defaultValue": "",
21596-
"reportable": 1,
21597-
"minInterval": 1,
21598-
"maxInterval": 65534,
21599-
"reportableChange": 0
21600-
},
21601-
{
21602-
"name": "SupportedIngestMethods",
21603-
"code": 1,
21604-
"mfgCode": null,
21605-
"side": "server",
21606-
"type": "SupportedIngestMethodsBitmap",
21590+
"type": "array",
2160721591
"included": 1,
21608-
"storageOption": "RAM",
21592+
"storageOption": "External",
2160921593
"singleton": 0,
2161021594
"bounded": 0,
21611-
"defaultValue": "",
21595+
"defaultValue": null,
2161221596
"reportable": 1,
2161321597
"minInterval": 1,
2161421598
"maxInterval": 65534,
2161521599
"reportableChange": 0
2161621600
},
2161721601
{
2161821602
"name": "CurrentConnections",
21619-
"code": 2,
21603+
"code": 1,
2162021604
"mfgCode": null,
2162121605
"side": "server",
2162221606
"type": "array",
@@ -21877,10 +21861,10 @@
2187721861
"side": "server",
2187821862
"type": "MeterTypeEnum",
2187921863
"included": 1,
21880-
"storageOption": "RAM",
21864+
"storageOption": "External",
2188121865
"singleton": 0,
2188221866
"bounded": 0,
21883-
"defaultValue": "",
21867+
"defaultValue": null,
2188421868
"reportable": 1,
2188521869
"minInterval": 1,
2188621870
"maxInterval": 65534,
@@ -21893,10 +21877,10 @@
2189321877
"side": "server",
2189421878
"type": "char_string",
2189521879
"included": 1,
21896-
"storageOption": "RAM",
21880+
"storageOption": "External",
2189721881
"singleton": 0,
2189821882
"bounded": 0,
21899-
"defaultValue": "",
21883+
"defaultValue": null,
2190021884
"reportable": 1,
2190121885
"minInterval": 1,
2190221886
"maxInterval": 65534,
@@ -21909,10 +21893,10 @@
2190921893
"side": "server",
2191021894
"type": "char_string",
2191121895
"included": 1,
21912-
"storageOption": "RAM",
21896+
"storageOption": "External",
2191321897
"singleton": 0,
2191421898
"bounded": 0,
21915-
"defaultValue": "",
21899+
"defaultValue": null,
2191621900
"reportable": 1,
2191721901
"minInterval": 1,
2191821902
"maxInterval": 65534,
@@ -21925,10 +21909,10 @@
2192521909
"side": "server",
2192621910
"type": "char_string",
2192721911
"included": 1,
21928-
"storageOption": "RAM",
21912+
"storageOption": "External",
2192921913
"singleton": 0,
2193021914
"bounded": 0,
21931-
"defaultValue": "",
21915+
"defaultValue": null,
2193221916
"reportable": 1,
2193321917
"minInterval": 1,
2193421918
"maxInterval": 65534,
@@ -21944,7 +21928,7 @@
2194421928
"storageOption": "External",
2194521929
"singleton": 0,
2194621930
"bounded": 0,
21947-
"defaultValue": "",
21931+
"defaultValue": null,
2194821932
"reportable": 1,
2194921933
"minInterval": 1,
2195021934
"maxInterval": 65534,
@@ -21960,7 +21944,7 @@
2196021944
"storageOption": "External",
2196121945
"singleton": 0,
2196221946
"bounded": 0,
21963-
"defaultValue": "",
21947+
"defaultValue": null,
2196421948
"reportable": 1,
2196521949
"minInterval": 1,
2196621950
"maxInterval": 65534,
@@ -21976,7 +21960,7 @@
2197621960
"storageOption": "External",
2197721961
"singleton": 0,
2197821962
"bounded": 0,
21979-
"defaultValue": "",
21963+
"defaultValue": null,
2198021964
"reportable": 1,
2198121965
"minInterval": 1,
2198221966
"maxInterval": 65534,
@@ -21992,7 +21976,7 @@
2199221976
"storageOption": "External",
2199321977
"singleton": 0,
2199421978
"bounded": 0,
21995-
"defaultValue": "",
21979+
"defaultValue": null,
2199621980
"reportable": 1,
2199721981
"minInterval": 1,
2199821982
"maxInterval": 65534,
@@ -22005,10 +21989,10 @@
2200521989
"side": "server",
2200621990
"type": "bitmap32",
2200721991
"included": 1,
22008-
"storageOption": "RAM",
21992+
"storageOption": "External",
2200921993
"singleton": 0,
2201021994
"bounded": 0,
22011-
"defaultValue": "0",
21995+
"defaultValue": null,
2201221996
"reportable": 1,
2201321997
"minInterval": 1,
2201421998
"maxInterval": 65534,

‎examples/all-clusters-app/all-clusters-common/include/push-av-stream-transport-delegate-impl.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ namespace PushAvStreamTransport {
3030
struct PushAvStream
3131
{
3232
uint16_t id;
33-
TransportConfigurationStruct transportConfig;
34-
PushAvStreamTransportStatusEnum status;
33+
TransportOptionsStruct transportOptions;
34+
TransportStatusEnum transportStatus;
35+
PushAvStreamTransportStatusEnum connectionStatus;
3536
};
3637

3738
/**
@@ -40,8 +41,8 @@ struct PushAvStream
4041
class PushAvStreamTransportManager : public PushAvStreamTransportDelegate
4142
{
4243
public:
43-
Protocols::InteractionModel::Status AllocatePushTransport(const TransportOptionsDecodeableStruct & transportOptions,
44-
TransportConfigurationStruct & outTransporConfiguration);
44+
Protocols::InteractionModel::Status AllocatePushTransport(const TransportOptionsStruct & transportOptions,
45+
const uint16_t connectionID);
4546
Protocols::InteractionModel::Status DeallocatePushTransport(const uint16_t connectionID);
4647
Protocols::InteractionModel::Status ModifyPushTransport(const uint16_t connectionID,
4748
const TransportOptionsDecodeableStruct & transportOptions);
@@ -51,7 +52,6 @@ class PushAvStreamTransportManager : public PushAvStreamTransportDelegate
5152
Protocols::InteractionModel::Status
5253
ManuallyTriggerTransport(const uint16_t connectionID, TriggerActivationReasonEnum activationReason,
5354
const Optional<Structs::TransportMotionTriggerTimeControlStruct::DecodableType> & timeControl);
54-
Protocols::InteractionModel::Status FindTransport(const Optional<DataModel::Nullable<uint16_t>> & connectionID);
5555

5656
CHIP_ERROR ValidateStreamUsage(StreamUsageEnum streamUsage, const Optional<DataModel::Nullable<uint16_t>> & videoStreamId,
5757
const Optional<DataModel::Nullable<uint16_t>> & audioStreamId);
@@ -70,7 +70,6 @@ class PushAvStreamTransportManager : public PushAvStreamTransportDelegate
7070

7171
private:
7272
std::vector<PushAvStream> pushavStreams;
73-
std::vector<TransportConfigurationStruct> configList;
7473
};
7574

7675
} // namespace PushAvStreamTransport

0 commit comments

Comments
 (0)