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

libcamera: v4l2_videodevice: Prevent shadowing of V4L2BufferCache members

Browse Source 
The members free, and lastUsed were not following the libcamera coding
style, and were producing a shadowed parameter on the construction.

Rename them to be marked as member variables with the _ postfix
accordingly.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Kieran Bingham
2020-07-28 13:35:25 +01:00
parent d55f6a8037
commit 1021b42823
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libcamera/internal/v4l2_videodevice.h
View File

@@ -127,8 +127,8 @@ private:
bool operator==(const FrameBuffer &buffer) const;
bool free;
uint64_t lastUsed;
bool free_;
uint64_t lastUsed_;
private:
struct Plane {

12
src/libcamera/v4l2_videodevice.cpp
View File

@@ -213,7 +213,7 @@ int V4L2BufferCache::get(const FrameBuffer &buffer)
for (unsigned int index = 0; index < cache_.size(); index++) {
const Entry &entry = cache_[index];
if (!entry.free)
if (!entry.free_)
continue;
/* Try to find a cache hit by comparing the planes. */
@@ -223,9 +223,9 @@ int V4L2BufferCache::get(const FrameBuffer &buffer)
break;
}
if (entry.lastUsed < oldest) {
if (entry.lastUsed_ < oldest) {
use = index;
oldest = entry.lastUsed;
oldest = entry.lastUsed_;
}
}
@@ -249,16 +249,16 @@ int V4L2BufferCache::get(const FrameBuffer &buffer)
void V4L2BufferCache::put(unsigned int index)
{
ASSERT(index < cache_.size());
cache_[index].free = true;
cache_[index].free_ = true;
}
V4L2BufferCache::Entry::Entry()
: free(true), lastUsed(0)
: free_(true), lastUsed_(0)
{
}
V4L2BufferCache::Entry::Entry(bool free, uint64_t lastUsed, const FrameBuffer &buffer)
: free(free), lastUsed(lastUsed)
: free_(free), lastUsed_(lastUsed)
{
for (const FrameBuffer::Plane &plane : buffer.planes())
planes_.emplace_back(plane);