[libcamera-devel,v2,4/4] tests: camera-sensor: Test using invalid media bus format

Message ID 20190807204915.23942-5-niklas.soderlund@ragnatech.se
State Superseded
Headers show
Series
  • libcamera: Fix issues with vimc and Linux v5.2
Related show

Commit Message

Niklas Söderlund Aug. 7, 2019, 8:49 p.m. UTC
Linux commit b6c61a6c37317efd ("media: vimc: propagate pixel format in
the stream") changes the sensor in the vimc media graph to accept all
media bus format currently described in Linux. This prevents the
camera-sensor test case to verify that a supported media bus format is
selected from a list of defined formats, fix this my using an invalid
media bus format in the test case.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 test/camera-sensor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Laurent Pinchart Aug. 7, 2019, 9:18 p.m. UTC | #1
Hi Niklas,

Thank you for the patch.

On Wed, Aug 07, 2019 at 10:49:15PM +0200, Niklas Söderlund wrote:
> Linux commit b6c61a6c37317efd ("media: vimc: propagate pixel format in
> the stream") changes the sensor in the vimc media graph to accept all
> media bus format currently described in Linux. This prevents the
> camera-sensor test case to verify that a supported media bus format is
> selected from a list of defined formats, fix this my using an invalid

s/my using/by using/

> media bus format in the test case.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> ---
>  test/camera-sensor.cpp | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp
> index 092cbdd8111ce70d..9fe59cc98d79ccab 100644
> --- a/test/camera-sensor.cpp
> +++ b/test/camera-sensor.cpp
> @@ -83,7 +83,8 @@ protected:
>  			return TestFail;
>  		}
>  
> -		V4L2SubdeviceFormat format = sensor_->getFormat({ MEDIA_BUS_FMT_UYVY8_2X8,
> +		/* Use an invalid format and make sure it's not selected. */
> +		V4L2SubdeviceFormat format = sensor_->getFormat({ 0xdeadbeef,
>  								  MEDIA_BUS_FMT_SBGGR10_1X10,
>  								  MEDIA_BUS_FMT_BGR888_1X24 },
>  								Size(1024, 768));
Laurent Pinchart Aug. 7, 2019, 9:18 p.m. UTC | #2
On Thu, Aug 08, 2019 at 12:18:15AM +0300, Laurent Pinchart wrote:
> Hi Niklas,
> 
> Thank you for the patch.
> 
> On Wed, Aug 07, 2019 at 10:49:15PM +0200, Niklas Söderlund wrote:
> > Linux commit b6c61a6c37317efd ("media: vimc: propagate pixel format in
> > the stream") changes the sensor in the vimc media graph to accept all
> > media bus format currently described in Linux. This prevents the
> > camera-sensor test case to verify that a supported media bus format is
> > selected from a list of defined formats, fix this my using an invalid
> 
> s/my using/by using/

and

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

> > media bus format in the test case.
> > 
> > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> > ---
> >  test/camera-sensor.cpp | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp
> > index 092cbdd8111ce70d..9fe59cc98d79ccab 100644
> > --- a/test/camera-sensor.cpp
> > +++ b/test/camera-sensor.cpp
> > @@ -83,7 +83,8 @@ protected:
> >  			return TestFail;
> >  		}
> >  
> > -		V4L2SubdeviceFormat format = sensor_->getFormat({ MEDIA_BUS_FMT_UYVY8_2X8,
> > +		/* Use an invalid format and make sure it's not selected. */
> > +		V4L2SubdeviceFormat format = sensor_->getFormat({ 0xdeadbeef,
> >  								  MEDIA_BUS_FMT_SBGGR10_1X10,
> >  								  MEDIA_BUS_FMT_BGR888_1X24 },
> >  								Size(1024, 768));

Patch

diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp
index 092cbdd8111ce70d..9fe59cc98d79ccab 100644
--- a/test/camera-sensor.cpp
+++ b/test/camera-sensor.cpp
@@ -83,7 +83,8 @@  protected:
 			return TestFail;
 		}
 
-		V4L2SubdeviceFormat format = sensor_->getFormat({ MEDIA_BUS_FMT_UYVY8_2X8,
+		/* Use an invalid format and make sure it's not selected. */
+		V4L2SubdeviceFormat format = sensor_->getFormat({ 0xdeadbeef,
 								  MEDIA_BUS_FMT_SBGGR10_1X10,
 								  MEDIA_BUS_FMT_BGR888_1X24 },
 								Size(1024, 768));