Skip to content

Commit 126fdeb

Browse files
committed
Remove Enum validation functions.
1 parent f38ccfa commit 126fdeb

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1488,12 +1488,12 @@ void CameraAVStreamMgmtServer::HandleVideoStreamAllocate(HandlerContext & ctx,
14881488
VerifyOrReturn((HasFeature(Feature::kOnScreenDisplay) == commandData.OSDEnabled.HasValue()),
14891489
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::InvalidCommand));
14901490

1491-
VerifyOrReturn(IsStreamUsageValid(streamUsage), {
1491+
VerifyOrReturn(streamUsage != StreamUsageEnum::kUnknownEnumValue, {
14921492
ChipLogError(Zcl, "CameraAVStreamMgmt: Invalid stream usage");
14931493
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::InvalidCommand);
14941494
});
14951495

1496-
VerifyOrReturn(IsVideoCodecValid(videoCodec), {
1496+
VerifyOrReturn(videoCodec != VideoCodecEnum::kUnknownEnumValue, {
14971497
ChipLogError(Zcl, "CameraAVStreamMgmt: Invalid video codec");
14981498
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::InvalidCommand);
14991499
});
@@ -1577,12 +1577,12 @@ void CameraAVStreamMgmtServer::HandleAudioStreamAllocate(HandlerContext & ctx,
15771577
auto & bitDepth = commandData.bitDepth;
15781578
uint16_t audioStreamID = 0;
15791579

1580-
VerifyOrReturn(IsStreamUsageValid(streamUsage), {
1580+
VerifyOrReturn(streamUsage != StreamUsageEnum::kUnknownEnumValue, {
15811581
ChipLogError(Zcl, "CameraAVStreamMgmt: Invalid stream usage");
15821582
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);
15831583
});
15841584

1585-
VerifyOrReturn(IsAudioCodecValid(audioCodec), {
1585+
VerifyOrReturn(audioCodec != AudioCodecEnum::kUnknownEnumValue, {
15861586
ChipLogError(Zcl, "CameraAVStreamMgmt: Invalid audio codec");
15871587
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::ConstraintError);
15881588
});
@@ -1646,7 +1646,7 @@ void CameraAVStreamMgmtServer::HandleSnapshotStreamAllocate(HandlerContext & ctx
16461646
auto & quality = commandData.quality;
16471647
uint16_t snapshotStreamID = 0;
16481648

1649-
VerifyOrReturn(IsImageCodecValid(imageCodec), {
1649+
VerifyOrReturn(imageCodec != ImageCodecEnum::kUnknownEnumValue, {
16501650
ChipLogError(Zcl, "CameraAVStreamMgmt: Invalid image codec");
16511651
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
16521652
});

src/app/clusters/camera-av-stream-management-server/camera-av-stream-management-server.h

-8
Original file line numberDiff line numberDiff line change
@@ -603,14 +603,6 @@ class CameraAVStreamMgmtServer : public CommandHandlerInterface, public Attribut
603603
return CHIP_NO_ERROR;
604604
}
605605

606-
bool IsAudioCodecValid(AudioCodecEnum audioCodec) { return (audioCodec != AudioCodecEnum::kUnknownEnumValue); }
607-
608-
bool IsVideoCodecValid(VideoCodecEnum videoCodec) { return (videoCodec != VideoCodecEnum::kUnknownEnumValue); }
609-
610-
bool IsImageCodecValid(ImageCodecEnum imageCodec) { return (imageCodec != ImageCodecEnum::kUnknownEnumValue); }
611-
612-
bool IsStreamUsageValid(StreamUsageEnum streamUsage) { return (streamUsage != StreamUsageEnum::kUnknownEnumValue); }
613-
614606
bool IsBitDepthValid(uint8_t bitDepth) { return (bitDepth == 8 || bitDepth == 16 || bitDepth == 24 || bitDepth == 32); }
615607

616608
/**

0 commit comments

Comments
 (0)