[libcamera-devel] [PATCH 1/2] android: cameraDevice: Factorize the code of validating camera3_capture_request

[Kieran Bingham]

On 01/04/2021 17:05, Jacopo Mondi wrote:
> Hi Hiro,
> On Fri, Apr 02, 2021 at 12:31:22AM +0900, Hirokazu Honda wrote:
>> CameraDevice::processCaptureRequest() checks the validness of a
>> provided camera3_capture_request. This factorizes the code in
>> order to add more validation to the request later.
>>
>> Signed-off-by: Hirokazu Honda <hiroh at chromium.org>
>> ---
>>  src/android/camera_device.cpp | 24 ++++++++++++++++--------
>>  1 file changed, 16 insertions(+), 8 deletions(-)
>>
>> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
>> index eb327978..48eb471d 100644
>> --- a/src/android/camera_device.cpp
>> +++ b/src/android/camera_device.cpp
>> @@ -256,6 +256,21 @@ void sortCamera3StreamConfigs(std::vector<Camera3StreamConfig> &unsortedConfigs,
>>  	unsortedConfigs = sortedConfigs;
>>  }
>>
>> +bool isValidRequest(camera3_capture_request_t *camera3Request)
>> +{
>> +	if (!camera3Request) {
>> +		LOG(HAL, Error) << "No capture request provided";
>> +		return false;
>> +	}
>> +
>> +	if (!camera3Request->num_output_buffers) {
>> +		LOG(HAL, Error) << "No output buffers provided";
>> +		return -EINVAL;
> 
> return false ?
> 
> With this fixed
> Reviewed-by: Jacopo Mondi <jacopo at jmondi.org>
> 

With that,

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

> Thanks
>    j
> 
>> +	}
>> +
>> +	return true;
>> +}
>> +
>>  } /* namespace */
>>
>>  /*
>> @@ -1785,15 +1800,8 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)
>>
>>  int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)
>>  {
>> -	if (!camera3Request) {
>> -		LOG(HAL, Error) << "No capture request provided";
>> -		return -EINVAL;
>> -	}
>> -
>> -	if (!camera3Request->num_output_buffers) {
>> -		LOG(HAL, Error) << "No output buffers provided";
>> +	if (isValidRequest(camera3Request))
>>  		return -EINVAL;
>> -	}
>>
>>  	/* Start the camera if that's the first request we handle. */
>>  	if (!running_) {
>> --
>> 2.31.0.291.g576ba9dcdaf-goog
>>
>> _______________________________________________
>> libcamera-devel mailing list
>> libcamera-devel at lists.libcamera.org
>> https://lists.libcamera.org/listinfo/libcamera-devel
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel at lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel
> 

-- 
Regards
--
Kieran