[libcamera-devel,4/6] libcamera: pipeline: rkisp1: Add support for R8

Message ID 20200930200831.2066751-5-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • libcamera: pipeline: rkisp1: Refresh to match upstream
Related show

Commit Message

Niklas Söderlund Sept. 30, 2020, 8:08 p.m. UTC
Both the main and self path supports R8, list it as a supported format.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Paul Elder Oct. 1, 2020, 3:17 a.m. UTC | #1
On Wed, Sep 30, 2020 at 10:08:29PM +0200, Niklas Söderlund wrote:
> Both the main and self path supports R8, list it as a supported format.

s/supports/support

> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

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

> ---
>  src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
> index 277aa226fcd428be..ff995286073db2a3 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
> @@ -207,23 +207,25 @@ void RkISP1Path::stop()
>  namespace {
>  constexpr Size RKISP1_RSZ_MP_SRC_MIN{ 32, 16 };
>  constexpr Size RKISP1_RSZ_MP_SRC_MAX{ 4416, 3312 };
> -constexpr std::array<PixelFormat, 5> RKISP1_RSZ_MP_FORMATS{
> +constexpr std::array<PixelFormat, 6> RKISP1_RSZ_MP_FORMATS{
>  	formats::YUYV,
>  	formats::NV16,
>  	formats::NV61,
>  	formats::NV21,
>  	formats::NV12,
> -	/* \todo Add support for 8-bit greyscale to DRM formats */
> +	formats::R8,
> +	/* \todo Add support for RAW formats. */
>  };
>  
>  constexpr Size RKISP1_RSZ_SP_SRC_MIN{ 32, 16 };
>  constexpr Size RKISP1_RSZ_SP_SRC_MAX{ 1920, 1920 };
> -constexpr std::array<PixelFormat, 6> RKISP1_RSZ_SP_FORMATS{
> +constexpr std::array<PixelFormat, 7> RKISP1_RSZ_SP_FORMATS{
>  	formats::YUYV,
>  	formats::NV16,
>  	formats::NV61,
>  	formats::NV21,
>  	formats::NV12,
> +	formats::R8,
>  	formats::RGB565,
>  	/* \todo Add support for BGR888 */
>  };
> -- 
> 2.28.0
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
index 277aa226fcd428be..ff995286073db2a3 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
@@ -207,23 +207,25 @@  void RkISP1Path::stop()
 namespace {
 constexpr Size RKISP1_RSZ_MP_SRC_MIN{ 32, 16 };
 constexpr Size RKISP1_RSZ_MP_SRC_MAX{ 4416, 3312 };
-constexpr std::array<PixelFormat, 5> RKISP1_RSZ_MP_FORMATS{
+constexpr std::array<PixelFormat, 6> RKISP1_RSZ_MP_FORMATS{
 	formats::YUYV,
 	formats::NV16,
 	formats::NV61,
 	formats::NV21,
 	formats::NV12,
-	/* \todo Add support for 8-bit greyscale to DRM formats */
+	formats::R8,
+	/* \todo Add support for RAW formats. */
 };
 
 constexpr Size RKISP1_RSZ_SP_SRC_MIN{ 32, 16 };
 constexpr Size RKISP1_RSZ_SP_SRC_MAX{ 1920, 1920 };
-constexpr std::array<PixelFormat, 6> RKISP1_RSZ_SP_FORMATS{
+constexpr std::array<PixelFormat, 7> RKISP1_RSZ_SP_FORMATS{
 	formats::YUYV,
 	formats::NV16,
 	formats::NV61,
 	formats::NV21,
 	formats::NV12,
+	formats::R8,
 	formats::RGB565,
 	/* \todo Add support for BGR888 */
 };