Commit 1e035724 authored by Sean Topping's avatar Sean Topping Committed by Commit Bot

Fix V4L2 style checks

Bug: internal b/169779668
Test: CQ
Change-Id: If435dd5870d08d1fd2031588d3a0fae1c46e46f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469366Reviewed-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Commit-Queue: Sean Topping <seantopping@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817150}
parent 974b58c8
...@@ -13,6 +13,8 @@ BufferAffinityTracker::BufferAffinityTracker(size_t nb_buffers) { ...@@ -13,6 +13,8 @@ BufferAffinityTracker::BufferAffinityTracker(size_t nb_buffers) {
resize(0); resize(0);
} }
BufferAffinityTracker::~BufferAffinityTracker() = default;
void BufferAffinityTracker::resize(size_t nb_buffers) { void BufferAffinityTracker::resize(size_t nb_buffers) {
base::AutoLock lock(lock_); base::AutoLock lock(lock_);
...@@ -47,4 +49,4 @@ base::Optional<size_t> BufferAffinityTracker::get_buffer_for_id( ...@@ -47,4 +49,4 @@ base::Optional<size_t> BufferAffinityTracker::get_buffer_for_id(
return v4l2_id; return v4l2_id;
} }
} // namespace media } // namespace media
\ No newline at end of file
...@@ -27,6 +27,7 @@ namespace media { ...@@ -27,6 +27,7 @@ namespace media {
class BufferAffinityTracker { class BufferAffinityTracker {
public: public:
explicit BufferAffinityTracker(size_t nb_buffers); explicit BufferAffinityTracker(size_t nb_buffers);
~BufferAffinityTracker();
size_t nb_buffers() const { return nb_buffers_; } size_t nb_buffers() const { return nb_buffers_; }
// Resize this tracker and reset its state. // Resize this tracker and reset its state.
void resize(size_t nb_buffers); void resize(size_t nb_buffers);
......
...@@ -1204,7 +1204,7 @@ base::Optional<V4L2WritableBufferRef> V4L2Queue::GetFreeBufferForFrame( ...@@ -1204,7 +1204,7 @@ base::Optional<V4L2WritableBufferRef> V4L2Queue::GetFreeBufferForFrame(
} }
gfx::GenericSharedMemoryId id; gfx::GenericSharedMemoryId id;
if (auto gmb = frame.GetGpuMemoryBuffer()) { if (auto* gmb = frame.GetGpuMemoryBuffer()) {
id = gmb->GetId(); id = gmb->GetId();
} else if (frame.HasDmaBufs()) { } else if (frame.HasDmaBufs()) {
id = gfx::GenericSharedMemoryId(frame.DmabufFds()[0].get()); id = gfx::GenericSharedMemoryId(frame.DmabufFds()[0].get());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment