diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-07-12 21:13:57 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-07-14 16:00:39 +0300 |
| commit | a775234d6612a1fbd3bb586de4704883c1fcd817 (patch) | |
| tree | 7bdaf01b13b0726c650779c98b280266fdd4c889 | |
| parent | e8e80bfa8d6421057ad145f93659309586e1200f (diff) | |
libcamera: camera: Don't check buffer count before freeing buffers
There's no need to check if buffers have been allocated before freeing
them as the BufferPool::destroyBuffers() method is a no-op when no
buffers have been allocated. Document this fact explicitly, and remove
the buffer count check.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
| -rw-r--r-- | src/libcamera/buffer.cpp | 3 | ||||
| -rw-r--r-- | src/libcamera/camera.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp index d86278a8..c0a02094 100644 --- a/src/libcamera/buffer.cpp +++ b/src/libcamera/buffer.cpp @@ -311,6 +311,9 @@ void BufferPool::createBuffers(unsigned int count) /** * \brief Release all buffers from pool + * + * If no buffers have been created or if buffers have already been released no + * operation is performed. */ void BufferPool::destroyBuffers() { diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 094f1b63..810cb129 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -740,9 +740,6 @@ int Camera::freeBuffers() return -EACCES; for (Stream *stream : activeStreams_) { - if (!stream->bufferPool().count()) - continue; - /* * All mappings must be destroyed before buffers can be freed * by the V4L2 device that has allocated them. |