Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "camera: Remove session_hal_buf_manager flag" into main

Browse Source
This commit is contained in:
Jayant Chowdhary
2024-09-26 21:53:46 +00:00
committed by Android (Google) Code Review
parent 9f39f1a76b 1e8654fedd
commit 40a34f25b1
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camera/provider/aidl/vts/camera_aidl_test.cpp
View File

@@ -2590,8 +2590,7 @@ ndk::ScopedAStatus CameraAidlTest::configureStreams(std::shared_ptr<ICameraDevic
return ret;
}
if (flags::session_hal_buf_manager() &&
(bufferManagerType == BufferManagerType::SESSION && interfaceVersion >= 3)) {
if (bufferManagerType == BufferManagerType::SESSION && interfaceVersion >= 3) {
ret = session->configureStreamsV2(config, &aidl_return);
} else {
ret = session->configureStreams(config, halStreams);
@@ -2599,12 +2598,11 @@ ndk::ScopedAStatus CameraAidlTest::configureStreams(std::shared_ptr<ICameraDevic
if (!ret.isOk()) {
return ret;
}
if (flags::session_hal_buf_manager() && bufferManagerType == BufferManagerType::SESSION) {
if (bufferManagerType == BufferManagerType::SESSION) {
*halStreams = std::move(aidl_return.halStreams);
}
for (const auto& halStream : *halStreams) {
if ((flags::session_hal_buf_manager() && bufferManagerType == BufferManagerType::SESSION &&
halStream.enableHalBufferManager) ||
if ((bufferManagerType == BufferManagerType::SESSION && halStream.enableHalBufferManager) ||
bufferManagerType == BufferManagerType::HAL) {
halBufManagedStreamIds->insert(halStream.id);
}