Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 23:39:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: CameraDevice: Add stop()

Browse source 
This adds CameraDevice::stop(), which cleans up the member
variables of CameraDevice. It is called in CameraDevice::close()
and CameraDevice::configureStreams().

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-04-02 11:12:37 +09:00 • committed by Laurent Pinchart
parent 796109c8dc
commit 0b661d70ec
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/android/camera_device.cpp
View file

@ -754,9 +754,18 @@ void CameraDevice::close()
{ {
streams_.clear(); streams_.clear();
stop();
camera_->release();
}
void CameraDevice::stop()
{
if (!running_)
return;
worker_.stop(); worker_.stop();
camera_->stop(); camera_->stop();
camera_->release();
running_ = false; running_ = false;
} }
@ -1642,12 +1651,8 @@ PixelFormat CameraDevice::toPixelFormat(int format) const
*/ */
int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
{ {
/* Before any configuration attempt, stop the camera if it's running. */ /* Before any configuration attempt, stop the camera. */
if (running_) { stop();
worker_.stop();
camera_->stop();
running_ = false;
}
if (stream_list->num_streams == 0) { if (stream_list->num_streams == 0) {
LOG(HAL, Error) << "No streams in configuration"; LOG(HAL, Error) << "No streams in configuration";

2
src/android/camera_device.h
View file

@ -85,6 +85,8 @@ private:
int androidFormat; int androidFormat;
}; };
void stop();
int initializeStreamConfigurations(); int initializeStreamConfigurations();
std::vector<libcamera::Size> std::vector<libcamera::Size>
getYUVResolutions(libcamera::CameraConfiguration *cameraConfig, getYUVResolutions(libcamera::CameraConfiguration *cameraConfig,