pipeline: ipa: raspberrypi: Refactor and move the Raspberry Pi code
Split the Raspberry Pi pipeline handler and IPA source code into common
and VC4/BCM2835 specific file structures.
For the pipeline handler, the common code files now live in
src/libcamera/pipeline/rpi/common/
and the VC4-specific files in src/libcamera/pipeline/rpi/vc4/.
For the IPA, the common code files now live in
src/ipa/rpi/{cam_helper,controller}/
and the vc4 specific files in src/ipa/rpi/vc4/. With this change, the
camera tuning files are now installed under share/libcamera/ipa/rpi/vc4/.
To build the pipeline and IPA, the meson configuration options have now
changed from "raspberrypi" to "rpi/vc4":
meson setup build -Dipas=rpi/vc4 -Dpipelines=rpi/vc4
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
committed by
Laurent Pinchart
parent
46aefed208
commit
726e9274ea
@@ -0,0 +1,126 @@
|
||||
/* SPDX-License-Identifier: BSD-2-Clause */
|
||||
/*
|
||||
* Copyright (C) 2019-2021, Raspberry Pi Ltd
|
||||
*
|
||||
* metadata.h - general metadata class
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
/* A simple class for carrying arbitrary metadata, for example about an image. */
|
||||
|
||||
#include <any>
|
||||
#include <map>
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
|
||||
#include <libcamera/base/thread_annotations.h>
|
||||
|
||||
namespace RPiController {
|
||||
|
||||
class LIBCAMERA_TSA_CAPABILITY("mutex") Metadata
|
||||
{
|
||||
public:
|
||||
Metadata() = default;
|
||||
|
||||
Metadata(Metadata const &other)
|
||||
{
|
||||
std::scoped_lock otherLock(other.mutex_);
|
||||
data_ = other.data_;
|
||||
}
|
||||
|
||||
Metadata(Metadata &&other)
|
||||
{
|
||||
std::scoped_lock otherLock(other.mutex_);
|
||||
data_ = std::move(other.data_);
|
||||
other.data_.clear();
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void set(std::string const &tag, T const &value)
|
||||
{
|
||||
std::scoped_lock lock(mutex_);
|
||||
data_[tag] = value;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
int get(std::string const &tag, T &value) const
|
||||
{
|
||||
std::scoped_lock lock(mutex_);
|
||||
auto it = data_.find(tag);
|
||||
if (it == data_.end())
|
||||
return -1;
|
||||
value = std::any_cast<T>(it->second);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void clear()
|
||||
{
|
||||
std::scoped_lock lock(mutex_);
|
||||
data_.clear();
|
||||
}
|
||||
|
||||
Metadata &operator=(Metadata const &other)
|
||||
{
|
||||
std::scoped_lock lock(mutex_, other.mutex_);
|
||||
data_ = other.data_;
|
||||
return *this;
|
||||
}
|
||||
|
||||
Metadata &operator=(Metadata &&other)
|
||||
{
|
||||
std::scoped_lock lock(mutex_, other.mutex_);
|
||||
data_ = std::move(other.data_);
|
||||
other.data_.clear();
|
||||
return *this;
|
||||
}
|
||||
|
||||
void merge(Metadata &other)
|
||||
{
|
||||
std::scoped_lock lock(mutex_, other.mutex_);
|
||||
data_.merge(other.data_);
|
||||
}
|
||||
|
||||
void mergeCopy(const Metadata &other)
|
||||
{
|
||||
std::scoped_lock lock(mutex_, other.mutex_);
|
||||
/*
|
||||
* If the metadata key exists, ignore this item and copy only
|
||||
* unique key/value pairs.
|
||||
*/
|
||||
data_.insert(other.data_.begin(), other.data_.end());
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
T *getLocked(std::string const &tag)
|
||||
{
|
||||
/*
|
||||
* This allows in-place access to the Metadata contents,
|
||||
* for which you should be holding the lock.
|
||||
*/
|
||||
auto it = data_.find(tag);
|
||||
if (it == data_.end())
|
||||
return nullptr;
|
||||
return std::any_cast<T>(&it->second);
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void setLocked(std::string const &tag, T const &value)
|
||||
{
|
||||
/* Use this only if you're holding the lock yourself. */
|
||||
data_[tag] = value;
|
||||
}
|
||||
|
||||
/*
|
||||
* Note: use of (lowercase) lock and unlock means you can create scoped
|
||||
* locks with the standard lock classes.
|
||||
* e.g. std::lock_guard<RPiController::Metadata> lock(metadata)
|
||||
*/
|
||||
void lock() LIBCAMERA_TSA_ACQUIRE() { mutex_.lock(); }
|
||||
void unlock() LIBCAMERA_TSA_RELEASE() { mutex_.unlock(); }
|
||||
|
||||
private:
|
||||
mutable std::mutex mutex_;
|
||||
std::map<std::string, std::any> data_;
|
||||
};
|
||||
|
||||
} /* namespace RPiController */
|
||||
Reference in New Issue
Block a user