diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcamera/control_serializer.cpp | 29 | ||||
| -rw-r--r-- | src/libcamera/controls.cpp | 6 | ||||
| -rw-r--r-- | src/libcamera/include/control_serializer.h | 4 |
3 files changed, 20 insertions, 19 deletions
diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp index 004735fb..dcc63d20 100644 --- a/src/libcamera/control_serializer.cpp +++ b/src/libcamera/control_serializer.cpp @@ -106,19 +106,19 @@ size_t ControlSerializer::binarySize(const ControlRange &range) /** * \brief Retrieve the size in bytes required to serialize a ControlInfoMap - * \param[in] info The control info map + * \param[in] infoMap The control info map * * Compute and return the size in bytes required to store the serialized * ControlInfoMap. * * \return The size in bytes required to store the serialized ControlInfoMap */ -size_t ControlSerializer::binarySize(const ControlInfoMap &info) +size_t ControlSerializer::binarySize(const ControlInfoMap &infoMap) { size_t size = sizeof(struct ipa_controls_header) - + info.size() * sizeof(struct ipa_control_range_entry); + + infoMap.size() * sizeof(struct ipa_control_range_entry); - for (const auto &ctrl : info) + for (const auto &ctrl : infoMap) size += binarySize(ctrl.second); return size; @@ -159,32 +159,33 @@ void ControlSerializer::store(const ControlRange &range, /** * \brief Serialize a ControlInfoMap in a buffer - * \param[in] info The control info map to serialize + * \param[in] infoMap The control info map to serialize * \param[in] buffer The memory buffer where to serialize the ControlInfoMap * - * Serialize the \a info map into the \a buffer using the serialization format + * Serialize the \a infoMap into the \a buffer using the serialization format * defined by the IPA context interface in ipa_controls.h. * - * The serializer stores a reference to the \a info internally. The caller - * shall ensure that \a info stays valid until the serializer is reset(). + * The serializer stores a reference to the \a infoMap internally. The caller + * shall ensure that \a infoMap stays valid until the serializer is reset(). * * \return 0 on success, a negative error code otherwise * \retval -ENOSPC Not enough space is available in the buffer */ -int ControlSerializer::serialize(const ControlInfoMap &info, +int ControlSerializer::serialize(const ControlInfoMap &infoMap, ByteStreamBuffer &buffer) { /* Compute entries and data required sizes. */ - size_t entriesSize = info.size() * sizeof(struct ipa_control_range_entry); + size_t entriesSize = infoMap.size() + * sizeof(struct ipa_control_range_entry); size_t valuesSize = 0; - for (const auto &ctrl : info) + for (const auto &ctrl : infoMap) valuesSize += binarySize(ctrl.second); /* Prepare the packet header, assign a handle to the ControlInfoMap. */ struct ipa_controls_header hdr; hdr.version = IPA_CONTROLS_FORMAT_VERSION; hdr.handle = ++serial_; - hdr.entries = info.size(); + hdr.entries = infoMap.size(); hdr.size = sizeof(hdr) + entriesSize + valuesSize; hdr.data_offset = sizeof(hdr) + entriesSize; @@ -197,7 +198,7 @@ int ControlSerializer::serialize(const ControlInfoMap &info, ByteStreamBuffer entries = buffer.carveOut(entriesSize); ByteStreamBuffer values = buffer.carveOut(valuesSize); - for (const auto &ctrl : info) { + for (const auto &ctrl : infoMap) { const ControlId *id = ctrl.first; const ControlRange &range = ctrl.second; @@ -217,7 +218,7 @@ int ControlSerializer::serialize(const ControlInfoMap &info, * Store the map to handle association, to be used to serialize and * deserialize control lists. */ - infoMapHandles_[&info] = hdr.handle; + infoMapHandles_[&infoMap] = hdr.handle; return 0; } diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 4326174a..833a436c 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -706,11 +706,11 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator) /** * \brief Construct a ControlList with the idmap of a control info map - * \param[in] info The ControlInfoMap for the control list target object + * \param[in] infoMap The ControlInfoMap for the control list target object * \param[in] validator The validator (may be null) */ -ControlList::ControlList(const ControlInfoMap &info, ControlValidator *validator) - : validator_(validator), idmap_(&info.idmap()), infoMap_(&info) +ControlList::ControlList(const ControlInfoMap &infoMap, ControlValidator *validator) + : validator_(validator), idmap_(&infoMap.idmap()), infoMap_(&infoMap) { } diff --git a/src/libcamera/include/control_serializer.h b/src/libcamera/include/control_serializer.h index b91d1315..026e6234 100644 --- a/src/libcamera/include/control_serializer.h +++ b/src/libcamera/include/control_serializer.h @@ -24,10 +24,10 @@ public: void reset(); - static size_t binarySize(const ControlInfoMap &info); + static size_t binarySize(const ControlInfoMap &infoMap); static size_t binarySize(const ControlList &list); - int serialize(const ControlInfoMap &info, ByteStreamBuffer &buffer); + int serialize(const ControlInfoMap &infoMap, ByteStreamBuffer &buffer); int serialize(const ControlList &list, ByteStreamBuffer &buffer); template<typename T> |