From 0879e8076a2d8bd95fa7894c83966cf298ba2c56 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 9 Feb 2024 11:25:25 -0500 Subject: [PATCH] Delete ContentLaunch::SupportedProtocolsBitmap::kWebRTC --- .../all-clusters-common/all-clusters-minimal-app.matter | 1 - examples/placeholder/linux/apps/app1/config.matter | 2 -- examples/placeholder/linux/apps/app2/config.matter | 2 -- examples/tv-app/tv-common/tv-app.matter | 1 - .../tv-casting-app/tv-casting-common/tv-casting-app.matter | 1 - .../zcl/data-model/chip/content-launch-cluster.xml | 1 - src/controller/data_model/controller-clusters.matter | 1 - src/controller/python/chip/clusters/Objects.py | 1 - src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h | 1 - .../app-common/app-common/zap-generated/cluster-enums.h | 5 ++--- 10 files changed, 2 insertions(+), 14 deletions(-) diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 69c7e8d7ddb8eb..fe32702e2c847d 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -5124,7 +5124,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 9474cd665e4e85..88a675b3f09333 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -7554,7 +7554,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { @@ -7708,7 +7707,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 49415316b27e65..aff5e22a446b45 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -7511,7 +7511,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { @@ -7665,7 +7664,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index ce8610ec584e58..e4099412be31c5 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -2789,7 +2789,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 2b488ca072e89e..7eee24e57ce285 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -2251,7 +2251,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml index ceb2484b71c278..037998053d512f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml @@ -174,7 +174,6 @@ limitations under the License. - diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 0fa33ae945da3b..5b5890b4ccbb78 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -8307,7 +8307,6 @@ cluster ContentLauncher = 1290 { bitmap SupportedProtocolsBitmap : bitmap32 { kDASH = 0x1; kHLS = 0x2; - kWebRTC = 0x2; } struct DimensionStruct { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 338d93e2568a2c..3f5c116cc5515b 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -42616,7 +42616,6 @@ class Feature(IntFlag): class SupportedProtocolsBitmap(IntFlag): kDash = 0x1 kHls = 0x2 - kWebRTC = 0x2 class Structs: @dataclass diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 63830792a8b83c..9f7d6f8ffd5c64 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -19852,7 +19852,6 @@ typedef NS_OPTIONS(uint32_t, MTRContentLauncherFeature) { typedef NS_OPTIONS(uint32_t, MTRContentLauncherSupportedProtocolsBitmap) { MTRContentLauncherSupportedProtocolsBitmapDASH MTR_AVAILABLE(ios(17.4), macos(14.4), watchos(10.4), tvos(17.4)) = 0x1, MTRContentLauncherSupportedProtocolsBitmapHLS MTR_AVAILABLE(ios(17.4), macos(14.4), watchos(10.4), tvos(17.4)) = 0x2, - MTRContentLauncherSupportedProtocolsBitmapWebRTC MTR_PROVISIONALLY_AVAILABLE = 0x2, } MTR_AVAILABLE(ios(17.4), macos(14.4), watchos(10.4), tvos(17.4)); typedef NS_OPTIONS(uint32_t, MTRContentLauncherSupportedStreamingProtocol) { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 4f7102dbffcae3..1a1afc11a522d1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -4706,9 +4706,8 @@ enum class Feature : uint32_t // Bitmap for SupportedProtocolsBitmap enum class SupportedProtocolsBitmap : uint32_t { - kDash = 0x1, - kHls = 0x2, - kWebRTC = 0x2, + kDash = 0x1, + kHls = 0x2, }; } // namespace ContentLauncher