From patchwork Tue Sep 8 15:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 9544 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 0ABEDBDB1C for ; Tue, 8 Sep 2020 15:08:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C9CD362C30; Tue, 8 Sep 2020 17:08:11 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="KRbd+D+x"; dkim-atps=neutral Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 40D6A6056C for ; Tue, 8 Sep 2020 17:08:10 +0200 (CEST) Received: by mail-lf1-x142.google.com with SMTP id u8so3834227lff.1 for ; Tue, 08 Sep 2020 08:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jtE0KsyuA8WbherHcyBIpGQCxZtUBIpqvnIW7vCbHPw=; b=KRbd+D+xJMuxvi6r1yFdJskxc0IBSlkqDXWq12KlQkMQQBrkXKiO2/fCfGuN70KAdC MdWw8kSjbuYH6q6/QntvmaF9kFWHY7QlEX3KvpQgBpoe6J4DFEPuVWL7CX1kzuRt/RCa ysjRKTF+ppwhfkLfpcD89hsnLk/9FIreVFYWQfBgrMdm6uxQzrXwOSaMtfcHzRlDREtK v1z6DvZH+d3/xT0Hc2ifhbsq+WX6uVh0BNJ47K6JjBr4+s90y/DTT+z25N40s8KRsUVk ElILLD6MFIpI8iptx3fwunsNScAVpwE1wh3eCBzvWaa0xfaTqH4FN+qK9oLidh5IYOyb 4sJg== 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:in-reply-to :references; bh=jtE0KsyuA8WbherHcyBIpGQCxZtUBIpqvnIW7vCbHPw=; b=pNeS1ZzOyd76cHWVJOPdDlWoOJr1ir8bGPHQFUr443p/z6oT+m0s6e/3XaiXTKfVUO dAN5f3+aqLlvU4ENBBL8ho+oKg9UuU1ocfaXg8U3bOLmA2EmVs8eBQNV1+2AKiAoPab5 dmv1EQAz7wWEgWeGmE59SQ/uwWez2oCvKdsNb7Agb9SHP9XR+fLMDKmO1k337qAxQ1Mq EA3zjMGeRsaS1pUK4RWRnZAEPdOcmzEnAl/PHoF4ldp1zcjFgHlAATYPav4TNKUeHweV 42cGAoh4WFs5x9ENLv2p7xg+W4Tp4rAxr6+yLkoFBgkapttMgOKjy/kaVRQqZdXEueNI ROYA== X-Gm-Message-State: AOAM530MrvGqstlyElRBwirOGTqWIt3HMNyK5jZnuzlQ5fz6zfFN4DZd JjH02WnxL0x+7FG89nG1Ce6I8/6Wy9Jdyw== X-Google-Smtp-Source: ABdhPJwWa74NrKwieKk1Ydj5/JY9X3+tCixDa5kvP1oPf3DR6+opQgbiRd8bZlmv9WBDXu4NAPBirA== X-Received: by 2002:a19:d11:: with SMTP id 17mr12889863lfn.0.1599577689084; Tue, 08 Sep 2020 08:08:09 -0700 (PDT) Received: from localhost.localdomain (37-144-159-139.broadband.corbina.ru. [37.144.159.139]) by smtp.googlemail.com with ESMTPSA id f19sm10614121lfs.85.2020.09.08.08.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 08:08:08 -0700 (PDT) From: Andrey Konovalov To: libcamera-devel@lists.libcamera.org Date: Tue, 8 Sep 2020 18:07:38 +0300 Message-Id: <20200908150739.1552-2-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200908150739.1552-1-andrey.konovalov@linaro.org> References: <20200908150739.1552-1-andrey.konovalov@linaro.org> Subject: [libcamera-devel] [RFC PATCH v2 1/2] qcam: format_converter: put parameters of different formats into union X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" As the number of supported formats in the converter grows, having the format-specific parameters in a union makes the code cleaner, and save some amount of memory. Signed-off-by: Andrey Konovalov --- src/qcam/format_converter.cpp | 133 ++++++++++++++++++---------------- src/qcam/format_converter.h | 37 ++++++---- 2 files changed, 92 insertions(+), 78 deletions(-) diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index 4b9722d..3481330 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -33,103 +33,103 @@ int FormatConverter::configure(const libcamera::PixelFormat &format, switch (format) { case libcamera::formats::NV12: formatFamily_ = NV; - horzSubSample_ = 2; - vertSubSample_ = 2; - nvSwap_ = false; + params_.nv.horzSubSample = 2; + params_.nv.vertSubSample = 2; + params_.nv.nvSwap = false; break; case libcamera::formats::NV21: formatFamily_ = NV; - horzSubSample_ = 2; - vertSubSample_ = 2; - nvSwap_ = true; + params_.nv.horzSubSample = 2; + params_.nv.vertSubSample = 2; + params_.nv.nvSwap = true; break; case libcamera::formats::NV16: formatFamily_ = NV; - horzSubSample_ = 2; - vertSubSample_ = 1; - nvSwap_ = false; + params_.nv.horzSubSample = 2; + params_.nv.vertSubSample = 1; + params_.nv.nvSwap = false; break; case libcamera::formats::NV61: formatFamily_ = NV; - horzSubSample_ = 2; - vertSubSample_ = 1; - nvSwap_ = true; + params_.nv.horzSubSample = 2; + params_.nv.vertSubSample = 1; + params_.nv.nvSwap = true; break; case libcamera::formats::NV24: formatFamily_ = NV; - horzSubSample_ = 1; - vertSubSample_ = 1; - nvSwap_ = false; + params_.nv.horzSubSample = 1; + params_.nv.vertSubSample = 1; + params_.nv.nvSwap = false; break; case libcamera::formats::NV42: formatFamily_ = NV; - horzSubSample_ = 1; - vertSubSample_ = 1; - nvSwap_ = true; + params_.nv.horzSubSample = 1; + params_.nv.vertSubSample = 1; + params_.nv.nvSwap = true; break; case libcamera::formats::RGB888: formatFamily_ = RGB; - r_pos_ = 2; - g_pos_ = 1; - b_pos_ = 0; - bpp_ = 3; + params_.rgb.r_pos = 2; + params_.rgb.g_pos = 1; + params_.rgb.b_pos = 0; + params_.rgb.bpp = 3; break; case libcamera::formats::BGR888: formatFamily_ = RGB; - r_pos_ = 0; - g_pos_ = 1; - b_pos_ = 2; - bpp_ = 3; + params_.rgb.r_pos = 0; + params_.rgb.g_pos = 1; + params_.rgb.b_pos = 2; + params_.rgb.bpp = 3; break; case libcamera::formats::ARGB8888: formatFamily_ = RGB; - r_pos_ = 2; - g_pos_ = 1; - b_pos_ = 0; - bpp_ = 4; + params_.rgb.r_pos = 2; + params_.rgb.g_pos = 1; + params_.rgb.b_pos = 0; + params_.rgb.bpp = 4; break; case libcamera::formats::RGBA8888: formatFamily_ = RGB; - r_pos_ = 3; - g_pos_ = 2; - b_pos_ = 1; - bpp_ = 4; + params_.rgb.r_pos = 3; + params_.rgb.g_pos = 2; + params_.rgb.b_pos = 1; + params_.rgb.bpp = 4; break; case libcamera::formats::ABGR8888: formatFamily_ = RGB; - r_pos_ = 0; - g_pos_ = 1; - b_pos_ = 2; - bpp_ = 4; + params_.rgb.r_pos = 0; + params_.rgb.g_pos = 1; + params_.rgb.b_pos = 2; + params_.rgb.bpp = 4; break; case libcamera::formats::BGRA8888: formatFamily_ = RGB; - r_pos_ = 1; - g_pos_ = 2; - b_pos_ = 3; - bpp_ = 4; + params_.rgb.r_pos = 1; + params_.rgb.g_pos = 2; + params_.rgb.b_pos = 3; + params_.rgb.bpp = 4; break; case libcamera::formats::VYUY: formatFamily_ = YUV; - y_pos_ = 1; - cb_pos_ = 2; + params_.yuv.y_pos = 1; + params_.yuv.cb_pos = 2; break; case libcamera::formats::YVYU: formatFamily_ = YUV; - y_pos_ = 0; - cb_pos_ = 3; + params_.yuv.y_pos = 0; + params_.yuv.cb_pos = 3; break; case libcamera::formats::UYVY: formatFamily_ = YUV; - y_pos_ = 1; - cb_pos_ = 0; + params_.yuv.y_pos = 1; + params_.yuv.cb_pos = 0; break; case libcamera::formats::YUYV: formatFamily_ = YUV; - y_pos_ = 0; - cb_pos_ = 1; + params_.yuv.y_pos = 0; + params_.yuv.cb_pos = 1; break; case libcamera::formats::MJPEG: @@ -178,18 +178,20 @@ static void yuv_to_rgb(int y, int u, int v, int *r, int *g, int *b) void FormatConverter::convertNV(const unsigned char *src, unsigned char *dst) { - unsigned int c_stride = width_ * (2 / horzSubSample_); - unsigned int c_inc = horzSubSample_ == 1 ? 2 : 0; - unsigned int cb_pos = nvSwap_ ? 1 : 0; - unsigned int cr_pos = nvSwap_ ? 0 : 1; + unsigned int c_stride = width_ * (2 / params_.nv.horzSubSample); + unsigned int c_inc = params_.nv.horzSubSample == 1 ? 2 : 0; + unsigned int cb_pos = params_.nv.nvSwap ? 1 : 0; + unsigned int cr_pos = params_.nv.nvSwap ? 0 : 1; const unsigned char *src_c = src + width_ * height_; int r, g, b; for (unsigned int y = 0; y < height_; y++) { const unsigned char *src_y = src + y * width_; - const unsigned char *src_cb = src_c + (y / vertSubSample_) * + const unsigned char *src_cb = src_c + + (y / params_.nv.vertSubSample) * c_stride + cb_pos; - const unsigned char *src_cr = src_c + (y / vertSubSample_) * + const unsigned char *src_cr = src_c + + (y / params_.nv.vertSubSample) * c_stride + cr_pos; for (unsigned int x = 0; x < width_; x += 2) { @@ -223,9 +225,9 @@ void FormatConverter::convertRGB(const unsigned char *src, unsigned char *dst) for (y = 0; y < height_; y++) { for (x = 0; x < width_; x++) { - r = src[bpp_ * x + r_pos_]; - g = src[bpp_ * x + g_pos_]; - b = src[bpp_ * x + b_pos_]; + r = src[params_.rgb.bpp * x + params_.rgb.r_pos]; + g = src[params_.rgb.bpp * x + params_.rgb.g_pos]; + b = src[params_.rgb.bpp * x + params_.rgb.b_pos]; dst[4 * x + 0] = b; dst[4 * x + 1] = g; @@ -233,7 +235,7 @@ void FormatConverter::convertRGB(const unsigned char *src, unsigned char *dst) dst[4 * x + 3] = 0xff; } - src += width_ * bpp_; + src += width_ * params_.rgb.bpp; dst += width_ * 4; } } @@ -246,16 +248,18 @@ void FormatConverter::convertYUV(const unsigned char *src, unsigned char *dst) unsigned int cr_pos; int r, g, b, y, cr, cb; - cr_pos = (cb_pos_ + 2) % 4; + cr_pos = (params_.yuv.cb_pos + 2) % 4; src_stride = width_ * 2; dst_stride = width_ * 4; for (src_y = 0, dst_y = 0; dst_y < height_; src_y++, dst_y++) { for (src_x = 0, dst_x = 0; dst_x < width_; ) { - cb = src[src_y * src_stride + src_x * 4 + cb_pos_]; + cb = src[src_y * src_stride + src_x * 4 + + params_.yuv.cb_pos]; cr = src[src_y * src_stride + src_x * 4 + cr_pos]; - y = src[src_y * src_stride + src_x * 4 + y_pos_]; + y = src[src_y * src_stride + src_x * 4 + + params_.yuv.y_pos]; yuv_to_rgb(y, cb, cr, &r, &g, &b); dst[dst_y * dst_stride + 4 * dst_x + 0] = b; dst[dst_y * dst_stride + 4 * dst_x + 1] = g; @@ -263,7 +267,8 @@ void FormatConverter::convertYUV(const unsigned char *src, unsigned char *dst) dst[dst_y * dst_stride + 4 * dst_x + 3] = 0xff; dst_x++; - y = src[src_y * src_stride + src_x * 4 + y_pos_ + 2]; + y = src[src_y * src_stride + src_x * 4 + + params_.yuv.y_pos + 2]; yuv_to_rgb(y, cb, cr, &r, &g, &b); dst[dst_y * dst_stride + 4 * dst_x + 0] = b; dst[dst_y * dst_stride + 4 * dst_x + 1] = g; diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h index e389b24..c53fa28 100644 --- a/src/qcam/format_converter.h +++ b/src/qcam/format_converter.h @@ -40,20 +40,29 @@ private: enum FormatFamily formatFamily_; - /* NV parameters */ - unsigned int horzSubSample_; - unsigned int vertSubSample_; - bool nvSwap_; - - /* RGB parameters */ - unsigned int bpp_; - unsigned int r_pos_; - unsigned int g_pos_; - unsigned int b_pos_; - - /* YUV parameters */ - unsigned int y_pos_; - unsigned int cb_pos_; + union { + /* NV parameters */ + struct nv_params { + unsigned int horzSubSample; + unsigned int vertSubSample; + bool nvSwap; + } nv; + + /* RGB parameters */ + struct rgb_params { + unsigned int bpp; + unsigned int r_pos; + unsigned int g_pos; + unsigned int b_pos; + } rgb; + + /* YUV parameters */ + struct yuv_params { + unsigned int y_pos; + unsigned int cb_pos; + } yuv; + } params_; + }; #endif /* __QCAM_FORMAT_CONVERTER_H__ */