[libcamera-devel] libcamera: FrameBuffer: Correct Buffer references

Message ID 20200729120212.499788-1-kieran.bingham@ideasonboard.com
State Accepted
Commit 000257a707fed083c6b9ed95d9497ba709cf6f30
Headers show
Series
  • [libcamera-devel] libcamera: FrameBuffer: Correct Buffer references
Related show

Commit Message

Kieran Bingham July 29, 2020, 12:02 p.m. UTC
Update the remaining (capitalised) Buffer references to the new FrameBuffer
object that they refer to.

Lower-case 'buffer' terms are kept, as a generic reference to a buffer
rather than the specific type 'FrameBuffer'.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/libcamera/buffer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Niklas Söderlund July 29, 2020, 12:12 p.m. UTC | #1
Hi Kieran,

Thanks for your work.

On 2020-07-29 13:02:12 +0100, Kieran Bingham wrote:
> Update the remaining (capitalised) Buffer references to the new FrameBuffer
> object that they refer to.
> 
> Lower-case 'buffer' terms are kept, as a generic reference to a buffer
> rather than the specific type 'FrameBuffer'.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/libcamera/buffer.cpp | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp
> index 0fe12ab93b58..500d1cf791e7 100644
> --- a/src/libcamera/buffer.cpp
> +++ b/src/libcamera/buffer.cpp
> @@ -174,11 +174,11 @@ FrameBuffer::FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie)
>   * The intended callers of this method are buffer completion handlers that
>   * need to associate a buffer to the request it belongs to.
>   *
> - * A Buffer is associated to a request by Request::addBuffer() and the
> + * A FrameBuffer is associated to a request by Request::addBuffer() and the
>   * association is valid until the buffer completes. The returned request
>   * pointer is valid only during that interval.
>   *
> - * \return The Request the Buffer belongs to, or nullptr if the buffer is
> + * \return The Request the FrameBuffer belongs to, or nullptr if the buffer is
>   * not associated with a request
>   */
>  
> @@ -224,7 +224,7 @@ FrameBuffer::FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie)
>  
>  /**
>   * \brief Copy the contents from another buffer
> - * \param[in] src Buffer to copy
> + * \param[in] src FrameBuffer to copy
>   *
>   * Copy the buffer contents and metadata from \a src to this buffer. The
>   * destination FrameBuffer shall have the same number of planes as the source
> -- 
> 2.25.1
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp
index 0fe12ab93b58..500d1cf791e7 100644
--- a/src/libcamera/buffer.cpp
+++ b/src/libcamera/buffer.cpp
@@ -174,11 +174,11 @@  FrameBuffer::FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie)
  * The intended callers of this method are buffer completion handlers that
  * need to associate a buffer to the request it belongs to.
  *
- * A Buffer is associated to a request by Request::addBuffer() and the
+ * A FrameBuffer is associated to a request by Request::addBuffer() and the
  * association is valid until the buffer completes. The returned request
  * pointer is valid only during that interval.
  *
- * \return The Request the Buffer belongs to, or nullptr if the buffer is
+ * \return The Request the FrameBuffer belongs to, or nullptr if the buffer is
  * not associated with a request
  */
 
@@ -224,7 +224,7 @@  FrameBuffer::FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie)
 
 /**
  * \brief Copy the contents from another buffer
- * \param[in] src Buffer to copy
+ * \param[in] src FrameBuffer to copy
  *
  * Copy the buffer contents and metadata from \a src to this buffer. The
  * destination FrameBuffer shall have the same number of planes as the source