Skip to content

Commit 8921503

Browse files
committed
[Media] Codegen from ZAP xml
1 parent debbc2e commit 8921503

File tree

81 files changed

+10709
-2384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+10709
-2384
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6494,7 +6494,7 @@ cluster WakeOnLan = 1283 {
64946494

64956495
/** This cluster provides an interface for managing low power mode on a device. */
64966496
cluster LowPower = 1288 {
6497-
revision 1; // NOTE: Default/not specifically set
6497+
revision 1;
64986498

64996499
readonly attribute command_id generatedCommandList[] = 65528;
65006500
readonly attribute command_id acceptedCommandList[] = 65529;

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

+74-71
Original file line numberDiff line numberDiff line change
@@ -4509,25 +4509,30 @@ cluster Channel = 1284 {
45094509
kRecordProgram = 0x8;
45104510
}
45114511

4512-
bitmap RecordingFlagBitmap : bitmap32 {
4512+
bitmap RecordingFlagBitmap : bitmap8 {
45134513
kScheduled = 0x1;
45144514
kRecordSeries = 0x2;
45154515
kRecorded = 0x4;
45164516
}
45174517

4518-
struct ProgramCastStruct {
4518+
struct AdditionalInfoStruct {
45194519
char_string name = 0;
4520-
char_string role = 1;
4520+
char_string value = 1;
4521+
}
4522+
4523+
struct ProgramCastStruct {
4524+
long_char_string<256> name = 0;
4525+
long_char_string<256> role = 1;
45214526
}
45224527

45234528
struct ProgramCategoryStruct {
4524-
char_string category = 0;
4525-
optional char_string subCategory = 1;
4529+
long_char_string<256> category = 0;
4530+
optional long_char_string<256> subCategory = 1;
45264531
}
45274532

45284533
struct SeriesInfoStruct {
4529-
char_string season = 0;
4530-
char_string episode = 1;
4534+
long_char_string<256> season = 0;
4535+
long_char_string<256> episode = 1;
45314536
}
45324537

45334538
struct ChannelInfoStruct {
@@ -4541,43 +4546,38 @@ cluster Channel = 1284 {
45414546
}
45424547

45434548
struct ProgramStruct {
4544-
char_string identifier = 0;
4549+
char_string<255> identifier = 0;
45454550
ChannelInfoStruct channel = 1;
45464551
epoch_s startTime = 2;
45474552
epoch_s endTime = 3;
4548-
char_string title = 4;
4549-
optional char_string subtitle = 5;
4550-
optional char_string description = 6;
4553+
char_string<255> title = 4;
4554+
optional char_string<255> subtitle = 5;
4555+
optional long_char_string<8192> description = 6;
45514556
optional char_string audioLanguages[] = 7;
45524557
optional char_string ratings[] = 8;
4553-
optional char_string thumbnailUrl = 9;
4554-
optional char_string posterArtUrl = 10;
4555-
optional char_string dvbiUrl = 11;
4556-
optional char_string releaseDate = 12;
4557-
optional char_string parentalGuidanceText = 13;
4558+
optional long_char_string<8192> thumbnailUrl = 9;
4559+
optional long_char_string<8192> posterArtUrl = 10;
4560+
optional long_char_string<8192> dvbiUrl = 11;
4561+
optional char_string<30> releaseDate = 12;
4562+
optional char_string<255> parentalGuidanceText = 13;
45584563
optional RecordingFlagBitmap recordingFlag = 14;
45594564
optional nullable SeriesInfoStruct seriesInfo = 15;
45604565
optional ProgramCategoryStruct categoryList[] = 16;
45614566
optional ProgramCastStruct castList[] = 17;
4562-
optional ProgramCastStruct externalIDList[] = 18;
4567+
optional AdditionalInfoStruct externalIDList[] = 18;
45634568
}
45644569

45654570
struct PageTokenStruct {
45664571
optional int16u limit = 0;
4567-
optional char_string after = 1;
4568-
optional char_string before = 2;
4572+
optional long_char_string<8192> after = 1;
4573+
optional long_char_string<8192> before = 2;
45694574
}
45704575

45714576
struct ChannelPagingStruct {
45724577
optional nullable PageTokenStruct previousToken = 0;
45734578
optional nullable PageTokenStruct nextToken = 1;
45744579
}
45754580

4576-
struct AdditionalInfoStruct {
4577-
char_string name = 0;
4578-
char_string value = 1;
4579-
}
4580-
45814581
struct LineupInfoStruct {
45824582
char_string operatorName = 0;
45834583
optional char_string lineupName = 1;
@@ -4614,13 +4614,13 @@ cluster Channel = 1284 {
46144614
}
46154615

46164616
request struct GetProgramGuideRequest {
4617-
optional epoch_s startTime = 0;
4618-
optional epoch_s endTime = 1;
4617+
epoch_s startTime = 0;
4618+
epoch_s endTime = 1;
46194619
optional ChannelInfoStruct channelList[] = 2;
4620-
optional PageTokenStruct pageToken = 3;
4621-
optional RecordingFlagBitmap recordingFlag = 4;
4620+
optional nullable PageTokenStruct pageToken = 3;
4621+
optional nullable RecordingFlagBitmap recordingFlag = 4;
46224622
optional AdditionalInfoStruct externalIDList[] = 5;
4623-
optional octet_string data = 6;
4623+
optional octet_string<8092> data = 6;
46244624
}
46254625

46264626
response struct ProgramGuideResponse = 5 {
@@ -4629,17 +4629,17 @@ cluster Channel = 1284 {
46294629
}
46304630

46314631
request struct RecordProgramRequest {
4632-
char_string programIdentifier = 0;
4632+
char_string<255> programIdentifier = 0;
46334633
boolean shouldRecordSeries = 1;
4634-
AdditionalInfoStruct externalIDList[] = 2;
4635-
octet_string data = 3;
4634+
optional AdditionalInfoStruct externalIDList[] = 2;
4635+
optional octet_string<8092> data = 3;
46364636
}
46374637

46384638
request struct CancelRecordProgramRequest {
4639-
char_string programIdentifier = 0;
4639+
char_string<255> programIdentifier = 0;
46404640
boolean shouldRecordSeries = 1;
4641-
AdditionalInfoStruct externalIDList[] = 2;
4642-
octet_string data = 3;
4641+
optional AdditionalInfoStruct externalIDList[] = 2;
4642+
optional octet_string<8092> data = 3;
46434643
}
46444644

46454645
/** Change the channel on the media player to the channel case-insensitive exact matching the value passed as an argument. */
@@ -4672,9 +4672,9 @@ cluster TargetNavigator = 1285 {
46724672
}
46734673

46744674
info event TargetUpdated = 0 {
4675-
TargetInfoStruct targetList[] = 0;
4676-
int8u currentTarget = 1;
4677-
octet_string data = 2;
4675+
optional TargetInfoStruct targetList[] = 0;
4676+
optional int8u currentTarget = 1;
4677+
optional octet_string data = 2;
46784678
}
46794679

46804680
readonly attribute TargetInfoStruct targetList[] = 0;
@@ -4751,12 +4751,13 @@ cluster MediaPlayback = 1286 {
47514751

47524752
struct TrackAttributesStruct {
47534753
char_string<32> languageCode = 0;
4754-
optional nullable char_string displayName = 1;
4754+
optional nullable CharacteristicEnum characteristics[] = 1;
4755+
optional nullable long_char_string<256> displayName = 2;
47554756
}
47564757

47574758
struct TrackStruct {
47584759
char_string<32> id = 0;
4759-
nullable TrackAttributesStruct trackAttributes = 1;
4760+
TrackAttributesStruct trackAttributes = 1;
47604761
}
47614762

47624763
struct PlaybackPositionStruct {
@@ -4766,14 +4767,14 @@ cluster MediaPlayback = 1286 {
47664767

47674768
info event StateChanged = 0 {
47684769
PlaybackStateEnum currentState = 0;
4769-
EPOCH_US startTime = 1;
4770-
INT64U duration = 2;
4771-
PlaybackPositionStruct sampledPosition = 3;
4772-
single playbackSpeed = 4;
4773-
INT64U seekRangeEnd = 5;
4774-
INT64U seekRangeStart = 6;
4775-
optional OCTET_STRING data = 7;
4776-
boolean audioAdvanceUnmuted = 8;
4770+
optional epoch_us startTime = 1;
4771+
optional int64u duration = 2;
4772+
optional PlaybackPositionStruct sampledPosition = 3;
4773+
optional single playbackSpeed = 4;
4774+
optional int64u seekRangeEnd = 5;
4775+
optional int64u seekRangeStart = 6;
4776+
optional octet_string data = 7;
4777+
optional boolean audioAdvanceUnmuted = 8;
47774778
}
47784779

47794780
readonly attribute PlaybackStateEnum currentState = 0;
@@ -4820,12 +4821,12 @@ cluster MediaPlayback = 1286 {
48204821
}
48214822

48224823
request struct ActivateAudioTrackRequest {
4823-
CHAR_STRING trackID = 0;
4824-
INT8U audioOutputIndex = 1;
4824+
char_string<32> trackID = 0;
4825+
optional nullable int8u audioOutputIndex = 1;
48254826
}
48264827

48274828
request struct ActivateTextTrackRequest {
4828-
CHAR_STRING trackID = 0;
4829+
char_string<32> trackID = 0;
48294830
}
48304831

48314832
/** Upon receipt, this SHALL play media. */
@@ -4860,7 +4861,7 @@ cluster MediaPlayback = 1286 {
48604861

48614862
/** This cluster provides an interface for controlling the Input Selector on a media device such as a TV. */
48624863
cluster MediaInput = 1287 {
4863-
revision 1; // NOTE: Default/not specifically set
4864+
revision 1;
48644865

48654866
enum InputTypeEnum : enum8 {
48664867
kInternal = 0;
@@ -4918,7 +4919,7 @@ cluster MediaInput = 1287 {
49184919

49194920
/** This cluster provides an interface for managing low power mode on a device. */
49204921
cluster LowPower = 1288 {
4921-
revision 1; // NOTE: Default/not specifically set
4922+
revision 1;
49224923

49234924
readonly attribute command_id generatedCommandList[] = 65528;
49244925
readonly attribute command_id acceptedCommandList[] = 65529;
@@ -4933,7 +4934,7 @@ cluster LowPower = 1288 {
49334934

49344935
/** This cluster provides an interface for controlling a device like a TV using action commands such as UP, DOWN, and SELECT. */
49354936
cluster KeypadInput = 1289 {
4936-
revision 1; // NOTE: Default/not specifically set
4937+
revision 1;
49374938

49384939
enum CECKeyCodeEnum : enum8 {
49394940
kSelect = 0;
@@ -5057,7 +5058,7 @@ cluster KeypadInput = 1289 {
50575058

50585059
/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
50595060
cluster ContentLauncher = 1290 {
5060-
revision 1;
5061+
revision 2;
50615062

50625063
enum CharacteristicEnum : enum8 {
50635064
kForcedSubtitles = 0;
@@ -5116,9 +5117,9 @@ cluster ContentLauncher = 1290 {
51165117
bitmap Feature : bitmap32 {
51175118
kContentSearch = 0x1;
51185119
kURLPlayback = 0x2;
5119-
kAdvancedSeek = 0x3;
5120-
kTextTracks = 0x4;
5121-
kAudioTracks = 0x5;
5120+
kAdvancedSeek = 0x4;
5121+
kTextTracks = 0x8;
5122+
kAudioTracks = 0x10;
51225123
}
51235124

51245125
bitmap SupportedProtocolsBitmap : bitmap32 {
@@ -5134,24 +5135,24 @@ cluster ContentLauncher = 1290 {
51345135

51355136
struct TrackPreferenceStruct {
51365137
char_string<32> languageCode = 0;
5137-
optional CharacteristicEnum characteristics[] = 1;
5138-
int8u audioOutputIndex = 2;
5138+
optional nullable CharacteristicEnum characteristics[] = 1;
5139+
optional nullable int8u audioOutputIndex = 2;
51395140
}
51405141

51415142
struct PlaybackPreferencesStruct {
5142-
int64u playbackPosition = 0;
5143-
TrackPreferenceStruct textTrack = 1;
5144-
optional TrackPreferenceStruct audioTracks[] = 2;
5143+
optional nullable int64u playbackPosition = 0;
5144+
optional nullable TrackPreferenceStruct textTrack = 1;
5145+
optional nullable TrackPreferenceStruct audioTracks[] = 2;
51455146
}
51465147

51475148
struct AdditionalInfoStruct {
5148-
char_string<256> name = 0;
5149-
char_string<8192> value = 1;
5149+
long_char_string<256> name = 0;
5150+
long_char_string<8192> value = 1;
51505151
}
51515152

51525153
struct ParameterStruct {
51535154
ParameterEnum type = 0;
5154-
char_string<1024> value = 1;
5155+
long_char_string<1024> value = 1;
51555156
optional AdditionalInfoStruct externalIDList[] = 2;
51565157
}
51575158

@@ -5160,13 +5161,13 @@ cluster ContentLauncher = 1290 {
51605161
}
51615162

51625163
struct StyleInformationStruct {
5163-
optional char_string<8192> imageURL = 0;
5164+
optional long_char_string<8192> imageURL = 0;
51645165
optional char_string<9> color = 1;
51655166
optional DimensionStruct size = 2;
51665167
}
51675168

51685169
struct BrandingInformationStruct {
5169-
char_string<256> providerName = 0;
5170+
long_char_string<256> providerName = 0;
51705171
optional StyleInformationStruct background = 1;
51715172
optional StyleInformationStruct logo = 2;
51725173
optional StyleInformationStruct progressBar = 3;
@@ -5195,6 +5196,7 @@ cluster ContentLauncher = 1290 {
51955196
char_string contentURL = 0;
51965197
optional char_string displayString = 1;
51975198
optional BrandingInformationStruct brandingInformation = 2;
5199+
optional PlaybackPreferencesStruct playbackPreferences = 3;
51985200
}
51995201

52005202
response struct LauncherResponse = 2 {
@@ -5257,7 +5259,7 @@ cluster AudioOutput = 1291 {
52575259

52585260
/** This cluster provides an interface for launching content on a media player device such as a TV or Speaker. */
52595261
cluster ApplicationLauncher = 1292 {
5260-
revision 1; // NOTE: Default/not specifically set
5262+
revision 1;
52615263

52625264
enum StatusEnum : enum8 {
52635265
kSuccess = 0;
@@ -5316,7 +5318,7 @@ cluster ApplicationLauncher = 1292 {
53165318

53175319
/** This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. */
53185320
cluster ApplicationBasic = 1293 {
5319-
revision 1; // NOTE: Default/not specifically set
5321+
revision 1;
53205322

53215323
enum ApplicationStatusEnum : enum8 {
53225324
kStopped = 0;
@@ -5350,8 +5352,9 @@ cluster ApplicationBasic = 1293 {
53505352
cluster AccountLogin = 1294 {
53515353
revision 2;
53525354

5353-
critical event LoggedOut = 0 {
5355+
fabric_sensitive critical event access(read: administer) LoggedOut = 0 {
53545356
optional node_id node = 0;
5357+
fabric_idx fabricIndex = 254;
53555358
}
53565359

53575360
readonly attribute command_id generatedCommandList[] = 65528;

0 commit comments

Comments
 (0)