From patchwork Fri Sep 21 09:04:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 10609393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B65EE14BD for ; Fri, 21 Sep 2018 09:04:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A710B2DBD5 for ; Fri, 21 Sep 2018 09:04:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B0B82DBE4; Fri, 21 Sep 2018 09:04:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24BCC2DBD5 for ; Fri, 21 Sep 2018 09:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389481AbeIUOwK (ORCPT ); Fri, 21 Sep 2018 10:52:10 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:40230 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389022AbeIUOwK (ORCPT ); Fri, 21 Sep 2018 10:52:10 -0400 Received: by mail-ed1-f66.google.com with SMTP id j62-v6so10101722edd.7 for ; Fri, 21 Sep 2018 02:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=FvYqBTJJMssaaFogxQUs7/EHbwmK6iFJldCLwtY0evc=; b=qohUHoaVsIahDZnHBx1sAj2kTtMR+rarrVNR8L/L0Q+LiKayKSYxt9dpw/xFJRVBBc RRHl1g1/Oc9gtATEaqqxATnwrVykRvomUiCuBXLzJZ9X1WgI/UIOcB6xjyKMlAxnXR7a 6fXU9m/76KT/+dsVx2DjPc+HrTtKZ6ZV0AZl5i1REPoYyRfU4oe2DItAFdk9Ora/z9uy DhkMUano9ryMn80FBTvMTQqN9xDnvEHdGxSD4F93DJjWcQhI6ZePdNHB5EatnHjWMXa+ e/wYrYej+M6rJT90EiracEIIzhjbAfZSwAIm/IYZxoiD4R9S1N6iz9ZRKPzoPD5ok8nJ uWkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FvYqBTJJMssaaFogxQUs7/EHbwmK6iFJldCLwtY0evc=; b=IFhSztesrK/usDXokE+aVejZ83jjJa/4xmqLxvsY63vFySeBqL4Q6NViLx/iKTb/IB qjxjl8FRQTSJXphHtB92bvijdGslLxYj6q/V/MjS0Y1lRaqkPoBiPQhMEzAyHwPIWj2/ ms7aG4216C6WQ2F6NkYKudAMiaG3RE01XL4oZDCyshcKBmvV5sE+PjAl6gXcF3Wfjr/y +cDjxrQ2uP992lxYiTSFYJb/cDAJ8XRzAZ6Gd+hWb4vsrkZl3e5qrMO/puADOtvJxrZO zKYKh3VpKw/ZUZLAIkV3Io3R+2hgWyK1Gqp46IdhCLyMNh+SCQuGKZFASDjHdMVgUVx0 Q5YA== X-Gm-Message-State: APzg51CFkl10r/qK+csY1zTOYaY0AynaHc9/WyLYLM3pKl5N2TV+JeDe ucyAW7HcFUmzvdHiAz/WTTehv3TUSkM= X-Google-Smtp-Source: ANB0VdZJNeWBjQp+FewhU+mB0FF+3lyvBKWEPx34e6eR+vZvzbeQo9cMCPnoLgOjBGTqlUjnxNOzbw== X-Received: by 2002:a50:908d:: with SMTP id c13-v6mr10324066eda.179.1537520655037; Fri, 21 Sep 2018 02:04:15 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id i3-v6sm2283791eda.84.2018.09.21.02.04.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Sep 2018 02:04:13 -0700 (PDT) From: Ricardo Ribalda Delgado To: Hans de Goede , linux-media@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v2] libv4l: Add support for BAYER10P format conversion Date: Fri, 21 Sep 2018 11:04:12 +0200 Message-Id: <20180921090412.28044-1-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.18.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for 10 bit packet Bayer formats: -V4L2_PIX_FMT_SBGGR10P -V4L2_PIX_FMT_SGBRG10P -V4L2_PIX_FMT_SGRBG10P -V4L2_PIX_FMT_SRGGB10P These formats pack the 2 LSBs for every 4 pixels in an indeppendent byte. Signed-off-by: Ricardo Ribalda Delgado Acked-by: Hans de Goede --- lib/libv4lconvert/bayer.c | 21 ++++++++++++++++ lib/libv4lconvert/libv4lconvert-priv.h | 4 +++ lib/libv4lconvert/libv4lconvert.c | 35 ++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/lib/libv4lconvert/bayer.c b/lib/libv4lconvert/bayer.c index 4b70ddd9..11af6543 100644 --- a/lib/libv4lconvert/bayer.c +++ b/lib/libv4lconvert/bayer.c @@ -631,3 +631,24 @@ void v4lconvert_bayer_to_yuv420(const unsigned char *bayer, unsigned char *yuv, v4lconvert_border_bayer_line_to_y(bayer + stride, bayer, ydst, width, !start_with_green, !blue_line); } + +void v4lconvert_bayer10p_to_bayer8(unsigned char *bayer10p, + unsigned char *bayer8, int width, int height) +{ + unsigned long i; + unsigned long len = width * height; + + for (i = 0; i < len ; i += 4) { + /* + * Do not use a second loop, hoping that + * a clever compiler with understand the + * pattern and will optimize it. + */ + bayer8[0] = bayer10p[0]; + bayer8[1] = bayer10p[1]; + bayer8[2] = bayer10p[2]; + bayer8[3] = bayer10p[3]; + bayer10p += 5; + bayer8 += 4; + } +} diff --git a/lib/libv4lconvert/libv4lconvert-priv.h b/lib/libv4lconvert/libv4lconvert-priv.h index 9a467e10..3020a39e 100644 --- a/lib/libv4lconvert/libv4lconvert-priv.h +++ b/lib/libv4lconvert/libv4lconvert-priv.h @@ -264,6 +264,10 @@ void v4lconvert_bayer_to_bgr24(const unsigned char *bayer, void v4lconvert_bayer_to_yuv420(const unsigned char *bayer, unsigned char *yuv, int width, int height, const unsigned int stride, unsigned int src_pixfmt, int yvu); + +void v4lconvert_bayer10p_to_bayer8(unsigned char *bayer10p, + unsigned char *bayer8, int width, int height); + void v4lconvert_hm12_to_rgb24(const unsigned char *src, unsigned char *dst, int width, int height); diff --git a/lib/libv4lconvert/libv4lconvert.c b/lib/libv4lconvert/libv4lconvert.c index d666bd97..b3dbf5a0 100644 --- a/lib/libv4lconvert/libv4lconvert.c +++ b/lib/libv4lconvert/libv4lconvert.c @@ -133,6 +133,10 @@ static const struct v4lconvert_pixfmt supported_src_pixfmts[] = { { V4L2_PIX_FMT_SRGGB8, 8, 8, 8, 0 }, { V4L2_PIX_FMT_STV0680, 8, 8, 8, 1 }, { V4L2_PIX_FMT_SGRBG10, 16, 8, 8, 1 }, + { V4L2_PIX_FMT_SBGGR10P, 10, 8, 8, 1 }, + { V4L2_PIX_FMT_SGBRG10P, 10, 8, 8, 1 }, + { V4L2_PIX_FMT_SGRBG10P, 10, 8, 8, 1 }, + { V4L2_PIX_FMT_SRGGB10P, 10, 8, 8, 1 }, /* compressed bayer */ { V4L2_PIX_FMT_SPCA561, 0, 9, 9, 1 }, { V4L2_PIX_FMT_SN9C10X, 0, 9, 9, 1 }, @@ -687,6 +691,10 @@ static int v4lconvert_processing_needs_double_conversion( case V4L2_PIX_FMT_SGBRG8: case V4L2_PIX_FMT_SGRBG8: case V4L2_PIX_FMT_SRGGB8: + case V4L2_PIX_FMT_SBGGR10P: + case V4L2_PIX_FMT_SGBRG10P: + case V4L2_PIX_FMT_SGRBG10P: + case V4L2_PIX_FMT_SRGGB10P: case V4L2_PIX_FMT_STV0680: return 0; } @@ -979,6 +987,33 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data, } /* Raw bayer formats */ + case V4L2_PIX_FMT_SBGGR10P: + case V4L2_PIX_FMT_SGBRG10P: + case V4L2_PIX_FMT_SGRBG10P: + case V4L2_PIX_FMT_SRGGB10P: + if (src_size < ((width * height * 10)/8)) { + V4LCONVERT_ERR("short raw bayer10 data frame\n"); + errno = EPIPE; + result = -1; + } + switch (src_pix_fmt) { + case V4L2_PIX_FMT_SBGGR10P: + src_pix_fmt = V4L2_PIX_FMT_SBGGR8; + break; + case V4L2_PIX_FMT_SGBRG10P: + src_pix_fmt = V4L2_PIX_FMT_SGBRG8; + break; + case V4L2_PIX_FMT_SGRBG10P: + src_pix_fmt = V4L2_PIX_FMT_SGRBG8; + break; + case V4L2_PIX_FMT_SRGGB10P: + src_pix_fmt = V4L2_PIX_FMT_SRGGB8; + break; + } + v4lconvert_bayer10p_to_bayer8(src, src, width, height); + bytesperline = width; + + /* Fall-through*/ case V4L2_PIX_FMT_SBGGR8: case V4L2_PIX_FMT_SGBRG8: case V4L2_PIX_FMT_SGRBG8: