From 1c382d7a0fea83e093f4b2f808a4a9748845653d Mon Sep 17 00:00:00 2001 From: mahesh Date: Mon, 8 Dec 2025 15:59:17 +0530 Subject: [PATCH] components/esp_matter: add push_av_stream_transport cluster in esp_matter --- .../data_model/esp_matter_attribute.cpp | 18 +++++++ .../data_model/esp_matter_attribute.h | 8 +++ .../data_model/esp_matter_cluster.cpp | 50 +++++++++++++++++ .../data_model/esp_matter_cluster.h | 9 ++++ .../data_model/esp_matter_command.cpp | 53 +++++++++++++++++++ .../data_model/esp_matter_command.h | 13 +++++ .../esp_matter_delegate_callbacks.cpp | 13 +++++ .../esp_matter_delegate_callbacks.h | 1 + .../data_model/esp_matter_event.cpp | 15 ++++++ .../esp_matter/data_model/esp_matter_event.h | 7 +++ .../data_model/esp_matter_feature.cpp | 37 +++++++++++++ .../data_model/esp_matter_feature.h | 19 +++++++ .../private/esp_matter_cluster_revisions.h | 4 ++ 13 files changed, 247 insertions(+) diff --git a/components/esp_matter/data_model/esp_matter_attribute.cpp b/components/esp_matter/data_model/esp_matter_attribute.cpp index c0eb9d65e..d97e21f2d 100644 --- a/components/esp_matter/data_model/esp_matter_attribute.cpp +++ b/components/esp_matter/data_model/esp_matter_attribute.cpp @@ -5131,5 +5131,23 @@ attribute_t *create_movement_state(cluster_t *cluster, uint8_t value) } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +namespace attribute { +attribute_t *create_supported_formats(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) +{ + return esp_matter::attribute::create(cluster, PushAvStreamTransport::Attributes::SupportedFormats::Id, + ATTRIBUTE_FLAG_MANAGED_INTERNALLY, esp_matter_array(value, length, count)); +} + +attribute_t *create_current_connections(cluster_t *cluster, uint8_t *value, uint16_t length, uint16_t count) +{ + return esp_matter::attribute::create(cluster, PushAvStreamTransport::Attributes::CurrentConnections::Id, + ATTRIBUTE_FLAG_MANAGED_INTERNALLY | ATTRIBUTE_FLAG_NONVOLATILE, esp_matter_array(value, length, count)); +} + +} /* attribute */ + +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/esp_matter_attribute.h b/components/esp_matter/data_model/esp_matter_attribute.h index e1684d291..3145b23b7 100644 --- a/components/esp_matter/data_model/esp_matter_attribute.h +++ b/components/esp_matter/data_model/esp_matter_attribute.h @@ -1325,5 +1325,13 @@ attribute_t *create_movement_state(cluster_t *cluster, uint8_t value); } /* attribute */ } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +namespace attribute { + +attribute_t *create_supported_formats(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count); +attribute_t *create_current_connections(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count); +} /* attribute */ +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/esp_matter_cluster.cpp b/components/esp_matter/data_model/esp_matter_cluster.cpp index e236ba6a3..88a2a9b9c 100644 --- a/components/esp_matter/data_model/esp_matter_cluster.cpp +++ b/components/esp_matter/data_model/esp_matter_cluster.cpp @@ -4291,5 +4291,55 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +const function_generic_t *function_list = NULL; + +const int function_flags = CLUSTER_FLAG_NONE; + +cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags) +{ + cluster_t *cluster = esp_matter::cluster::create(endpoint, PushAvStreamTransport::Id, flags); + VerifyOrReturnValue(cluster, NULL, ESP_LOGE(TAG, "Could not create cluster. cluster_id: 0x%08" PRIX32, PushAvStreamTransport::Id)); + if (flags & CLUSTER_FLAG_SERVER) { + if (config && config->delegate != nullptr) { + static const auto delegate_init_cb = PushAvStreamTransportDelegateInitCB; + set_delegate_and_init_callback(cluster, delegate_init_cb, config->delegate); + } + static const auto plugin_server_init_cb = CALL_ONCE(MatterPushAvStreamTransportPluginServerInitCallback); + set_plugin_server_init_callback(cluster, plugin_server_init_cb); + add_function_list(cluster, function_list, function_flags); + + /* Attributes managed internally */ + global::attribute::create_feature_map(cluster, 0); + attribute::create_supported_formats(cluster, NULL, 0, 0); + attribute::create_current_connections(cluster, NULL, 0, 0); + + /* Attributes not managed internally */ + global::attribute::create_cluster_revision(cluster, cluster_revision); + + command::create_allocate_push_transport(cluster); + command::create_allocate_push_transport_response(cluster); + command::create_deallocate_push_transport(cluster); + command::create_modify_push_transport(cluster); + command::create_set_transport_status(cluster); + command::create_manually_trigger_transport(cluster); + command::create_find_transport(cluster); + command::create_find_transport_response(cluster); + + /* Events */ + event::create_push_transport_begin(cluster); + event::create_push_transport_end(cluster); + cluster::set_init_and_shutdown_callbacks(cluster, ESPMatterPushAvStreamTransportClusterServerInitCallback, + ESPMatterPushAvStreamTransportClusterServerShutdownCallback); + } + + if (flags & CLUSTER_FLAG_CLIENT) { + create_default_binding_cluster(endpoint); + } + return cluster; +} + +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/esp_matter_cluster.h b/components/esp_matter/data_model/esp_matter_cluster.h index 908f15c49..601599758 100644 --- a/components/esp_matter/data_model/esp_matter_cluster.h +++ b/components/esp_matter/data_model/esp_matter_cluster.h @@ -1029,5 +1029,14 @@ typedef struct config { cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +typedef struct config { + void *delegate; + config() : delegate(nullptr) {} +} config_t; + +cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags); +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/esp_matter_command.cpp b/components/esp_matter/data_model/esp_matter_command.cpp index c977289c5..422948ffe 100644 --- a/components/esp_matter/data_model/esp_matter_command.cpp +++ b/components/esp_matter/data_model/esp_matter_command.cpp @@ -3100,5 +3100,58 @@ command_t *create_dptz_relative_move(cluster_t *cluster) } /* command */ } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +namespace command { +command_t *create_allocate_push_transport(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::AllocatePushTransport::Id, + COMMAND_FLAG_ACCEPTED, NULL); +} + +command_t *create_allocate_push_transport_response(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::AllocatePushTransportResponse::Id, + COMMAND_FLAG_GENERATED, NULL); +} + +command_t *create_deallocate_push_transport(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::DeallocatePushTransport::Id, + COMMAND_FLAG_ACCEPTED, NULL); +} + +command_t *create_modify_push_transport(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::ModifyPushTransport::Id, + COMMAND_FLAG_ACCEPTED, NULL); +} + +command_t *create_set_transport_status(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::SetTransportStatus::Id, + COMMAND_FLAG_ACCEPTED, NULL); +} + +command_t *create_manually_trigger_transport(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::ManuallyTriggerTransport::Id, + COMMAND_FLAG_ACCEPTED, NULL); +} + +command_t *create_find_transport(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::FindTransport::Id, + COMMAND_FLAG_ACCEPTED, NULL); +} + +command_t *create_find_transport_response(cluster_t *cluster) +{ + return esp_matter::command::create(cluster, PushAvStreamTransport::Commands::FindTransportResponse::Id, + COMMAND_FLAG_GENERATED, NULL); +} + +} /* command */ +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/esp_matter_command.h b/components/esp_matter/data_model/esp_matter_command.h index 226c14cb2..5b8cf496a 100644 --- a/components/esp_matter/data_model/esp_matter_command.h +++ b/components/esp_matter/data_model/esp_matter_command.h @@ -579,5 +579,18 @@ command_t *create_dptz_relative_move(cluster_t *cluster); } /* command */ } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +namespace command { +command_t *create_allocate_push_transport(cluster_t *cluster); +command_t *create_allocate_push_transport_response(cluster_t *cluster); +command_t *create_deallocate_push_transport(cluster_t *cluster); +command_t *create_modify_push_transport(cluster_t *cluster); +command_t *create_set_transport_status(cluster_t *cluster); +command_t *create_manually_trigger_transport(cluster_t *cluster); +command_t *create_find_transport(cluster_t *cluster); +command_t *create_find_transport_response(cluster_t *cluster); +} /* command */ +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/esp_matter_delegate_callbacks.cpp b/components/esp_matter/data_model/esp_matter_delegate_callbacks.cpp index f01f5cbe0..b6e39e108 100644 --- a/components/esp_matter/data_model/esp_matter_delegate_callbacks.cpp +++ b/components/esp_matter/data_model/esp_matter_delegate_callbacks.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include using namespace chip::app::Clusters; @@ -571,6 +572,18 @@ void ClosureDimensionDelegateInitCB(void *delegate, uint16_t endpoint_id) server_interface->Init(); } + +void PushAvStreamTransportDelegateInitCB(void *delegate, uint16_t endpoint_id) +{ + VerifyOrReturn(delegate != nullptr); + static PushAvStreamTransportServer * pushavstreamtransportserverinstance = nullptr; + PushAvStreamTransportDelegate *push_av_stream_transport_delegate = static_cast(delegate); + uint32_t feature_map = get_feature_map_value(endpoint_id, PushAvStreamTransport::Id); + pushavstreamtransportserverinstance = new PushAvStreamTransportServer(endpoint_id, chip::BitMask(feature_map)); + pushavstreamtransportserverinstance->SetDelegate(push_av_stream_transport_delegate); + pushavstreamtransportserverinstance->Init(); +} + } // namespace delegate_cb } // namespace cluster } // namespace esp_matter diff --git a/components/esp_matter/data_model/esp_matter_delegate_callbacks.h b/components/esp_matter/data_model/esp_matter_delegate_callbacks.h index 3b303cfb2..b175ed800 100644 --- a/components/esp_matter/data_model/esp_matter_delegate_callbacks.h +++ b/components/esp_matter/data_model/esp_matter_delegate_callbacks.h @@ -58,6 +58,7 @@ void DiagnosticLogsDelegateInitCB(void *delegate, uint16_t endpoint_id); void ChimeDelegateInitCB(void *delegate, uint16_t endpoint_id); void ClosureControlDelegateInitCB(void *delegate, uint16_t endpoint_id); void ClosureDimensionDelegateInitCB(void *delegate, uint16_t endpoint_id); +void PushAvStreamTransportDelegateInitCB(void *delegate, uint16_t endpoint_id); } // namespace delegate_cb } // namespace cluster diff --git a/components/esp_matter/data_model/esp_matter_event.cpp b/components/esp_matter/data_model/esp_matter_event.cpp index 91805bd77..14d11077e 100644 --- a/components/esp_matter/data_model/esp_matter_event.cpp +++ b/components/esp_matter/data_model/esp_matter_event.cpp @@ -867,5 +867,20 @@ event_t *create_secure_state_changed(cluster_t *cluster) } // namespace event } // namespace closure_control +namespace push_av_stream_transport { +namespace event { +event_t *create_push_transport_begin(cluster_t *cluster) +{ + return esp_matter::event::create(cluster, PushAvStreamTransport::Events::PushTransportBegin::Id); +} + +event_t *create_push_transport_end(cluster_t *cluster) +{ + return esp_matter::event::create(cluster, PushAvStreamTransport::Events::PushTransportEnd::Id); +} + +} // namespace event +} // namespace push_av_stream_transport + } // namespace cluster } // namespace esp_matter diff --git a/components/esp_matter/data_model/esp_matter_event.h b/components/esp_matter/data_model/esp_matter_event.h index 17a742a1d..26da3f6ff 100644 --- a/components/esp_matter/data_model/esp_matter_event.h +++ b/components/esp_matter/data_model/esp_matter_event.h @@ -272,5 +272,12 @@ event_t *create_secure_state_changed(cluster_t *cluster); } // namespace event } // namespace closure_control +namespace push_av_stream_transport { +namespace event { +event_t *create_push_transport_begin(cluster_t *cluster); +event_t *create_push_transport_end(cluster_t *cluster); +} // namespace event +} // namespace push_av_stream_transport + } // namespace cluster } // namespace esp_matter diff --git a/components/esp_matter/data_model/esp_matter_feature.cpp b/components/esp_matter/data_model/esp_matter_feature.cpp index 8de514c5c..52da8f685 100644 --- a/components/esp_matter/data_model/esp_matter_feature.cpp +++ b/components/esp_matter/data_model/esp_matter_feature.cpp @@ -4637,5 +4637,42 @@ esp_err_t add(cluster_t *cluster) } /* feature */ } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +namespace feature { +namespace per_zone_sensitivity { + +uint32_t get_id() +{ + return static_cast(PushAvStreamTransport::Feature::kPerZoneSensitivity); +} + +esp_err_t add(cluster_t *cluster) +{ + VerifyOrReturnError(cluster, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "Cluster cannot be NULL")); + update_feature_map(cluster, get_id()); + return ESP_OK; +} + +} /* per_zone_sensitivity */ + +namespace metadata { + +uint32_t get_id() +{ + return static_cast(PushAvStreamTransport::Feature::kMetadata); +} + +esp_err_t add(cluster_t *cluster) +{ + VerifyOrReturnError(cluster, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "Cluster cannot be NULL")); + update_feature_map(cluster, get_id()); + return ESP_OK; +} + +} + +} /* feature */ +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/esp_matter_feature.h b/components/esp_matter/data_model/esp_matter_feature.h index 4f71991f6..590a6bccc 100644 --- a/components/esp_matter/data_model/esp_matter_feature.h +++ b/components/esp_matter/data_model/esp_matter_feature.h @@ -2042,5 +2042,24 @@ esp_err_t add(cluster_t *cluster); } /* feature */ } /* camera_av_settings_user_level_management */ +namespace push_av_stream_transport { +namespace feature { + +namespace per_zone_sensitivity { + +uint32_t get_id(); +esp_err_t add(cluster_t *cluster); +} /* per_zone_sensitivity */ + +/* Provisional */ +namespace metadata { + +uint32_t get_id(); +esp_err_t add(cluster_t *cluster); +} /* metadata */ + +} /* feature */ +} /* push_av_stream_transport */ + } /* cluster */ } /* esp_matter */ diff --git a/components/esp_matter/data_model/private/esp_matter_cluster_revisions.h b/components/esp_matter/data_model/private/esp_matter_cluster_revisions.h index b13c85b02..ede631f17 100644 --- a/components/esp_matter/data_model/private/esp_matter_cluster_revisions.h +++ b/components/esp_matter/data_model/private/esp_matter_cluster_revisions.h @@ -395,6 +395,10 @@ namespace camera_av_settings_user_level_management { constexpr uint16_t cluster_revision = 1; } // namespace camera_av_settings_user_level_management +namespace push_av_stream_transport { +constexpr uint16_t cluster_revision = 1; +} // namespace push_av_stream_transport + } // namespace cluster } // namespace esp_matter