Loading services/camera/libcameraservice/device3/Camera3Device.cpp +7 −2 Original line number Diff line number Diff line Loading @@ -2534,10 +2534,13 @@ status_t Camera3Device::configureStreamsLocked(int operatingMode, config.streams = streams.editArray(); config.hal_buffer_managed_streams = mHalBufManagedStreamIds; config.use_hal_buf_manager = mUseHalBufManager; // Do the HAL configuration; will potentially touch stream // max_buffers, usage, and priv fields, as well as data_space and format // fields for IMPLEMENTATION_DEFINED formats. // max_buffers, usage, priv fields, data_space and format // fields for IMPLEMENTATION_DEFINED formats as well as hal buffer managed // streams and use_hal_buf_manager (in case aconfig flag session_hal_buf_manager // is not enabled but the HAL supports session specific hal buffer manager). int64_t logId = mCameraServiceProxyWrapper->getCurrentLogIdForCamera(mId); const camera_metadata_t *sessionBuffer = sessionParams.getAndLock(); Loading @@ -2557,6 +2560,8 @@ status_t Camera3Device::configureStreamsLocked(int operatingMode, strerror(-res), res); return res; } // It is possible that use hal buffer manager behavior was changed by the // configureStreams call. mUseHalBufManager = config.use_hal_buf_manager; if (flags::session_hal_buf_manager()) { bool prevSessionHalBufManager = (mHalBufManagedStreamIds.size() != 0); Loading services/camera/libcameraservice/device3/aidl/AidlCamera3Device.cpp +0 −1 Original line number Diff line number Diff line Loading @@ -913,7 +913,6 @@ status_t AidlCamera3Device::AidlHalInterface::configureStreams( std::set<int> activeStreams; camera::device::StreamConfiguration requestedConfiguration; requestedConfiguration.streams.resize(config->num_streams); config->use_hal_buf_manager = mUseHalBufManager; for (size_t i = 0; i < config->num_streams; i++) { camera::device::Stream &dst = requestedConfiguration.streams[i]; camera3::camera_stream_t *src = config->streams[i]; Loading Loading
services/camera/libcameraservice/device3/Camera3Device.cpp +7 −2 Original line number Diff line number Diff line Loading @@ -2534,10 +2534,13 @@ status_t Camera3Device::configureStreamsLocked(int operatingMode, config.streams = streams.editArray(); config.hal_buffer_managed_streams = mHalBufManagedStreamIds; config.use_hal_buf_manager = mUseHalBufManager; // Do the HAL configuration; will potentially touch stream // max_buffers, usage, and priv fields, as well as data_space and format // fields for IMPLEMENTATION_DEFINED formats. // max_buffers, usage, priv fields, data_space and format // fields for IMPLEMENTATION_DEFINED formats as well as hal buffer managed // streams and use_hal_buf_manager (in case aconfig flag session_hal_buf_manager // is not enabled but the HAL supports session specific hal buffer manager). int64_t logId = mCameraServiceProxyWrapper->getCurrentLogIdForCamera(mId); const camera_metadata_t *sessionBuffer = sessionParams.getAndLock(); Loading @@ -2557,6 +2560,8 @@ status_t Camera3Device::configureStreamsLocked(int operatingMode, strerror(-res), res); return res; } // It is possible that use hal buffer manager behavior was changed by the // configureStreams call. mUseHalBufManager = config.use_hal_buf_manager; if (flags::session_hal_buf_manager()) { bool prevSessionHalBufManager = (mHalBufManagedStreamIds.size() != 0); Loading
services/camera/libcameraservice/device3/aidl/AidlCamera3Device.cpp +0 −1 Original line number Diff line number Diff line Loading @@ -913,7 +913,6 @@ status_t AidlCamera3Device::AidlHalInterface::configureStreams( std::set<int> activeStreams; camera::device::StreamConfiguration requestedConfiguration; requestedConfiguration.streams.resize(config->num_streams); config->use_hal_buf_manager = mUseHalBufManager; for (size_t i = 0; i < config->num_streams; i++) { camera::device::Stream &dst = requestedConfiguration.streams[i]; camera3::camera_stream_t *src = config->streams[i]; Loading