@@ -54,7 +54,7 @@ CameraAVStreamMgmtServer::CameraAVStreamMgmtServer(
5454 const AudioCapabilitiesStruct & aSpeakerCapabilities, TwoWayTalkSupportTypeEnum aTwoWayTalkSupport,
5555 const std::vector<Structs::SnapshotCapabilitiesStruct::Type> & aSnapshotCapabilities, uint32_t aMaxNetworkBandwidth,
5656 const std::vector<Globals::StreamUsageEnum> & aSupportedStreamUsages,
57- const std::vector<Globals::StreamUsageEnum> & aRankedStreamPriorities ) :
57+ const std::vector<Globals::StreamUsageEnum> & aStreamUsagePriorities ) :
5858 CommandHandlerInterface (MakeOptional(aEndpointId), CameraAvStreamManagement::Id),
5959 AttributeAccessInterface (MakeOptional(aEndpointId), CameraAvStreamManagement::Id), mDelegate (aDelegate),
6060 mEndpointId (aEndpointId), mFeatures (aFeatures), mOptionalAttrs (aOptionalAttrs), mMaxConcurrentEncoders (aMaxConcurrentEncoders),
@@ -64,7 +64,7 @@ CameraAVStreamMgmtServer::CameraAVStreamMgmtServer(
6464 mMicrophoneCapabilities (aMicrophoneCapabilities), mSpeakerCapabilities (aSpeakerCapabilities),
6565 mTwoWayTalkSupport (aTwoWayTalkSupport), mSnapshotCapabilitiesList (aSnapshotCapabilities),
6666 mMaxNetworkBandwidth (aMaxNetworkBandwidth), mSupportedStreamUsages (aSupportedStreamUsages),
67- mStreamUsagePriorities (aRankedStreamPriorities )
67+ mStreamUsagePriorities (aStreamUsagePriorities )
6868{
6969 mDelegate .SetCameraAVStreamMgmtServer (this );
7070}
@@ -1648,6 +1648,7 @@ void CameraAVStreamMgmtServer::InvokeCommand(HandlerContext & handlerContext)
16481648 return ;
16491649 }
16501650}
1651+
16511652bool CameraAVStreamMgmtServer::StreamPrioritiesHasDuplicates (const std::vector<Globals::StreamUsageEnum> & aStreamUsagePriorities)
16521653{
16531654 std::set<Globals::StreamUsageEnum> seenStreamUsages;
@@ -2023,7 +2024,7 @@ void CameraAVStreamMgmtServer::HandleSetStreamPriorities(HandlerContext & ctx,
20232024{
20242025
20252026 auto & streamPriorities = commandData.streamPriorities ;
2026- std::vector<Globals::StreamUsageEnum> rankedStreamPriorities ;
2027+ std::vector<Globals::StreamUsageEnum> streamUsagePriorities ;
20272028 auto iter = streamPriorities.begin ();
20282029
20292030 // If any video, audio or snapshot streams exist fail the command.
@@ -2043,7 +2044,8 @@ void CameraAVStreamMgmtServer::HandleSetStreamPriorities(HandlerContext & ctx,
20432044 auto it = std::find (mSupportedStreamUsages .begin (), mSupportedStreamUsages .end (), streamUsage);
20442045 VerifyOrReturn (it != mSupportedStreamUsages .end (),
20452046 ctx.mCommandHandler .AddStatus (ctx.mRequestPath , Status::DynamicConstraintError));
2046- rankedStreamPriorities.push_back (streamUsage);
2047+
2048+ streamUsagePriorities.push_back (streamUsage);
20472049 }
20482050
20492051 if (iter.GetStatus () != CHIP_NO_ERROR)
@@ -2054,10 +2056,10 @@ void CameraAVStreamMgmtServer::HandleSetStreamPriorities(HandlerContext & ctx,
20542056
20552057 // If there are duplicate stream usages in StreamPriorities,
20562058 // return AlreadyExists
2057- VerifyOrReturn (!StreamPrioritiesHasDuplicates (rankedStreamPriorities ),
2059+ VerifyOrReturn (!StreamPrioritiesHasDuplicates (streamUsagePriorities ),
20582060 ctx.mCommandHandler .AddStatus (ctx.mRequestPath , Status::AlreadyExists));
20592061
2060- CHIP_ERROR err = SetStreamUsagePriorities (rankedStreamPriorities );
2062+ CHIP_ERROR err = SetStreamUsagePriorities (streamUsagePriorities );
20612063
20622064 if (err != CHIP_NO_ERROR)
20632065 {
0 commit comments