[libcamera-devel] android: camera_device: Simplify leftover CameraMetadata calls
diff mbox series

Message ID 20210617045713.1432573-1-paul.elder@ideasonboard.com
State Accepted
Commit b4c3db4c015082a2866e3e546b74d3b3de253d7f
Headers show
Series
  • [libcamera-devel] android: camera_device: Simplify leftover CameraMetadata calls
Related show

Commit Message

Paul Elder June 17, 2021, 4:57 a.m. UTC 
There were some CameraMetadata calls that were left in the old version.
Update them.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
---
 src/android/camera_device.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Laurent Pinchart June 17, 2021, 5:08 a.m. UTC | #1 
Hi Paul,

Thank you for the patch.

On Thu, Jun 17, 2021 at 01:57:13PM +0900, Paul Elder wrote:
> There were some CameraMetadata calls that were left in the old version.
> Update them.
> 
> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>

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

> ---
>  src/android/camera_device.cpp | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
> index b8df7817..11d5c21b 100644
> --- a/src/android/camera_device.cpp
> +++ b/src/android/camera_device.cpp
> @@ -931,7 +931,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
>  		{ 0, 1 }
>  	};
>  	staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_STEP,
> -				  aeCompensationStep, 1);
> +				  aeCompensationStep);
>  
>  	std::vector<uint8_t> availableAfModes = {
>  		ANDROID_CONTROL_AF_MODE_OFF,
> @@ -1153,7 +1153,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
>  	/* Statistics static metadata. */
>  	uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
>  	staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,
> -				  &faceDetectMode, 1);
> +				  faceDetectMode);
>  
>  	int32_t maxFaceCount = 0;
>  	staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,
> @@ -1273,8 +1273,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
>  			ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);
>  	}
>  	staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,
> -				  availableStreamConfigurations.data(),
> -				  availableStreamConfigurations.size());
> +				  availableStreamConfigurations);
>  
>  	std::vector<int64_t> availableStallDurations = {
>  		ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,
Hirokazu Honda June 17, 2021, 5:16 a.m. UTC | #2 
Hi Paul, thank you for the patch.

On Thu, Jun 17, 2021 at 2:08 PM Laurent Pinchart <
laurent.pinchart@ideasonboard.com> wrote:

> Hi Paul,
>
> Thank you for the patch.
>
> On Thu, Jun 17, 2021 at 01:57:13PM +0900, Paul Elder wrote:
> > There were some CameraMetadata calls that were left in the old version.
> > Update them.
> >
> > Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>


>
> > ---
> >  src/android/camera_device.cpp | 7 +++----
> >  1 file changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/src/android/camera_device.cpp
> b/src/android/camera_device.cpp
> > index b8df7817..11d5c21b 100644
> > --- a/src/android/camera_device.cpp
> > +++ b/src/android/camera_device.cpp
> > @@ -931,7 +931,7 @@ const camera_metadata_t
> *CameraDevice::getStaticMetadata()
> >               { 0, 1 }
> >       };
> >       staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_STEP,
> > -                               aeCompensationStep, 1);
> > +                               aeCompensationStep);
> >
> >       std::vector<uint8_t> availableAfModes = {
> >               ANDROID_CONTROL_AF_MODE_OFF,
> > @@ -1153,7 +1153,7 @@ const camera_metadata_t
> *CameraDevice::getStaticMetadata()
> >       /* Statistics static metadata. */
> >       uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
> >
>  staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,
> > -                               &faceDetectMode, 1);
> > +                               faceDetectMode);
> >
> >       int32_t maxFaceCount = 0;
> >       staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,
> > @@ -1273,8 +1273,7 @@ const camera_metadata_t
> *CameraDevice::getStaticMetadata()
> >
>  ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);
> >       }
> >
>  staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,
> > -                               availableStreamConfigurations.data(),
> > -                               availableStreamConfigurations.size());
> > +                               availableStreamConfigurations);
> >
> >       std::vector<int64_t> availableStallDurations = {
> >               ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920,
> 33333333,
>
> --
> Regards,
>
> Laurent Pinchart
>

Patch
diff mbox series 

diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index b8df7817..11d5c21b 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -931,7 +931,7 @@  const camera_metadata_t *CameraDevice::getStaticMetadata()
 		{ 0, 1 }
 	};
 	staticMetadata_->addEntry(ANDROID_CONTROL_AE_COMPENSATION_STEP,
-				  aeCompensationStep, 1);
+				  aeCompensationStep);
 
 	std::vector<uint8_t> availableAfModes = {
 		ANDROID_CONTROL_AF_MODE_OFF,
@@ -1153,7 +1153,7 @@  const camera_metadata_t *CameraDevice::getStaticMetadata()
 	/* Statistics static metadata. */
 	uint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;
 	staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,
-				  &faceDetectMode, 1);
+				  faceDetectMode);
 
 	int32_t maxFaceCount = 0;
 	staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,
@@ -1273,8 +1273,7 @@  const camera_metadata_t *CameraDevice::getStaticMetadata()
 			ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);
 	}
 	staticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,
-				  availableStreamConfigurations.data(),
-				  availableStreamConfigurations.size());
+				  availableStreamConfigurations);
 
 	std::vector<int64_t> availableStallDurations = {
 		ANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,