NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: camera_device: Add thread safety annotation

Browse source 
This applies clang thread safety annotation to CameraDevice.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-12-01 16:53:47 +09:00 • committed by Laurent Pinchart
parent f6807016a3
commit 221cf408f3
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/android/camera_device.h
View file

@ -82,7 +82,7 @@ private:
Running, Running,
}; };
void stop(); void stop() LIBCAMERA_TSA_EXCLUDES(stateMutex_);
std::unique_ptr<libcamera::FrameBuffer> std::unique_ptr<libcamera::FrameBuffer>
createFrameBuffer(const buffer_handle_t camera3buffer, createFrameBuffer(const buffer_handle_t camera3buffer,
@ -94,8 +94,9 @@ private:
void notifyError(uint32_t frameNumber, camera3_stream_t *stream, void notifyError(uint32_t frameNumber, camera3_stream_t *stream,
camera3_error_msg_code code) const; camera3_error_msg_code code) const;
int processControls(Camera3RequestDescriptor *descriptor); int processControls(Camera3RequestDescriptor *descriptor);
void completeDescriptor(Camera3RequestDescriptor *descriptor); void completeDescriptor(Camera3RequestDescriptor *descriptor)
void sendCaptureResults(); LIBCAMERA_TSA_EXCLUDES(descriptorsMutex_);
void sendCaptureResults() LIBCAMERA_TSA_REQUIRES(descriptorsMutex_);
void setBufferStatus(Camera3RequestDescriptor::StreamBuffer &buffer, void setBufferStatus(Camera3RequestDescriptor::StreamBuffer &buffer,
Camera3RequestDescriptor::Status status); Camera3RequestDescriptor::Status status);
std::unique_ptr<CameraMetadata> getResultMetadata( std::unique_ptr<CameraMetadata> getResultMetadata(
@ -107,7 +108,7 @@ private:
CameraWorker worker_; CameraWorker worker_;
libcamera::Mutex stateMutex_; /* Protects access to the camera state. */ libcamera::Mutex stateMutex_; /* Protects access to the camera state. */
State state_; State state_ LIBCAMERA_TSA_GUARDED_BY(stateMutex_);
std::shared_ptr<libcamera::Camera> camera_; std::shared_ptr<libcamera::Camera> camera_;
std::unique_ptr<libcamera::CameraConfiguration> config_; std::unique_ptr<libcamera::CameraConfiguration> config_;
@ -118,8 +119,9 @@ private:
std::vector<CameraStream> streams_; std::vector<CameraStream> streams_;
libcamera::Mutex descriptorsMutex_; /* Protects descriptors_. */ libcamera::Mutex descriptorsMutex_ LIBCAMERA_TSA_ACQUIRED_AFTER(stateMutex_);
std::queue<std::unique_ptr<Camera3RequestDescriptor>> descriptors_; std::queue<std::unique_ptr<Camera3RequestDescriptor>> descriptors_
LIBCAMERA_TSA_GUARDED_BY(descriptorsMutex_);
std::string maker_; std::string maker_;
std::string model_; std::string model_;