From c2fdaf959334d145411c56a99dcd80a65a32ead4 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Mon, 28 Sep 2020 15:51:44 +0800 Subject: [PATCH] media: rockchip: ispp: scl add yuyv format Change-Id: I1e8e77927b01f437d5818c433753884a8f9efcc5 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/ispp/stream.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/ispp/stream.c b/drivers/media/platform/rockchip/ispp/stream.c index 62e0e8996a4a..4fd30bba5c48 100644 --- a/drivers/media/platform/rockchip/ispp/stream.c +++ b/drivers/media/platform/rockchip/ispp/stream.c @@ -114,7 +114,19 @@ static const struct capture_fmt scl_fmts[] = { .bpp = { 8 }, .cplanes = 1, .mplanes = 1, - .wr_fmt = FMT_YUV420, + .wr_fmt = FMT_YUV422, + }, { + .fourcc = V4L2_PIX_FMT_YUYV, + .bpp = { 16 }, + .cplanes = 1, + .mplanes = 1, + .wr_fmt = FMT_YC_SWAP | FMT_YUYV | FMT_YUV422, + }, { + .fourcc = V4L2_PIX_FMT_UYVY, + .bpp = { 16 }, + .cplanes = 1, + .mplanes = 1, + .wr_fmt = FMT_YUYV | FMT_YUV422, } }; @@ -1245,7 +1257,7 @@ static int limit_check_scl(struct rkispp_stream *stream, return ret; if (stream->id == STREAM_S0) { - if (*h == sdev->out_fmt.height || (forcc == V4L2_PIX_FMT_NV16)) + if (*h == sdev->out_fmt.height || (forcc != V4L2_PIX_FMT_NV12)) max_width = 3264; else max_width = 2080;