[libcamera-devel] libcamera: CameraSensorProperties: Sort entries
diff mbox series

Message ID 20210724234855.30910-1-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • [libcamera-devel] libcamera: CameraSensorProperties: Sort entries
Related show

Commit Message

Laurent Pinchart July 24, 2021, 11:48 p.m. UTC 
Keep entries sorted by sensor name to ensure the file stays readable.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/camera_sensor_properties.cpp | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

Comments

Paul Elder July 26, 2021, 4:20 a.m. UTC | #1 
Hi Laurent,

On Sun, Jul 25, 2021 at 02:48:55AM +0300, Laurent Pinchart wrote:
> Keep entries sorted by sensor name to ensure the file stays readable.

This was bugging me for a while :)

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

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

> ---
>  src/libcamera/camera_sensor_properties.cpp | 28 +++++++++++-----------
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/camera_sensor_properties.cpp
> index c6f383e0ac03..4ee45e72e8a8 100644
> --- a/src/libcamera/camera_sensor_properties.cpp
> +++ b/src/libcamera/camera_sensor_properties.cpp
> @@ -72,24 +72,17 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
>  				{ 4, controls::draft::TestPatternModePn9 },
>  			},
>  		} },
> -		{ "ov5670", {
> -			.unitCellSize = { 1120, 1120 },
> -			.testPatternModes = {
> -				{ 0, controls::draft::TestPatternModeOff },
> -				{ 1, controls::draft::TestPatternModeColorBars },
> -			},
> -		} },
> -		{ "ov13858", {
> -			.unitCellSize = { 1120, 1120 },
> -			.testPatternModes =  {
> -				{ 0, controls::draft::TestPatternModeOff },
> -				{ 1, controls::draft::TestPatternModeColorBars },
> -			},
> -		} },
>  		{ "ov5647", {
>  			.unitCellSize = { 1400, 1400 },
>  			.testPatternModes = {},
>  		} },
> +		{ "ov5670", {
> +			.unitCellSize = { 1120, 1120 },
> +			.testPatternModes = {
> +				{ 0, controls::draft::TestPatternModeOff },
> +				{ 1, controls::draft::TestPatternModeColorBars },
> +			},
> +		} },
>  		{ "ov5693", {
>  			.unitCellSize = { 1400, 1400 },
>  			.testPatternModes = {
> @@ -116,6 +109,13 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
>  				 */
>  			},
>  		} },
> +		{ "ov13858", {
> +			.unitCellSize = { 1120, 1120 },
> +			.testPatternModes =  {
> +				{ 0, controls::draft::TestPatternModeOff },
> +				{ 1, controls::draft::TestPatternModeColorBars },
> +			},
> +		} },
>  	};
>  
>  	const auto it = sensorProps.find(sensor);
> -- 
> Regards,
> 
> Laurent Pinchart
>
Jacopo Mondi July 26, 2021, 8:12 a.m. UTC | #2 
Hi Laurent,

On Mon, Jul 26, 2021 at 01:20:03PM +0900, paul.elder@ideasonboard.com wrote:
> Hi Laurent,
>
> On Sun, Jul 25, 2021 at 02:48:55AM +0300, Laurent Pinchart wrote:
> > Keep entries sorted by sensor name to ensure the file stays readable.
>
> This was bugging me for a while :)
>
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>

Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks
  j

>
> > ---
> >  src/libcamera/camera_sensor_properties.cpp | 28 +++++++++++-----------
> >  1 file changed, 14 insertions(+), 14 deletions(-)
> >
> > diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/camera_sensor_properties.cpp
> > index c6f383e0ac03..4ee45e72e8a8 100644
> > --- a/src/libcamera/camera_sensor_properties.cpp
> > +++ b/src/libcamera/camera_sensor_properties.cpp
> > @@ -72,24 +72,17 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
> >  				{ 4, controls::draft::TestPatternModePn9 },
> >  			},
> >  		} },
> > -		{ "ov5670", {
> > -			.unitCellSize = { 1120, 1120 },
> > -			.testPatternModes = {
> > -				{ 0, controls::draft::TestPatternModeOff },
> > -				{ 1, controls::draft::TestPatternModeColorBars },
> > -			},
> > -		} },
> > -		{ "ov13858", {
> > -			.unitCellSize = { 1120, 1120 },
> > -			.testPatternModes =  {
> > -				{ 0, controls::draft::TestPatternModeOff },
> > -				{ 1, controls::draft::TestPatternModeColorBars },
> > -			},
> > -		} },
> >  		{ "ov5647", {
> >  			.unitCellSize = { 1400, 1400 },
> >  			.testPatternModes = {},
> >  		} },
> > +		{ "ov5670", {
> > +			.unitCellSize = { 1120, 1120 },
> > +			.testPatternModes = {
> > +				{ 0, controls::draft::TestPatternModeOff },
> > +				{ 1, controls::draft::TestPatternModeColorBars },
> > +			},
> > +		} },
> >  		{ "ov5693", {
> >  			.unitCellSize = { 1400, 1400 },
> >  			.testPatternModes = {
> > @@ -116,6 +109,13 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
> >  				 */
> >  			},
> >  		} },
> > +		{ "ov13858", {
> > +			.unitCellSize = { 1120, 1120 },
> > +			.testPatternModes =  {
> > +				{ 0, controls::draft::TestPatternModeOff },
> > +				{ 1, controls::draft::TestPatternModeColorBars },
> > +			},
> > +		} },
> >  	};
> >
> >  	const auto it = sensorProps.find(sensor);
> > --
> > Regards,
> >
> > Laurent Pinchart
> >
Laurent Pinchart July 26, 2021, 8:48 a.m. UTC | #3 
Hi Paul,

On Mon, Jul 26, 2021 at 01:20:03PM +0900, paul.elder@ideasonboard.com wrote:
> On Sun, Jul 25, 2021 at 02:48:55AM +0300, Laurent Pinchart wrote:
> > Keep entries sorted by sensor name to ensure the file stays readable.
> 
> This was bugging me for a while :)

You could have sent a patch ;-)

Thanks for the review.

> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
> 
> > ---
> >  src/libcamera/camera_sensor_properties.cpp | 28 +++++++++++-----------
> >  1 file changed, 14 insertions(+), 14 deletions(-)
> > 
> > diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/camera_sensor_properties.cpp
> > index c6f383e0ac03..4ee45e72e8a8 100644
> > --- a/src/libcamera/camera_sensor_properties.cpp
> > +++ b/src/libcamera/camera_sensor_properties.cpp
> > @@ -72,24 +72,17 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
> >  				{ 4, controls::draft::TestPatternModePn9 },
> >  			},
> >  		} },
> > -		{ "ov5670", {
> > -			.unitCellSize = { 1120, 1120 },
> > -			.testPatternModes = {
> > -				{ 0, controls::draft::TestPatternModeOff },
> > -				{ 1, controls::draft::TestPatternModeColorBars },
> > -			},
> > -		} },
> > -		{ "ov13858", {
> > -			.unitCellSize = { 1120, 1120 },
> > -			.testPatternModes =  {
> > -				{ 0, controls::draft::TestPatternModeOff },
> > -				{ 1, controls::draft::TestPatternModeColorBars },
> > -			},
> > -		} },
> >  		{ "ov5647", {
> >  			.unitCellSize = { 1400, 1400 },
> >  			.testPatternModes = {},
> >  		} },
> > +		{ "ov5670", {
> > +			.unitCellSize = { 1120, 1120 },
> > +			.testPatternModes = {
> > +				{ 0, controls::draft::TestPatternModeOff },
> > +				{ 1, controls::draft::TestPatternModeColorBars },
> > +			},
> > +		} },
> >  		{ "ov5693", {
> >  			.unitCellSize = { 1400, 1400 },
> >  			.testPatternModes = {
> > @@ -116,6 +109,13 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
> >  				 */
> >  			},
> >  		} },
> > +		{ "ov13858", {
> > +			.unitCellSize = { 1120, 1120 },
> > +			.testPatternModes =  {
> > +				{ 0, controls::draft::TestPatternModeOff },
> > +				{ 1, controls::draft::TestPatternModeColorBars },
> > +			},
> > +		} },
> >  	};
> >  
> >  	const auto it = sensorProps.find(sensor);

Patch
diff mbox series 

diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/camera_sensor_properties.cpp
index c6f383e0ac03..4ee45e72e8a8 100644
--- a/src/libcamera/camera_sensor_properties.cpp
+++ b/src/libcamera/camera_sensor_properties.cpp
@@ -72,24 +72,17 @@  const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
 				{ 4, controls::draft::TestPatternModePn9 },
 			},
 		} },
-		{ "ov5670", {
-			.unitCellSize = { 1120, 1120 },
-			.testPatternModes = {
-				{ 0, controls::draft::TestPatternModeOff },
-				{ 1, controls::draft::TestPatternModeColorBars },
-			},
-		} },
-		{ "ov13858", {
-			.unitCellSize = { 1120, 1120 },
-			.testPatternModes =  {
-				{ 0, controls::draft::TestPatternModeOff },
-				{ 1, controls::draft::TestPatternModeColorBars },
-			},
-		} },
 		{ "ov5647", {
 			.unitCellSize = { 1400, 1400 },
 			.testPatternModes = {},
 		} },
+		{ "ov5670", {
+			.unitCellSize = { 1120, 1120 },
+			.testPatternModes = {
+				{ 0, controls::draft::TestPatternModeOff },
+				{ 1, controls::draft::TestPatternModeColorBars },
+			},
+		} },
 		{ "ov5693", {
 			.unitCellSize = { 1400, 1400 },
 			.testPatternModes = {
@@ -116,6 +109,13 @@  const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
 				 */
 			},
 		} },
+		{ "ov13858", {
+			.unitCellSize = { 1120, 1120 },
+			.testPatternModes =  {
+				{ 0, controls::draft::TestPatternModeOff },
+				{ 1, controls::draft::TestPatternModeColorBars },
+			},
+		} },
 	};
 
 	const auto it = sensorProps.find(sensor);