1684c3f930
Commit7532caa2c7("android: camera_device: Reset config_ if Camera::configure() fails") reworked the configuration sequence to ensure that the CameraConfiguration pointers gets reset when configuration fails. This inadvertently causes a null pointer dereference, as the CameraStream constructor accesses the camera configuration through CameraDevice::cameraConfiguration() before the internal config_ pointer is set. Fix this by passing the configuration pointer explicitly to the CameraStream constructor. Fixes:7532caa2c7("android: camera_device: Reset config_ if Camera::configure() fails") Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Tested-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Umang Jain <umang.jain@ideasonboard.com> Tested-by: Umang Jain <umang.jain@ideasonboard.com> Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
132 lines
3.8 KiB
C++
132 lines
3.8 KiB
C++
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* camera_device.h - libcamera Android Camera Device
|
|
*/
|
|
#ifndef __ANDROID_CAMERA_DEVICE_H__
|
|
#define __ANDROID_CAMERA_DEVICE_H__
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include <vector>
|
|
|
|
#include <hardware/camera3.h>
|
|
|
|
#include <libcamera/base/log.h>
|
|
#include <libcamera/base/message.h>
|
|
#include <libcamera/base/thread.h>
|
|
|
|
#include <libcamera/buffer.h>
|
|
#include <libcamera/camera.h>
|
|
#include <libcamera/request.h>
|
|
#include <libcamera/stream.h>
|
|
|
|
#include "libcamera/internal/buffer.h"
|
|
|
|
#include "camera_capabilities.h"
|
|
#include "camera_metadata.h"
|
|
#include "camera_stream.h"
|
|
#include "camera_worker.h"
|
|
#include "jpeg/encoder.h"
|
|
|
|
struct CameraConfigData;
|
|
class CameraDevice : protected libcamera::Loggable
|
|
{
|
|
public:
|
|
static std::unique_ptr<CameraDevice> create(unsigned int id,
|
|
std::shared_ptr<libcamera::Camera> cam);
|
|
~CameraDevice();
|
|
|
|
int initialize(const CameraConfigData *cameraConfigData);
|
|
|
|
int open(const hw_module_t *hardwareModule);
|
|
void close();
|
|
void flush();
|
|
|
|
unsigned int id() const { return id_; }
|
|
camera3_device_t *camera3Device() { return &camera3Device_; }
|
|
const std::shared_ptr<libcamera::Camera> &camera() const { return camera_; }
|
|
|
|
const std::string &maker() const { return maker_; }
|
|
const std::string &model() const { return model_; }
|
|
int facing() const { return facing_; }
|
|
int orientation() const { return orientation_; }
|
|
unsigned int maxJpegBufferSize() const;
|
|
|
|
void setCallbacks(const camera3_callback_ops_t *callbacks);
|
|
const camera_metadata_t *getStaticMetadata();
|
|
const camera_metadata_t *constructDefaultRequestSettings(int type);
|
|
int configureStreams(camera3_stream_configuration_t *stream_list);
|
|
int processCaptureRequest(camera3_capture_request_t *request);
|
|
void requestComplete(libcamera::Request *request);
|
|
|
|
protected:
|
|
std::string logPrefix() const override;
|
|
|
|
private:
|
|
CameraDevice(unsigned int id, std::shared_ptr<libcamera::Camera> camera);
|
|
|
|
struct Camera3RequestDescriptor {
|
|
Camera3RequestDescriptor() = default;
|
|
~Camera3RequestDescriptor() = default;
|
|
Camera3RequestDescriptor(libcamera::Camera *camera,
|
|
const camera3_capture_request_t *camera3Request);
|
|
Camera3RequestDescriptor &operator=(Camera3RequestDescriptor &&) = default;
|
|
|
|
uint32_t frameNumber_ = 0;
|
|
std::vector<camera3_stream_buffer_t> buffers_;
|
|
std::vector<std::unique_ptr<libcamera::FrameBuffer>> frameBuffers_;
|
|
CameraMetadata settings_;
|
|
std::unique_ptr<CaptureRequest> request_;
|
|
};
|
|
|
|
enum class State {
|
|
Stopped,
|
|
Flushing,
|
|
Running,
|
|
};
|
|
|
|
void stop();
|
|
|
|
libcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);
|
|
void abortRequest(camera3_capture_request_t *request);
|
|
bool isValidRequest(camera3_capture_request_t *request) const;
|
|
void notifyShutter(uint32_t frameNumber, uint64_t timestamp);
|
|
void notifyError(uint32_t frameNumber, camera3_stream_t *stream,
|
|
camera3_error_msg_code code);
|
|
int processControls(Camera3RequestDescriptor *descriptor);
|
|
std::unique_ptr<CameraMetadata> getResultMetadata(
|
|
const Camera3RequestDescriptor &descriptor) const;
|
|
|
|
unsigned int id_;
|
|
camera3_device_t camera3Device_;
|
|
|
|
CameraWorker worker_;
|
|
|
|
libcamera::Mutex stateMutex_; /* Protects access to the camera state. */
|
|
State state_;
|
|
|
|
std::shared_ptr<libcamera::Camera> camera_;
|
|
std::unique_ptr<libcamera::CameraConfiguration> config_;
|
|
CameraCapabilities capabilities_;
|
|
|
|
std::map<unsigned int, std::unique_ptr<CameraMetadata>> requestTemplates_;
|
|
const camera3_callback_ops_t *callbacks_;
|
|
|
|
std::vector<CameraStream> streams_;
|
|
|
|
libcamera::Mutex descriptorsMutex_; /* Protects descriptors_. */
|
|
std::map<uint64_t, Camera3RequestDescriptor> descriptors_;
|
|
|
|
std::string maker_;
|
|
std::string model_;
|
|
|
|
int facing_;
|
|
int orientation_;
|
|
|
|
CameraMetadata lastSettings_;
|
|
};
|
|
|
|
#endif /* __ANDROID_CAMERA_DEVICE_H__ */
|