PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: controls: Move ControlValue get() and set() to controls.h

Browse Source 
To avoid defining all specializations of ControlValue::get() and
ControlValue::set() manually, move the definition of those functions to
controls.h and turn them into single template functions.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2020-02-14 17:02:18 +02:00
parent 300f6e4434
commit eaa1297df0
2 changed files with 13 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/libcamera/controls.h
View File

@@ -8,6 +8,7 @@
#ifndef __LIBCAMERA_CONTROLS_H__
#define __LIBCAMERA_CONTROLS_H__
#include <assert.h>
#include <string>
#include <unordered_map>
@@ -70,9 +71,19 @@ public:
}
template<typename T>
T get() const;
T get() const
{
assert(type_ == details::control_type<std::remove_cv_t<T>>::value);
return *reinterpret_cast<const T *>(&bool_);
}
template<typename T>
void set(const T &value);
void set(const T &value)
{
type_ = details::control_type<std::remove_cv_t<T>>::value;
*reinterpret_cast<T *>(&bool_) = value;
}
private:
ControlType type_;

47
src/libcamera/controls.cpp
View File

@@ -175,53 +175,6 @@ bool ControlValue::operator==(const ControlValue &other) const
* \param[in] value The control value
*/
#ifndef __DOXYGEN__
template<>
bool ControlValue::get<bool>() const
{
ASSERT(type_ == ControlTypeBool);
return bool_;
}
template<>
int32_t ControlValue::get<int32_t>() const
{
ASSERT(type_ == ControlTypeInteger32);
return integer32_;
}
template<>
int64_t ControlValue::get<int64_t>() const
{
ASSERT(type_ == ControlTypeInteger64);
return integer64_;
}
template<>
void ControlValue::set<bool>(const bool &value)
{
type_ = ControlTypeBool;
bool_ = value;
}
template<>
void ControlValue::set<int32_t>(const int32_t &value)
{
type_ = ControlTypeInteger32;
integer32_ = value;
}
template<>
void ControlValue::set<int64_t>(const int64_t &value)
{
type_ = ControlTypeInteger64;
integer64_ = value;
}
#endif /* __DOXYGEN__ */
/**
* \class ControlId
* \brief Control static metadata