[libcamera-devel] [PATCH v4 3/4] android: camera_device: Mark abortRequest() and notifyError() as const

[Laurent Pinchart]

On Wed, Sep 29, 2021 at 11:11:38PM +0530, Umang Jain wrote:
> Hi Laurent,
> 
> On 9/29/21 7:57 PM, Laurent Pinchart wrote:
> > Hi Umang,
> >
> > Thank you for the patch.
> >
> > On Wed, Sep 29, 2021 at 07:00:29PM +0530, Umang Jain wrote:
> >> abortRequest() and notifyError() do not access any members of
> >> CameraDevice hence, these functions can be const.
> > They both access callbacks_.
> 
> 
> Oops,
> 
> The commit message should be updated to:
> 
>      abortRequest() and notifyError do not modify any members of 
> CameraDevice,
>      hence, these functions can be const.

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> >> Signed-off-by: Umang Jain <umang.jain at ideasonboard.com>
> >> ---
> >>   src/android/camera_device.cpp | 4 ++--
> >>   src/android/camera_device.h   | 4 ++--
> >>   2 files changed, 4 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> >> index e815f7a0..45350563 100644
> >> --- a/src/android/camera_device.cpp
> >> +++ b/src/android/camera_device.cpp
> >> @@ -860,7 +860,7 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)
> >>   	return 0;
> >>   }
> >>   
> >> -void CameraDevice::abortRequest(camera3_capture_request_t *request)
> >> +void CameraDevice::abortRequest(camera3_capture_request_t *request) const
> >>   {
> >>   	notifyError(request->frame_number, nullptr, CAMERA3_MSG_ERROR_REQUEST);
> >>   
> >> @@ -1258,7 +1258,7 @@ void CameraDevice::notifyShutter(uint32_t frameNumber, uint64_t timestamp)
> >>   }
> >>   
> >>   void CameraDevice::notifyError(uint32_t frameNumber, camera3_stream_t *stream,
> >> -			       camera3_error_msg_code code)
> >> +			       camera3_error_msg_code code) const
> >>   {
> >>   	camera3_notify_msg_t notify = {};
> >>   
> >> diff --git a/src/android/camera_device.h b/src/android/camera_device.h
> >> index 9ec510d5..85497921 100644
> >> --- a/src/android/camera_device.h
> >> +++ b/src/android/camera_device.h
> >> @@ -99,11 +99,11 @@ private:
> >>   	createFrameBuffer(const buffer_handle_t camera3buffer,
> >>   			  libcamera::PixelFormat pixelFormat,
> >>   			  const libcamera::Size &size);
> >> -	void abortRequest(camera3_capture_request_t *request);
> >> +	void abortRequest(camera3_capture_request_t *request) const;
> >>   	bool isValidRequest(camera3_capture_request_t *request) const;
> >>   	void notifyShutter(uint32_t frameNumber, uint64_t timestamp);
> >>   	void notifyError(uint32_t frameNumber, camera3_stream_t *stream,
> >> -			 camera3_error_msg_code code);
> >> +			 camera3_error_msg_code code) const;
> >>   	int processControls(Camera3RequestDescriptor *descriptor);
> >>   	std::unique_ptr<CameraMetadata> getResultMetadata(
> >>   		const Camera3RequestDescriptor &descriptor) const;

-- 
Regards,

Laurent Pinchart