libcamera/vivid.git - libcamera pipeline handler for VIVID

summary refs log tree commit diff

path: root/test/libtest/camera_test.h

diff options

author	Laurent Pinchart <laurent.pinchart@ideasonboard.com>	2022-10-09 07:34:09 +0300
committer	Laurent Pinchart <laurent.pinchart@ideasonboard.com>	2022-10-10 17:04:12 +0300
commit	603a4d60f6ac4dbc2474700943dd1a0066ee1f23 (patch)
tree	bfa78f93fbb2981e7d6787ae2e9571481673c3f9 /test/libtest/camera_test.h
parent	4bf68fdbe1493e57118dad4e94c2a46c50a9c402 (diff)

ipa: rkisp1: Drop use of utils::defopt

utils::defopt causes compilation issues on gcc 8.0.0 to gcc 8.3.0, likely due to bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86521 that was fixed in gcc 8.4.0. gcc 8.3.0 may be considered old (libcamera requires gcc-8 or newer), but it is shipped by Debian 10 that has LTS support until mid-2024. As no workaround has been found to fix compilation on gcc 8.3.0 while still retaining the functionality of utils::defopt, stop using it in the RkISP1 IPA module. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Diffstat (limited to 'test/libtest/camera_test.h')

0 files changed, 0 insertions, 0 deletions

equestSettings(int type)

captureIntent);

requestTemplates_[type] = std::move(requestTemplate);

- return requestTemplates_[type]->get();

+ return requestTemplates_[type]->getMetadata();

}

/*

@@ -1171,7 +1171,8 @@ void CameraDevice::sendCaptureResults()

captureResult.frame_number = descriptor->frameNumber_;

if (descriptor->resultMetadata_)

- captureResult.result = descriptor->resultMetadata_->get();

+ captureResult.result =

+ descriptor->resultMetadata_->getMetadata();

std::vector<camera3_stream_buffer_t> resultBuffers;

resultBuffers.reserve(descriptor->buffers_.size());

diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp
index 075b6a22..b3e515d2 100644
--- a/src/android/camera_metadata.cpp
+++ b/src/android/camera_metadata.cpp

@@ -33,7 +33,7 @@ CameraMetadata::CameraMetadata(const camera_metadata_t *metadata)

}

CameraMetadata::CameraMetadata(const CameraMetadata &other)

- : CameraMetadata(other.get())

+ : CameraMetadata(other.getMetadata())

{

}

@@ -51,7 +51,7 @@ CameraMetadata &CameraMetadata::operator=(const CameraMetadata &other)

if (metadata_)

free_camera_metadata(metadata_);

- metadata_ = clone_camera_metadata(other.get());

+ metadata_ = clone_camera_metadata(other.getMetadata());

valid_ = metadata_ != nullptr;

return *this;

@@ -220,12 +220,12 @@ bool CameraMetadata::updateEntry(uint32_t tag, const void *data, size_t count,

return false;

}

-camera_metadata_t *CameraMetadata::get()

+camera_metadata_t *CameraMetadata::getMetadata()

{

return valid_ ? metadata_ : nullptr;

}

-const camera_metadata_t *CameraMetadata::get() const

+const camera_metadata_t *CameraMetadata::getMetadata() const

{

return valid_ ? metadata_ : nullptr;

}

diff --git a/src/android/camera_metadata.h b/src/android/camera_metadata.h
index 60be416c..8555c7c3 100644
--- a/src/android/camera_metadata.h
+++ b/src/android/camera_metadata.h

@@ -85,8 +85,8 @@ public:

return updateEntry(tag, data, count, sizeof(T));

}

- camera_metadata_t *get();

- const camera_metadata_t *get() const;

+ camera_metadata_t *getMetadata();

+ const camera_metadata_t *getMetadata() const;

private:

bool resize(size_t count, size_t size);