Skip to content

Commit 69d8bde

Browse files
sayondeepesp
sayondeep
authored and
esp
committed
Restyled by clang-format
1 parent 592e3f7 commit 69d8bde

File tree

4 files changed

+60
-38
lines changed

4 files changed

+60
-38
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class PushAvStreamTransportManager : public PushAvStreamTransportDelegate
6262
PushAvStreamTransportStatusEnum GetTransportStatus(const uint16_t connectionID);
6363

6464
void OnAttributeChanged(AttributeId attributeId);
65-
CHIP_ERROR LoadCurrentConnections(std::vector<TransportConfigurationStructWithFabricIndex> & currentConnections);
65+
CHIP_ERROR LoadCurrentConnections(std::vector<TransportConfigurationStorageWithFabricIndex> & currentConnections);
6666
CHIP_ERROR PersistentAttributesLoadedCallback();
6767

6868
void Init();

‎examples/all-clusters-app/all-clusters-common/src/push-av-stream-transport-delegate-impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void PushAvStreamTransportManager::Init()
150150
ChipLogProgress(Zcl, "Push AV Stream Transport Initialized");
151151
}
152152
CHIP_ERROR
153-
PushAvStreamTransportManager::LoadCurrentConnections(std::vector<TransportConfigurationStructWithFabricIndex> & currentConnections)
153+
PushAvStreamTransportManager::LoadCurrentConnections(std::vector<TransportConfigurationStorageWithFabricIndex> & currentConnections)
154154
{
155155
ChipLogProgress(Zcl, "Push AV Current Connections loaded");
156156

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ CHIP_ERROR PushAvStreamTransportServer::ReadAndEncodeCurrentConnections(const At
9797
}
9898

9999
PushAvStreamTransportServer::UpsertResultEnum PushAvStreamTransportServer::UpsertStreamTransportConnection(
100-
const TransportConfigurationStructWithFabricIndex & transportConfiguration)
100+
const TransportConfigurationStorageWithFabricIndex & transportConfiguration)
101101
{
102102
UpsertResultEnum result;
103103
auto it = std::find_if(mCurrentConnections.begin(), mCurrentConnections.end(),
@@ -128,7 +128,7 @@ void PushAvStreamTransportServer::RemoveStreamTransportConnection(const uint16_t
128128

129129
// Erase-Remove idiom
130130
mCurrentConnections.erase(std::remove_if(mCurrentConnections.begin(), mCurrentConnections.end(),
131-
[transportConnectionId](const TransportConfigurationStructWithFabricIndex & s) {
131+
[transportConnectionId](const TransportConfigurationStorageWithFabricIndex & s) {
132132
return s.transportConfiguration.connectionID == transportConnectionId;
133133
}),
134134
mCurrentConnections.end());
@@ -246,7 +246,7 @@ void PushAvStreamTransportServer::InvokeCommand(HandlerContext & handlerContext)
246246
}
247247
}
248248

249-
TransportConfigurationStructWithFabricIndex *
249+
TransportConfigurationStorageWithFabricIndex *
250250
PushAvStreamTransportServer::FindStreamTransportConnection(const uint16_t connectionID)
251251
{
252252
for (auto & transportConnection : mCurrentConnections)
@@ -351,19 +351,19 @@ void PushAvStreamTransportServer::HandleAllocatePushTransport(HandlerContext & c
351351
return;
352352
}
353353

354-
TransportConfigurationStruct outTransportConfiguration;
355-
outTransportConfiguration.connectionID = connectionID;
356-
outTransportConfiguration.transportStatus = TransportStatusEnum::kInactive;
354+
std::shared_ptr<TransportOptionsStorage> transportOptionsPtr = std::make_shared<TransportOptionsStorage>(transportOptions);
357355

358-
TransportOptionsStorage transportOptionArgs(transportOptions);
359-
Status status = mDelegate.AllocatePushTransport(transportOptionArgs, connectionID);
356+
TransportConfigurationStorage outTransportConfiguration(connectionID, transportOptionsPtr);
357+
358+
Status status = mDelegate.AllocatePushTransport(*transportOptionsPtr, connectionID);
360359

361360
if (status == Status::Success)
362361
{
363362
// add connection to CurrentConnections
364363
FabricIndex peerFabricIndex = ctx.mCommandHandler.GetAccessingFabricIndex();
365-
outTransportConfiguration.transportOptions.SetValue(transportOptionArgs);
366-
TransportConfigurationStructWithFabricIndex transportConfiguration({ outTransportConfiguration, peerFabricIndex });
364+
365+
TransportConfigurationStorageWithFabricIndex transportConfiguration({ outTransportConfiguration, peerFabricIndex });
366+
367367
UpsertStreamTransportConnection(transportConfiguration);
368368
response.transportConfiguration = outTransportConfiguration;
369369

@@ -378,9 +378,9 @@ void PushAvStreamTransportServer::HandleAllocatePushTransport(HandlerContext & c
378378
void PushAvStreamTransportServer::HandleDeallocatePushTransport(
379379
HandlerContext & ctx, const Commands::DeallocatePushTransport::DecodableType & commandData)
380380
{
381-
Status status = Status::Success;
382-
uint16_t connectionID = commandData.connectionID;
383-
TransportConfigurationStructWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID);
381+
Status status = Status::Success;
382+
uint16_t connectionID = commandData.connectionID;
383+
TransportConfigurationStorageWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID);
384384
if (transportConfiguration == nullptr)
385385
{
386386
ChipLogError(Zcl, "HandleDeallocatePushTransport: ConnectionID Not Found.");
@@ -412,7 +412,7 @@ void PushAvStreamTransportServer::HandleModifyPushTransport(HandlerContext & ctx
412412
uint16_t connectionID = commandData.connectionID;
413413
auto & transportOptions = commandData.transportOptions;
414414

415-
TransportConfigurationStructWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID);
415+
TransportConfigurationStorageWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID);
416416

417417
if (transportConfiguration == nullptr)
418418
{
@@ -486,7 +486,7 @@ void PushAvStreamTransportServer::HandleSetTransportStatus(HandlerContext & ctx,
486486
}
487487
else
488488
{
489-
TransportConfigurationStructWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID.Value());
489+
TransportConfigurationStorageWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID.Value());
490490
if (transportConfiguration == nullptr)
491491
{
492492
ChipLogError(Zcl, "HandleSetTransportStatus: ConnectionID Not Found.");
@@ -516,7 +516,7 @@ void PushAvStreamTransportServer::HandleManuallyTriggerTransport(
516516
auto & activationReason = commandData.activationReason;
517517
auto & timeControl = commandData.timeControl;
518518

519-
TransportConfigurationStructWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID);
519+
TransportConfigurationStorageWithFabricIndex * transportConfiguration = FindStreamTransportConnection(connectionID);
520520

521521
if (transportConfiguration == nullptr)
522522
{
@@ -590,8 +590,6 @@ void PushAvStreamTransportServer::HandleFindTransport(HandlerContext & ctx,
590590
return;
591591
}
592592

593-
DataModel::List<const TransportConfigurationStruct> outTransportConfigurations;
594-
595593
if ((connectionID.HasValue() == false) || connectionID.Value().IsNull())
596594
{
597595
if (mCurrentConnections.size() == 0)
@@ -611,7 +609,7 @@ void PushAvStreamTransportServer::HandleFindTransport(HandlerContext & ctx,
611609
}
612610
else
613611
{
614-
TransportConfigurationStructWithFabricIndex * transportConfiguration =
612+
TransportConfigurationStorageWithFabricIndex * transportConfiguration =
615613
FindStreamTransportConnection(connectionID.Value().Value());
616614
if (transportConfiguration == nullptr)
617615
{

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

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ using TransportMotionTriggerTimeControlStruct = Structs::TransportMotionTriggerT
4040
using TransportOptionsStruct = Structs::TransportOptionsStruct::Type;
4141
using TransportConfigurationStruct = Structs::TransportConfigurationStruct::Type;
4242

43-
struct TransportConfigurationStructWithFabricIndex
44-
{
45-
TransportConfigurationStruct transportConfiguration;
46-
chip::FabricIndex fabricIndex;
47-
};
48-
4943
enum class PushAvStreamTransportStatusEnum : uint8_t
5044
{
5145
kBusy = 0x00,
@@ -102,9 +96,12 @@ struct ContainerOptionsStorage : public ContainerOptionsStruct
10296
{
10397
containerType = containerOptions.containerType;
10498

105-
CMAFContainerOptionsStorage cmafContainerStorage(containerOptions.CMAFContainerOptions);
106-
CMAFContainerOptions.SetValue(cmafContainerStorage);
99+
mCMAFContainerStorage = CMAFContainerOptionsStorage(containerOptions.CMAFContainerOptions);
100+
CMAFContainerOptions.SetValue(mCMAFContainerStorage);
107101
}
102+
103+
private:
104+
CMAFContainerOptionsStorage mCMAFContainerStorage;
108105
};
109106

110107
struct TransportOptionsStorage : public TransportOptionsStruct
@@ -119,22 +116,49 @@ struct TransportOptionsStorage : public TransportOptionsStruct
119116
endpointID = transportOptions.endpointID;
120117

121118
MutableCharSpan urlBuffer(mUrlBuffer);
122-
CopyCharSpanToMutableCharSpan(transportOptions.url, urlBuffer);
119+
CopyCharSpanToMutableCharSpanWithTruncation(transportOptions.url, urlBuffer);
123120
url = urlBuffer;
124121

125-
TransportTriggerOptionsStorage triggerOptionsStorage(transportOptions.triggerOptions);
126-
triggerOptions = triggerOptionsStorage;
122+
mTriggerOptionsStorage = TransportTriggerOptionsStorage(transportOptions.triggerOptions);
123+
triggerOptions = mTriggerOptionsStorage;
127124

128125
ingestMethod = transportOptions.ingestMethod;
129126

130-
ContainerOptionsStorage containerOptionsStorage(transportOptions.containerOptions);
131-
containerOptions = containerOptionsStorage;
127+
mContainerOptionsStorage = ContainerOptionsStorage(transportOptions.containerOptions);
128+
containerOptions = mContainerOptionsStorage;
132129

133130
expiryTime = transportOptions.expiryTime;
134131
}
135132

136133
private:
137134
char mUrlBuffer[kMaxUrlLength];
135+
TransportTriggerOptionsStorage mTriggerOptionsStorage;
136+
ContainerOptionsStorage mContainerOptionsStorage;
137+
};
138+
139+
struct TransportConfigurationStorage : public TransportConfigurationStruct
140+
{
141+
TransportConfigurationStorage() {}
142+
143+
TransportConfigurationStorage(const uint16_t aConnectionID, std::shared_ptr<TransportOptionsStorage> aTransportOptionsPtr)
144+
{
145+
connectionID = aConnectionID;
146+
transportStatus = TransportStatusEnum::kInactive;
147+
/*Store the pointer to keep buffer alive*/
148+
mTransportOptionsPtr = aTransportOptionsPtr;
149+
/*Convert Storage type to base type*/
150+
transportOptions.SetValue(*aTransportOptionsPtr);
151+
}
152+
std::shared_ptr<TransportOptionsStorage> GetTransportOptionsPtr() const { return mTransportOptionsPtr; }
153+
154+
private:
155+
std::shared_ptr<TransportOptionsStorage> mTransportOptionsPtr;
156+
};
157+
158+
struct TransportConfigurationStorageWithFabricIndex
159+
{
160+
TransportConfigurationStorage transportConfiguration;
161+
chip::FabricIndex fabricIndex;
138162
};
139163

140164
/** @brief
@@ -284,7 +308,7 @@ appropriate
284308
* The callee is responsible for allocating the buffer that holds the currentConnections.
285309
* The buffer is allocated internally by the function and returned to the caller via an output parameter.
286310
*/
287-
virtual CHIP_ERROR LoadCurrentConnections(std::vector<TransportConfigurationStructWithFabricIndex> & currentConnections) = 0;
311+
virtual CHIP_ERROR LoadCurrentConnections(std::vector<TransportConfigurationStorageWithFabricIndex> & currentConnections) = 0;
288312

289313
/**
290314
* @brief Callback into the delegate once persistent attributes managed by
@@ -343,7 +367,7 @@ class PushAvStreamTransportServer : public AttributeAccessInterface, public Comm
343367
/*Moved from TransportConfigurationStruct to TransportConfigurationStructWithFabricIndex
344368
* to perform fabric index checks
345369
*/
346-
std::vector<TransportConfigurationStructWithFabricIndex> mCurrentConnections;
370+
std::vector<TransportConfigurationStorageWithFabricIndex> mCurrentConnections;
347371

348372
/**
349373
* IM-level implementation of read
@@ -362,9 +386,9 @@ class PushAvStreamTransportServer : public AttributeAccessInterface, public Comm
362386

363387
// Helper functions
364388
uint16_t GenerateConnectionID();
365-
TransportConfigurationStructWithFabricIndex * FindStreamTransportConnection(const uint16_t connectionID);
389+
TransportConfigurationStorageWithFabricIndex * FindStreamTransportConnection(const uint16_t connectionID);
366390
// Add/Remove Management functions for transport
367-
UpsertResultEnum UpsertStreamTransportConnection(const TransportConfigurationStructWithFabricIndex & transportConfiguration);
391+
UpsertResultEnum UpsertStreamTransportConnection(const TransportConfigurationStorageWithFabricIndex & transportConfiguration);
368392

369393
void RemoveStreamTransportConnection(const uint16_t connectionID);
370394

0 commit comments

Comments
 (0)