Skip to content

Commit 421822e

Browse files
sayondeepesp
sayondeep
authored and
esp
committed
Correct namespaces
1 parent c756397 commit 421822e

File tree

6 files changed

+53
-54
lines changed

6 files changed

+53
-54
lines changed

‎src/app/clusters/push-av-stream-transport-server/CodegenIntegration.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static constexpr size_t kPushAvStreamTransportFixedClusterCount =
3535
static constexpr size_t kPushAvStreamTransportMaxClusterCount =
3636
kPushAvStreamTransportFixedClusterCount + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
3737

38-
LazyRegisteredServerCluster<PushAvStreamTransport::PushAvStreamTransportServer> gServers[kPushAvStreamTransportMaxClusterCount];
38+
LazyRegisteredServerCluster<PushAvStreamTransportServer> gServers[kPushAvStreamTransportMaxClusterCount];
3939

4040
// Find the 0-based array index corresponding to the given endpoint id.
4141
// Log an error if not found.

‎src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-cluster.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
namespace chip {
3737
namespace app {
3838
namespace Clusters {
39-
namespace PushAvStreamTransport {
4039
namespace {
4140

4241
using namespace chip::app::Clusters::PushAvStreamTransport::Commands;
@@ -183,7 +182,6 @@ std::optional<DataModel::ActionReturnStatus> PushAvStreamTransportServer::Invoke
183182
return Status::UnsupportedCommand;
184183
}
185184

186-
} // namespace PushAvStreamTransport
187185
} // namespace Clusters
188186
} // namespace app
189187
} // namespace chip

‎src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-cluster.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
namespace chip {
2727
namespace app {
2828
namespace Clusters {
29-
namespace PushAvStreamTransport {
3029

3130
/// Integration of Push AV Stream Transport logic within the matter data model
3231
///
@@ -45,7 +44,7 @@ class PushAvStreamTransportServer : public DefaultServerCluster
4544
*
4645
* @note The caller must ensure the delegate lives throughout the instance's lifetime
4746
*/
48-
PushAvStreamTransportServer(EndpointId aEndpointId, BitFlags<Feature> aFeatures) :
47+
PushAvStreamTransportServer(EndpointId aEndpointId, BitFlags<PushAvStreamTransport::Feature> aFeatures) :
4948
DefaultServerCluster({ aEndpointId, PushAvStreamTransport::Id }), mLogic(aEndpointId, aFeatures)
5049
{}
5150

@@ -77,7 +76,6 @@ class PushAvStreamTransportServer : public DefaultServerCluster
7776
CHIP_ERROR ReadAndEncodeSupportedFormats(const AttributeValueEncoder::ListEncodeHelper & encoder);
7877
};
7978

80-
} // namespace PushAvStreamTransport
8179
} // namespace Clusters
8280
} // namespace app
8381
} // namespace chip

‎src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-delegate.h‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
namespace chip {
2828
namespace app {
2929
namespace Clusters {
30-
namespace PushAvStreamTransport {
3130

3231
/**
3332
* @brief Defines interfaces for implementing application-specific logic for the PushAvStreamTransport Delegate.
@@ -58,8 +57,9 @@ class PushAvStreamTransportDelegate
5857
* Allocates the transport and maps it to the connectionID.
5958
* On Success, TransportConfigurationStruct is sent as response by the server.
6059
*/
61-
virtual Protocols::InteractionModel::Status AllocatePushTransport(const TransportOptionsStruct & transportOptions,
62-
const uint16_t connectionID) = 0;
60+
virtual Protocols::InteractionModel::Status
61+
AllocatePushTransport(const PushAvStreamTransport::Structs::TransportOptionsStruct::Type & transportOptions,
62+
const uint16_t connectionID) = 0;
6363

6464
/**
6565
* @brief Handles stream transport deallocation for the provided connectionID.
@@ -82,8 +82,8 @@ class PushAvStreamTransportDelegate
8282
* the PushAVStreamTransport Server. The allocated buffers are cleared and reassigned to modified
8383
* transportOptions on success of ModifyPushTransport and deallocated on success of DeallocatePushTransport.
8484
*/
85-
virtual Protocols::InteractionModel::Status ModifyPushTransport(const uint16_t connectionID,
86-
const TransportOptionsStorage transportOptions) = 0;
85+
virtual Protocols::InteractionModel::Status
86+
ModifyPushTransport(const uint16_t connectionID, const PushAvStreamTransport::TransportOptionsStorage transportOptions) = 0;
8787

8888
/**
8989
* @brief Handles stream transport status modification.
@@ -106,7 +106,7 @@ class PushAvStreamTransportDelegate
106106
* - Emits GeneratePushTransportBeginEvent
107107
*/
108108
virtual Protocols::InteractionModel::Status SetTransportStatus(const std::vector<uint16_t> connectionIDList,
109-
TransportStatusEnum transportStatus) = 0;
109+
PushAvStreamTransport::TransportStatusEnum transportStatus) = 0;
110110

111111
/**
112112
* @brief Requests manual start of the specified push transport.
@@ -121,9 +121,9 @@ class PushAvStreamTransportDelegate
121121
* The delegate should emit PushTransportEnd Event using GeneratePushTransportEndEvent()
122122
* when timeControl values indicate end of transmission.
123123
*/
124-
virtual Protocols::InteractionModel::Status
125-
ManuallyTriggerTransport(const uint16_t connectionID, TriggerActivationReasonEnum activationReason,
126-
const Optional<Structs::TransportMotionTriggerTimeControlStruct::Type> & timeControl) = 0;
124+
virtual Protocols::InteractionModel::Status ManuallyTriggerTransport(
125+
const uint16_t connectionID, PushAvStreamTransport::TriggerActivationReasonEnum activationReason,
126+
const Optional<PushAvStreamTransport::Structs::TransportMotionTriggerTimeControlStruct::Type> & timeControl) = 0;
127127

128128
/**
129129
* @brief Validates the provided URL.
@@ -146,7 +146,8 @@ class PushAvStreamTransportDelegate
146146
* camera resources (CPU, memory, network bandwidth).
147147
*/
148148
virtual Protocols::InteractionModel::Status
149-
ValidateBandwidthLimit(StreamUsageEnum streamUsage, const Optional<DataModel::Nullable<uint16_t>> & videoStreamId,
149+
ValidateBandwidthLimit(PushAvStreamTransport::StreamUsageEnum streamUsage,
150+
const Optional<DataModel::Nullable<uint16_t>> & videoStreamId,
150151
const Optional<DataModel::Nullable<uint16_t>> & audioStreamId) = 0;
151152

152153
/**
@@ -157,7 +158,8 @@ class PushAvStreamTransportDelegate
157158
* @return Status::Success and selected videoStreamID if successful;
158159
* Status::InvalidStream if no allocated VideoStream exists
159160
*/
160-
virtual Protocols::InteractionModel::Status SelectVideoStream(StreamUsageEnum streamUsage, uint16_t & videoStreamId) = 0;
161+
virtual Protocols::InteractionModel::Status SelectVideoStream(PushAvStreamTransport::StreamUsageEnum streamUsage,
162+
uint16_t & videoStreamId) = 0;
161163

162164
/**
163165
* @brief Assigns existing Audio Stream based on camera's resource management and stream priority policies.
@@ -167,7 +169,8 @@ class PushAvStreamTransportDelegate
167169
* @return Status::Success and selected audioStreamID if successful;
168170
* Status::InvalidStream if no allocated AudioStream exists
169171
*/
170-
virtual Protocols::InteractionModel::Status SelectAudioStream(StreamUsageEnum streamUsage, uint16_t & audioStreamId) = 0;
172+
virtual Protocols::InteractionModel::Status SelectAudioStream(PushAvStreamTransport::StreamUsageEnum streamUsage,
173+
uint16_t & audioStreamId) = 0;
171174

172175
/**
173176
* @brief Validates that the video stream corresponding to videoStreamID is allocated.
@@ -193,7 +196,7 @@ class PushAvStreamTransportDelegate
193196
* @param connectionID The connectionID of the stream transport to check status
194197
* @return busy if transport is uploading, idle otherwise
195198
*/
196-
virtual PushAvStreamTransportStatusEnum GetTransportBusyStatus(const uint16_t connectionID) = 0;
199+
virtual PushAvStreamTransport::PushAvStreamTransportStatusEnum GetTransportBusyStatus(const uint16_t connectionID) = 0;
197200

198201
/**
199202
* @brief Delegate callback for notifying change in an attribute.
@@ -216,7 +219,8 @@ class PushAvStreamTransportDelegate
216219
* @note Required buffers are managed by TransportConfigurationStorage;
217220
* the delegate function must populate the vector correctly.
218221
*/
219-
virtual CHIP_ERROR LoadCurrentConnections(std::vector<TransportConfigurationStorage> & currentConnections) = 0;
222+
virtual CHIP_ERROR
223+
LoadCurrentConnections(std::vector<PushAvStreamTransport::TransportConfigurationStorage> & currentConnections) = 0;
220224

221225
/**
222226
* @brief Callback after persistent attributes managed by the Cluster are loaded from Storage.
@@ -228,7 +232,6 @@ class PushAvStreamTransportDelegate
228232
protected:
229233
EndpointId mEndpointId = kInvalidEndpointId;
230234
};
231-
} // namespace PushAvStreamTransport
232235
} // namespace Clusters
233236
} // namespace app
234237
} // namespace chip

‎src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-logic.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ using chip::Protocols::InteractionModel::Status;
4444
namespace chip {
4545
namespace app {
4646
namespace Clusters {
47-
namespace PushAvStreamTransport {
4847

4948
PushAvStreamTransportServerLogic::PushAvStreamTransportServerLogic(EndpointId aEndpoint, BitFlags<Feature> aFeatures) :
5049
mEndpointId(aEndpoint), mFeatures(aFeatures),
51-
mSupportedFormats{ SupportedFormatStruct{ ContainerFormatEnum::kCmaf, IngestMethodsEnum::kCMAFIngest } }
50+
mSupportedFormats{ PushAvStreamTransport::SupportedFormatStruct{ PushAvStreamTransport::ContainerFormatEnum::kCmaf,
51+
PushAvStreamTransport::IngestMethodsEnum::kCMAFIngest } }
5252
{}
5353

5454
PushAvStreamTransportServerLogic::~PushAvStreamTransportServerLogic()
@@ -423,7 +423,7 @@ Status PushAvStreamTransportServerLogic::ValidateIncomingTransportOptions(
423423
ingestMethod != IngestMethodsEnum::kUnknownEnumValue, Status::ConstraintError,
424424
ChipLogError(Zcl, "Transport Options verification from command data[ep=%d]: Invalid Ingest Method ", mEndpointId));
425425

426-
const ContainerOptionsStruct & containerOptions = transportOptions.containerOptions;
426+
const Structs::ContainerOptionsStruct::Type & containerOptions = transportOptions.containerOptions;
427427

428428
VerifyOrReturnValue(
429429
containerOptions.containerType != ContainerFormatEnum::kUnknownEnumValue, Status::ConstraintError,
@@ -520,7 +520,7 @@ PushAvStreamTransportServerLogic::HandleAllocatePushTransport(CommandHandler & h
520520

521521
IngestMethodsEnum ingestMethod = commandData.transportOptions.ingestMethod;
522522

523-
ContainerOptionsStruct containerOptions = commandData.transportOptions.containerOptions;
523+
Structs::ContainerOptionsStruct::Type containerOptions = commandData.transportOptions.containerOptions;
524524

525525
bool isFormatSupported = false;
526526

@@ -953,7 +953,7 @@ PushAvStreamTransportServerLogic::HandleFindTransport(CommandHandler & handler,
953953

954954
Optional<DataModel::Nullable<uint16_t>> connectionID = commandData.connectionID;
955955

956-
std::vector<TransportConfigurationStruct> transportConfigurations;
956+
std::vector<Structs::TransportConfigurationStruct::Type> transportConfigurations;
957957

958958
if (!connectionID.HasValue() || connectionID.Value().IsNull())
959959
{
@@ -992,8 +992,8 @@ PushAvStreamTransportServerLogic::HandleFindTransport(CommandHandler & handler,
992992
handler.AddStatus(commandPath, Status::NotFound);
993993
}
994994

995-
response.transportConfigurations =
996-
DataModel::List<const TransportConfigurationStruct>(transportConfigurations.data(), transportConfigurations.size());
995+
response.transportConfigurations = DataModel::List<const Structs::TransportConfigurationStruct::Type>(
996+
transportConfigurations.data(), transportConfigurations.size());
997997

998998
handler.AddResponse(commandPath, response);
999999

@@ -1043,7 +1043,6 @@ Status PushAvStreamTransportServerLogic::GeneratePushTransportEndEvent(const uin
10431043
return Status::Success;
10441044
}
10451045

1046-
} // namespace PushAvStreamTransport
10471046
} // namespace Clusters
10481047
} // namespace app
10491048
} // namespace chip

‎src/app/clusters/push-av-stream-transport-server/push-av-stream-transport-logic.h‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
namespace chip {
1414
namespace app {
1515
namespace Clusters {
16-
namespace PushAvStreamTransport {
1716

1817
class PushAvStreamTransportServerLogic
1918
{
2019
public:
21-
PushAvStreamTransportServerLogic(EndpointId aEndpoint, BitFlags<Feature> aFeatures);
20+
PushAvStreamTransportServerLogic(EndpointId aEndpoint, BitFlags<PushAvStreamTransport::Feature> aFeatures);
2221
~PushAvStreamTransportServerLogic();
2322

2423
void SetDelegate(EndpointId aEndpoint, PushAvStreamTransportDelegate * delegate)
@@ -48,52 +47,52 @@ class PushAvStreamTransportServerLogic
4847

4948
std::vector<std::shared_ptr<PushAVStreamTransportDeallocateCallbackContext>> mTimerContexts;
5049

51-
BitFlags<Feature> mFeatures;
50+
BitFlags<PushAvStreamTransport::Feature> mFeatures;
5251

53-
std::vector<SupportedFormatStruct> mSupportedFormats;
52+
std::vector<PushAvStreamTransport::SupportedFormatStruct> mSupportedFormats;
5453

55-
std::vector<TransportConfigurationStorage> mCurrentConnections;
54+
std::vector<PushAvStreamTransport::TransportConfigurationStorage> mCurrentConnections;
5655

5756
CHIP_ERROR Init();
5857

5958
void Shutdown();
6059

61-
bool HasFeature(Feature feature) const;
60+
bool HasFeature(PushAvStreamTransport::Feature feature) const;
6261

63-
Protocols::InteractionModel::Status
64-
ValidateIncomingTransportOptions(const Structs::TransportOptionsStruct::DecodableType & transportOptions);
62+
Protocols::InteractionModel::Status ValidateIncomingTransportOptions(
63+
const PushAvStreamTransport::Structs::TransportOptionsStruct::DecodableType & transportOptions);
6564

6665
std::optional<DataModel::ActionReturnStatus>
6766
HandleAllocatePushTransport(CommandHandler & handler, const ConcreteCommandPath & commandPath,
68-
const Commands::AllocatePushTransport::DecodableType & commandData);
67+
const PushAvStreamTransport::Commands::AllocatePushTransport::DecodableType & commandData);
6968

7069
std::optional<DataModel::ActionReturnStatus>
7170
HandleDeallocatePushTransport(CommandHandler & handler, const ConcreteCommandPath & commandPath,
72-
const Commands::DeallocatePushTransport::DecodableType & commandData);
71+
const PushAvStreamTransport::Commands::DeallocatePushTransport::DecodableType & commandData);
7372

7473
std::optional<DataModel::ActionReturnStatus>
7574
HandleModifyPushTransport(CommandHandler & handler, const ConcreteCommandPath & commandPath,
76-
const Commands::ModifyPushTransport::DecodableType & commandData);
75+
const PushAvStreamTransport::Commands::ModifyPushTransport::DecodableType & commandData);
7776

7877
std::optional<DataModel::ActionReturnStatus>
7978
HandleSetTransportStatus(CommandHandler & handler, const ConcreteCommandPath & commandPath,
80-
const Commands::SetTransportStatus::DecodableType & commandData);
79+
const PushAvStreamTransport::Commands::SetTransportStatus::DecodableType & commandData);
8180

8281
std::optional<DataModel::ActionReturnStatus>
8382
HandleManuallyTriggerTransport(CommandHandler & handler, const ConcreteCommandPath & commandPath,
84-
const Commands::ManuallyTriggerTransport::DecodableType & commandData);
83+
const PushAvStreamTransport::Commands::ManuallyTriggerTransport::DecodableType & commandData);
8584

86-
std::optional<DataModel::ActionReturnStatus> HandleFindTransport(CommandHandler & handler,
87-
const ConcreteCommandPath & commandPath,
88-
const Commands::FindTransport::DecodableType & commandData);
85+
std::optional<DataModel::ActionReturnStatus>
86+
HandleFindTransport(CommandHandler & handler, const ConcreteCommandPath & commandPath,
87+
const PushAvStreamTransport::Commands::FindTransport::DecodableType & commandData);
8988

9089
// Send Push AV Stream Transport events
9190
Protocols::InteractionModel::Status
92-
GeneratePushTransportBeginEvent(const uint16_t connectionID, const TransportTriggerTypeEnum triggerType,
93-
const Optional<TriggerActivationReasonEnum> activationReason);
94-
Protocols::InteractionModel::Status GeneratePushTransportEndEvent(const uint16_t connectionID,
95-
const TransportTriggerTypeEnum triggerType,
96-
const Optional<TriggerActivationReasonEnum> activationReason);
91+
GeneratePushTransportBeginEvent(const uint16_t connectionID, const PushAvStreamTransport::TransportTriggerTypeEnum triggerType,
92+
const Optional<PushAvStreamTransport::TriggerActivationReasonEnum> activationReason);
93+
Protocols::InteractionModel::Status
94+
GeneratePushTransportEndEvent(const uint16_t connectionID, const PushAvStreamTransport::TransportTriggerTypeEnum triggerType,
95+
const Optional<PushAvStreamTransport::TriggerActivationReasonEnum> activationReason);
9796

9897
private:
9998
PushAvStreamTransportDelegate * mDelegate = nullptr;
@@ -110,12 +109,14 @@ class PushAvStreamTransportServerLogic
110109
// Helper functions
111110
uint16_t GenerateConnectionID();
112111

113-
TransportConfigurationStorage * FindStreamTransportConnection(const uint16_t connectionID);
112+
PushAvStreamTransport::TransportConfigurationStorage * FindStreamTransportConnection(const uint16_t connectionID);
114113

115-
TransportConfigurationStorage * FindStreamTransportConnectionWithinFabric(const uint16_t connectionID, FabricIndex fabricIndex);
114+
PushAvStreamTransport::TransportConfigurationStorage * FindStreamTransportConnectionWithinFabric(const uint16_t connectionID,
115+
FabricIndex fabricIndex);
116116

117117
// Add/Remove Management functions for transport
118-
UpsertResultEnum UpsertStreamTransportConnection(const TransportConfigurationStorage & transportConfiguration);
118+
UpsertResultEnum
119+
UpsertStreamTransportConnection(const PushAvStreamTransport::TransportConfigurationStorage & transportConfiguration);
119120

120121
void RemoveStreamTransportConnection(const uint16_t connectionID);
121122

@@ -133,7 +134,7 @@ class PushAvStreamTransportServerLogic
133134
*/
134135
CHIP_ERROR ScheduleTransportDeallocate(uint16_t connectionID, uint32_t timeoutSec);
135136
};
136-
} // namespace PushAvStreamTransport
137+
137138
} // namespace Clusters
138139
} // namespace app
139140
} // namespace chip

0 commit comments

Comments
 (0)