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

libcamera: control_serializer: Save serialized ControlInfoMap in a cache

Browse Source 
The ControlSerializer saves all ControlInfoMaps that it has already
(de)serialized, in order to (de)serialize ControlLists that contain the
ControlInfoMaps. Leverage this to cache ControlInfoMaps, such that the
ControlSerializer will not re-(de)serialize a ControlInfoMap that it has
previously (de)serialized.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Paul Elder
2020-12-23 12:34:42 +09:00
parent a119d75530
commit 892c0f4c19
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libcamera/internal/control_serializer.h
View File

@@ -33,6 +33,8 @@ public:
template<typename T>
T deserialize(ByteStreamBuffer &buffer);
bool isCached(const ControlInfoMap &infoMap);
private:
static size_t binarySize(const ControlValue &value);
static size_t binarySize(const ControlInfo &info);

26
src/libcamera/control_serializer.cpp
View File

@@ -173,6 +173,12 @@ void ControlSerializer::store(const ControlInfo &info, ByteStreamBuffer &buffer)
int ControlSerializer::serialize(const ControlInfoMap &infoMap,
ByteStreamBuffer &buffer)
{
if (isCached(infoMap)) {
LOG(Serializer, Debug)
<< "Skipping already serialized ControlInfoMap";
return 0;
}
/* Compute entries and data required sizes. */
size_t entriesSize = infoMap.size()
* sizeof(struct ipa_control_info_entry);
@@ -347,6 +353,12 @@ ControlInfoMap ControlSerializer::deserialize<ControlInfoMap>(ByteStreamBuffer &
return {};
}
auto iter = infoMaps_.find(hdr->handle);
if (iter != infoMaps_.end()) {
LOG(Serializer, Debug) << "Use cached ControlInfoMap";
return iter->second;
}
if (hdr->version != IPA_CONTROLS_FORMAT_VERSION) {
LOG(Serializer, Error)
<< "Unsupported controls format version "
@@ -485,4 +497,18 @@ ControlList ControlSerializer::deserialize<ControlList>(ByteStreamBuffer &buffer
return ctrls;
}
/**
* \brief Check if a ControlInfoMap is cached
* \param[in] infoMap The ControlInfoMap to check
*
* The ControlSerializer caches all ControlInfoMaps that it has (de)serialized.
* This function checks if \a infoMap is in the cache.
*
* \return True if \a infoMap is in the cache or false otherwise
*/
bool ControlSerializer::isCached(const ControlInfoMap &infoMap)
{
return infoMapHandles_.count(&infoMap);
}
} /* namespace libcamera */