Skip to content

Commit 6db59e6

Browse files
pidarpedpidarped
committed
Restyle fixes
1 parent 48824b7 commit 6db59e6

File tree

2 files changed

+65
-74
lines changed

2 files changed

+65
-74
lines changed

‎src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.cpp

+33-42
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,13 @@ namespace app {
4343
namespace Clusters {
4444
namespace CameraAvStreamManagement {
4545

46-
CameraAVStreamMgmtServer::CameraAVStreamMgmtServer(CameraAVStreamMgmtDelegate & aDelegate, EndpointId aEndpointId,
47-
ClusterId aClusterId, BitMask<Feature> aFeature,
48-
OptionalAttributes aOptionalAttrs,
49-
PersistentStorageDelegate & aPersistentStorage,
50-
uint8_t aMaxConcurrentVideoEncoders,
51-
uint32_t aMaxEncodedPixelRate,
52-
const VideoSensorParamsStruct & aVideoSensorParams, bool aNightVisionCapable,
53-
const VideoResolutionStruct & aMinViewPort, uint32_t aMaxContentBufferSize,
54-
const AudioCapabilitiesStruct & aMicrophoneCapabilities,
55-
const AudioCapabilitiesStruct & aSpeakerCapabilities,
56-
TwoWayTalkSupportTypeEnum aTwoWayTalkSupport, uint32_t aMaxNetworkBandwidth) :
46+
CameraAVStreamMgmtServer::CameraAVStreamMgmtServer(
47+
CameraAVStreamMgmtDelegate & aDelegate, EndpointId aEndpointId, ClusterId aClusterId, BitMask<Feature> aFeature,
48+
OptionalAttributes aOptionalAttrs, PersistentStorageDelegate & aPersistentStorage, uint8_t aMaxConcurrentVideoEncoders,
49+
uint32_t aMaxEncodedPixelRate, const VideoSensorParamsStruct & aVideoSensorParams, bool aNightVisionCapable,
50+
const VideoResolutionStruct & aMinViewPort, uint32_t aMaxContentBufferSize,
51+
const AudioCapabilitiesStruct & aMicrophoneCapabilities, const AudioCapabilitiesStruct & aSpeakerCapabilities,
52+
TwoWayTalkSupportTypeEnum aTwoWayTalkSupport, uint32_t aMaxNetworkBandwidth) :
5753
CommandHandlerInterface(MakeOptional(aEndpointId), aClusterId),
5854
AttributeAccessInterface(MakeOptional(aEndpointId), aClusterId), mDelegate(aDelegate), mEndpointId(aEndpointId),
5955
mClusterId(aClusterId), mFeature(aFeature), mOptionalAttrs(aOptionalAttrs), mPersistentStorage(&aPersistentStorage),
@@ -105,7 +101,7 @@ CameraAVStreamMgmtServer::ReadAndEncodeRateDistortionTradeOffPoints(const Attrib
105101
{
106102
CHIP_ERROR err = CHIP_NO_ERROR;
107103

108-
for (const auto& rateDistortionTradeOffPoints : mRateDistortionTradeOffPointsList)
104+
for (const auto & rateDistortionTradeOffPoints : mRateDistortionTradeOffPointsList)
109105
{
110106
err = encoder.Encode(rateDistortionTradeOffPoints);
111107
SuccessOrExit(err);
@@ -120,7 +116,7 @@ CHIP_ERROR CameraAVStreamMgmtServer::ReadAndEncodeSupportedSnapshotParams(const
120116
{
121117
CHIP_ERROR err = CHIP_NO_ERROR;
122118

123-
for (const auto& snapshotParams : mSupportedSnapshotParamsList)
119+
for (const auto & snapshotParams : mSupportedSnapshotParamsList)
124120
{
125121
err = encoder.Encode(snapshotParams);
126122
SuccessOrExit(err);
@@ -135,7 +131,7 @@ CHIP_ERROR CameraAVStreamMgmtServer::ReadAndEncodeFabricsUsingCamera(const Attri
135131
{
136132
CHIP_ERROR err = CHIP_NO_ERROR;
137133

138-
for (const auto& fabricIndex : mFabricsUsingCamera)
134+
for (const auto & fabricIndex : mFabricsUsingCamera)
139135
{
140136
err = encoder.Encode(fabricIndex);
141137
SuccessOrExit(err);
@@ -150,7 +146,7 @@ CHIP_ERROR CameraAVStreamMgmtServer::ReadAndEncodeAllocatedVideoStreams(const At
150146
{
151147
CHIP_ERROR err = CHIP_NO_ERROR;
152148

153-
for (const auto& videoStream : mAllocatedVideoStreams)
149+
for (const auto & videoStream : mAllocatedVideoStreams)
154150
{
155151
err = encoder.Encode(videoStream);
156152
SuccessOrExit(err);
@@ -165,7 +161,7 @@ CHIP_ERROR CameraAVStreamMgmtServer::ReadAndEncodeAllocatedAudioStreams(const At
165161
{
166162
CHIP_ERROR err = CHIP_NO_ERROR;
167163

168-
for (const auto& audioStream : mAllocatedAudioStreams)
164+
for (const auto & audioStream : mAllocatedAudioStreams)
169165
{
170166
err = encoder.Encode(audioStream);
171167
SuccessOrExit(err);
@@ -180,7 +176,7 @@ CHIP_ERROR CameraAVStreamMgmtServer::ReadAndEncodeAllocatedSnapshotStreams(const
180176
{
181177
CHIP_ERROR err = CHIP_NO_ERROR;
182178

183-
for (const auto& audioStream : mAllocatedAudioStreams)
179+
for (const auto & audioStream : mAllocatedAudioStreams)
184180
{
185181
err = encoder.Encode(audioStream);
186182
SuccessOrExit(err);
@@ -293,41 +289,37 @@ CHIP_ERROR CameraAVStreamMgmtServer::Read(const ConcreteReadAttributePath & aPat
293289
VerifyOrReturnError(HasFeature(Feature::kVideo), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
294290
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get FabricsUsingCamera, feature is not supported"));
295291
ReturnErrorOnFailure(aEncoder.EncodeList(
296-
[this](const auto & encoder) -> CHIP_ERROR {
297-
return this->ReadAndEncodeFabricsUsingCamera(encoder); }));
292+
[this](const auto & encoder) -> CHIP_ERROR { return this->ReadAndEncodeFabricsUsingCamera(encoder); }));
298293
break;
299294
case AllocatedVideoStreams::Id:
300295
VerifyOrReturnError(HasFeature(Feature::kVideo), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
301296
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get AllocatedVideoStreams, feature is not supported"));
302297

303298
ReturnErrorOnFailure(aEncoder.EncodeList(
304-
[this](const auto & encoder) -> CHIP_ERROR {
305-
return this->ReadAndEncodeAllocatedVideoStreams(encoder); }));
299+
[this](const auto & encoder) -> CHIP_ERROR { return this->ReadAndEncodeAllocatedVideoStreams(encoder); }));
306300
break;
307301
case AllocatedAudioStreams::Id:
308302
VerifyOrReturnError(HasFeature(Feature::kAudio), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
309303
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get AllocatedAudioStreams, feature is not supported"));
310304

311305
ReturnErrorOnFailure(aEncoder.EncodeList(
312-
[this](const auto & encoder) -> CHIP_ERROR {
313-
return this->ReadAndEncodeAllocatedAudioStreams(encoder); }));
306+
[this](const auto & encoder) -> CHIP_ERROR { return this->ReadAndEncodeAllocatedAudioStreams(encoder); }));
314307
break;
315308
case AllocatedSnapshotStreams::Id:
316-
VerifyOrReturnError(HasFeature(Feature::kSnapshot), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
309+
VerifyOrReturnError(
310+
HasFeature(Feature::kSnapshot), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
317311
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get AllocatedSnapshotStreams, feature is not supported"));
318312

319313
ReturnErrorOnFailure(aEncoder.EncodeList(
320-
[this](const auto & encoder) -> CHIP_ERROR {
321-
return this->ReadAndEncodeAllocatedSnapshotStreams(encoder); }));
314+
[this](const auto & encoder) -> CHIP_ERROR { return this->ReadAndEncodeAllocatedSnapshotStreams(encoder); }));
322315
break;
323316
case RankedVideoStreamPrioritiesList::Id:
324317
VerifyOrReturnError(
325318
HasFeature(Feature::kVideo), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
326319
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get RankedVideoStreamPrioritiesList, feature is not supported"));
327320

328321
ReturnErrorOnFailure(aEncoder.EncodeList(
329-
[this](const auto & encoder) -> CHIP_ERROR {
330-
return this->ReadAndEncodeRankedVideoStreamPrioritiesList(encoder); }));
322+
[this](const auto & encoder) -> CHIP_ERROR { return this->ReadAndEncodeRankedVideoStreamPrioritiesList(encoder); }));
331323
break;
332324
case SoftRecordingPrivacyModeEnabled::Id:
333325
VerifyOrReturnError(
@@ -342,20 +334,21 @@ CHIP_ERROR CameraAVStreamMgmtServer::Read(const ConcreteReadAttributePath & aPat
342334
ReturnErrorOnFailure(aEncoder.Encode(mSoftLivestreamPrivacyModeEnabled));
343335
break;
344336
case HardPrivacyModeOn::Id:
345-
VerifyOrReturnError(SupportsOptAttr(OptionalAttributes::kSupportsHardPrivacyModeOn),
346-
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
337+
VerifyOrReturnError(SupportsOptAttr(OptionalAttributes::kSupportsHardPrivacyModeOn), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
347338
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get HardPrivacyModeOn, feature is not supported"));
348339
ReturnErrorOnFailure(aEncoder.Encode(mHardPrivacyModeOn));
349340
break;
350341
case NightVision::Id:
351342
VerifyOrReturnError((HasFeature(Feature::kVideo) || HasFeature(Feature::kSnapshot)) &&
352-
SupportsOptAttr(OptionalAttributes::kSupportsNightVision), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
343+
SupportsOptAttr(OptionalAttributes::kSupportsNightVision),
344+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
353345
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get NightVision, feature is not supported"));
354346
ReturnErrorOnFailure(aEncoder.Encode(mNightVision));
355347
break;
356348
case NightVisionIllum::Id:
357349
VerifyOrReturnError((HasFeature(Feature::kVideo) || HasFeature(Feature::kSnapshot)) &&
358-
SupportsOptAttr(OptionalAttributes::kSupportsNightVisionIllum), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
350+
SupportsOptAttr(OptionalAttributes::kSupportsNightVisionIllum),
351+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
359352
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get NightVisionIllumination, feature is not supported"));
360353
ReturnErrorOnFailure(aEncoder.Encode(mNightVisionIllum));
361354
break;
@@ -441,8 +434,7 @@ CHIP_ERROR CameraAVStreamMgmtServer::Read(const ConcreteReadAttributePath & aPat
441434
ReturnErrorOnFailure(aEncoder.Encode(mLocalSnapshotRecordingEnabled));
442435
break;
443436
case StatusLightEnabled::Id:
444-
VerifyOrReturnError(SupportsOptAttr(OptionalAttributes::kSupportsStatusLightEnabled),
445-
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
437+
VerifyOrReturnError(SupportsOptAttr(OptionalAttributes::kSupportsStatusLightEnabled), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
446438
ChipLogError(Zcl, "CameraAVStreamMgmt: can not get StatusLightEnabled, feature is not supported"));
447439
ReturnErrorOnFailure(aEncoder.Encode(mStatusLightEnabled));
448440
break;
@@ -612,8 +604,7 @@ CHIP_ERROR CameraAVStreamMgmtServer::Write(const ConcreteDataAttributePath & aPa
612604
return StatusIB(status).ToChipError();
613605
}
614606
case StatusLightEnabled::Id: {
615-
VerifyOrReturnError(SupportsOptAttr(OptionalAttributes::kSupportsStatusLightEnabled),
616-
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
607+
VerifyOrReturnError(SupportsOptAttr(OptionalAttributes::kSupportsStatusLightEnabled), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
617608
ChipLogError(Zcl, "CameraAVStreamMgmt: can not set StatusLightEnabled, feature is not supported"));
618609
bool statusLightEnabled;
619610
ReturnErrorOnFailure(aDecoder.Decode(statusLightEnabled));
@@ -1048,7 +1039,8 @@ void CameraAVStreamMgmtServer::LoadPersistentAttributes()
10481039
}
10491040
else
10501041
{
1051-
ChipLogDetail(Zcl, "CameraAVStreamMgmt: Unable to load the NightVision from the KVS. Defaulting to %d", to_underlying(mNightVision));
1042+
ChipLogDetail(Zcl, "CameraAVStreamMgmt: Unable to load the NightVision from the KVS. Defaulting to %d",
1043+
to_underlying(mNightVision));
10521044
}
10531045

10541046
// Load NightVisionIllum
@@ -1434,7 +1426,7 @@ void CameraAVStreamMgmtServer::InvokeCommand(HandlerContext & handlerContext)
14341426
void CameraAVStreamMgmtServer::HandleVideoStreamAllocate(HandlerContext & ctx,
14351427
const Commands::VideoStreamAllocate::DecodableType & commandData)
14361428
{
1437-
Status status = Status::Success;
1429+
Status status = Status::Success;
14381430

14391431
Commands::VideoStreamAllocateResponse::Type response;
14401432
auto & streamType = commandData.streamType;
@@ -1471,9 +1463,9 @@ void CameraAVStreamMgmtServer::HandleVideoStreamAllocate(HandlerContext & ctx,
14711463
}
14721464

14731465
// Call the delegate
1474-
status = mDelegate.VideoStreamAllocate(streamType, videoCodec, minFrameRate, maxFrameRate, minResolution, maxResolution,
1475-
minBitRate, maxBitRate, minFragmentLen, maxFragmentLen,
1476-
isWaterMarkEnabled, isOSDEnabled);
1466+
status =
1467+
mDelegate.VideoStreamAllocate(streamType, videoCodec, minFrameRate, maxFrameRate, minResolution, maxResolution, minBitRate,
1468+
maxBitRate, minFragmentLen, maxFragmentLen, isWaterMarkEnabled, isOSDEnabled);
14771469

14781470
if (status == Status::Success)
14791471
{
@@ -1497,7 +1489,6 @@ void CameraAVStreamMgmtServer::HandleVideoStreamModify(HandlerContext & ctx,
14971489
if (HasFeature(Feature::kWatermark))
14981490
{
14991491
isWaterMarkEnabled = commandData.watermarkEnabled.ValueOr(false);
1500-
15011492
}
15021493
else
15031494
{

0 commit comments

Comments
 (0)