已合并
fix concurrentList num #8187
吴敏杰创建于 2025年10月14日
fix concurrentList num #8187
已合并
共 2 个文件变更+7-3
| @@ -823,7 +823,7 @@ void V4L2DeviceManager::AddDefaultAbilityMuteModes(std::shared_ptr<CameraMetadat | |||
| 823 | 823 | ||
| 824 | void V4L2DeviceManager::AddDefaultAbilityConcurrentCameras(std::shared_ptr<CameraMetadata> metadata) | 824 | void V4L2DeviceManager::AddDefaultAbilityConcurrentCameras(std::shared_ptr<CameraMetadata> metadata) |
| 825 | { | 825 | { |
| 826 | - std::vector<uint8_t> concurrentList = {1, 2, 3, 4, 5, 6, 7}; | 826 | + std::vector<int32_t> concurrentList = {0, 1, 2, 3, 4, 5, 6}; |
| 827 | AddOrUpdateOhosTag(metadata, OHOS_ABILITY_CONCURRENT_SUPPORTED_CAMERAS, concurrentList); | 827 | AddOrUpdateOhosTag(metadata, OHOS_ABILITY_CONCURRENT_SUPPORTED_CAMERAS, concurrentList); |
| 828 | } | 828 | } |
| 829 | 829 | ||
| @@ -312,9 +312,13 @@ int32_t StreamOperatorVdiImpl::ReleaseStreams(const std::vector<int32_t> &stream | |||
| 312 | RetCode StreamOperatorVdiImpl::ReleaseStreams() | 312 | RetCode StreamOperatorVdiImpl::ReleaseStreams() |
| 313 | { | 313 | { |
| 314 | std::vector<int32_t> ids = {}; | 314 | std::vector<int32_t> ids = {}; |
| 315 | - for (auto it : streamMap_) { | 315 | + { |
| 316 | - ids.push_back(it.first); | 316 | + std::lock_guard<std::mutex> l(streamLock_); |
| 317 | + for (auto it : streamMap_) { | ||
| 318 | + ids.push_back(it.first); | ||
| 319 | + } | ||
| 317 | } | 320 | } |
| 321 | + | ||
| 318 | ReleaseStreams(ids); | 322 | ReleaseStreams(ids); |
| 319 | return RC_OK; | 323 | return RC_OK; |
| 320 | } | 324 | } |