diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-14 02:08:44 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-15 22:33:33 +0300 |
| commit | 319d6ae8e3ad1a47a674e85015de9ea811e84564 (patch) | |
| tree | 7d1ccddf9997bb58be692e51bf217d49d8000622 /include/ipa/ipa_interface.h | |
| parent | c957c8580a30d5940f0d4893497f38e05c7f8e92 (diff) | |
libcamera: controls: Merge ControlInfoMap and V4L2ControlInfoMap
The ControlInfoMap and V4L2ControlInfoMap classes are very similar, with
the latter adding convenience accessors based on numerical IDs for the
former, as well as a cached idmap. Both features can be useful for
ControlInfoMap in the context of serialisation, and merging the two
classes will further simplify the IPA API.
Import all the features of V4L2ControlInfoMap into ControlInfoMap,
turning the latter into a real class. A few new constructors and
assignment operators are added for completeness.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include/ipa/ipa_interface.h')
| -rw-r--r-- | include/ipa/ipa_interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ipa/ipa_interface.h b/include/ipa/ipa_interface.h index dfb1bcbe..8fd658af 100644 --- a/include/ipa/ipa_interface.h +++ b/include/ipa/ipa_interface.h @@ -43,7 +43,7 @@ public: virtual int init() = 0; virtual void configure(const std::map<unsigned int, IPAStream> &streamConfig, - const std::map<unsigned int, V4L2ControlInfoMap> &entityControls) = 0; + const std::map<unsigned int, ControlInfoMap> &entityControls) = 0; virtual void mapBuffers(const std::vector<IPABuffer> &buffers) = 0; virtual void unmapBuffers(const std::vector<unsigned int> &ids) = 0; |