[{"id":12553,"web_url":"https://patchwork.libcamera.org/comment/12553/","msgid":"<20200916152550.GJ1850958@oden.dyn.berto.se>","date":"2020-09-16T15:25:50","subject":"Re: [libcamera-devel] [PATCH 6/7] qcam: viewfinder_gl: Merge the\n\tsemi-planar UV and VU shaders","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2020-09-16 17:52:53 +0300, Laurent Pinchart wrote:\n> Use macros to select the U and V pattern, to avoid code duplication\n> between the two semi-planar shaders.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nThis is really neat!\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\n> ---\n>  ...YUV_2_planes_UV.frag => YUV_2_planes.frag} |  9 +++++-\n>  src/qcam/assets/shader/YUV_2_planes_VU.frag   | 32 -------------------\n>  src/qcam/assets/shader/shaders.qrc            |  3 +-\n>  src/qcam/viewfinder_gl.cpp                    | 18 +++++++----\n>  4 files changed, 21 insertions(+), 41 deletions(-)\n>  rename src/qcam/assets/shader/{YUV_2_planes_UV.frag => YUV_2_planes.frag} (68%)\n>  delete mode 100644 src/qcam/assets/shader/YUV_2_planes_VU.frag\n> \n> diff --git a/src/qcam/assets/shader/YUV_2_planes_UV.frag b/src/qcam/assets/shader/YUV_2_planes.frag\n> similarity index 68%\n> rename from src/qcam/assets/shader/YUV_2_planes_UV.frag\n> rename to src/qcam/assets/shader/YUV_2_planes.frag\n> index 081caea9214b..125f1c850a33 100644\n> --- a/src/qcam/assets/shader/YUV_2_planes_UV.frag\n> +++ b/src/qcam/assets/shader/YUV_2_planes.frag\n> @@ -2,7 +2,7 @@\n>  /*\n>   * Copyright (C) 2020, Linaro\n>   *\n> - * YUV_2_planes_UV.frag - Fragment shader code for NV12, NV16 and NV24 formats\n> + * YUV_2_planes.frag - Fragment shader code for NV12, NV16 and NV24 formats\n>   */\n>  \n>  #ifdef GL_ES\n> @@ -24,8 +24,15 @@ void main(void)\n>  \t);\n>  \n>  \tyuv.x = texture2D(tex_y, textureOut).r - 0.063;\n> +#if defined(YUV_PATTERN_UV)\n>  \tyuv.y = texture2D(tex_u, textureOut).r - 0.500;\n>  \tyuv.z = texture2D(tex_u, textureOut).g - 0.500;\n> +#elif defined(YUV_PATTERN_VU)\n> +\tyuv.y = texture2D(tex_u, textureOut).g - 0.500;\n> +\tyuv.z = texture2D(tex_u, textureOut).r - 0.500;\n> +#else\n> +#error Invalid pattern\n> +#endif\n>  \n>  \trgb = yuv2rgb_bt601_mat * yuv;\n>  \tgl_FragColor = vec4(rgb, 1.0);\n> diff --git a/src/qcam/assets/shader/YUV_2_planes_VU.frag b/src/qcam/assets/shader/YUV_2_planes_VU.frag\n> deleted file mode 100644\n> index f4a5a5ac46c0..000000000000\n> --- a/src/qcam/assets/shader/YUV_2_planes_VU.frag\n> +++ /dev/null\n> @@ -1,32 +0,0 @@\n> -/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> -/*\n> - * Copyright (C) 2020, Linaro\n> - *\n> - * YUV_2_planes_VU.frag - Fragment shader code for NV21, NV61 and NV42 formats\n> - */\n> -\n> -#ifdef GL_ES\n> -precision mediump float;\n> -#endif\n> -\n> -varying vec2 textureOut;\n> -uniform sampler2D tex_y;\n> -uniform sampler2D tex_u;\n> -\n> -void main(void)\n> -{\n> -\tvec3 yuv;\n> -\tvec3 rgb;\n> -\tmat3 yuv2rgb_bt601_mat = mat3(\n> -\t\tvec3(1.164,  1.164, 1.164),\n> -\t\tvec3(0.000, -0.392, 2.017),\n> -\t\tvec3(1.596, -0.813, 0.000)\n> -\t);\n> -\n> -\tyuv.x = texture2D(tex_y, textureOut).r - 0.063;\n> -\tyuv.y = texture2D(tex_u, textureOut).g - 0.500;\n> -\tyuv.z = texture2D(tex_u, textureOut).r - 0.500;\n> -\n> -\trgb = yuv2rgb_bt601_mat * yuv;\n> -\tgl_FragColor = vec4(rgb, 1.0);\n> -}\n> diff --git a/src/qcam/assets/shader/shaders.qrc b/src/qcam/assets/shader/shaders.qrc\n> index 533396d1fb28..7010d8433c9b 100644\n> --- a/src/qcam/assets/shader/shaders.qrc\n> +++ b/src/qcam/assets/shader/shaders.qrc\n> @@ -2,8 +2,7 @@\n>  <!DOCTYPE RCC><RCC version=\"1.0\">\n>  <qresource>\n>  \t<file>YUV.vert</file>\n> -\t<file>YUV_2_planes_UV.frag</file>\n> -\t<file>YUV_2_planes_VU.frag</file>\n> +\t<file>YUV_2_planes.frag</file>\n>  \t<file>YUV_3_planes.frag</file>\n>  </qresource>\n>  </RCC>\n> diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\n> index 7cb5fb63656f..b8a4827267c3 100644\n> --- a/src/qcam/viewfinder_gl.cpp\n> +++ b/src/qcam/viewfinder_gl.cpp\n> @@ -106,32 +106,38 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n>  \tcase libcamera::formats::NV12:\n>  \t\thorzSubSample_ = 2;\n>  \t\tvertSubSample_ = 2;\n> -\t\tfragmentShaderFile_ = \":YUV_2_planes_UV.frag\";\n> +\t\tfragmentShaderDefines_.append(\"#define YUV_PATTERN_UV\");\n> +\t\tfragmentShaderFile_ = \":YUV_2_planes.frag\";\n>  \t\tbreak;\n>  \tcase libcamera::formats::NV21:\n>  \t\thorzSubSample_ = 2;\n>  \t\tvertSubSample_ = 2;\n> -\t\tfragmentShaderFile_ = \":YUV_2_planes_VU.frag\";\n> +\t\tfragmentShaderDefines_.append(\"#define YUV_PATTERN_VU\");\n> +\t\tfragmentShaderFile_ = \":YUV_2_planes.frag\";\n>  \t\tbreak;\n>  \tcase libcamera::formats::NV16:\n>  \t\thorzSubSample_ = 2;\n>  \t\tvertSubSample_ = 1;\n> -\t\tfragmentShaderFile_ = \":YUV_2_planes_UV.frag\";\n> +\t\tfragmentShaderDefines_.append(\"#define YUV_PATTERN_UV\");\n> +\t\tfragmentShaderFile_ = \":YUV_2_planes.frag\";\n>  \t\tbreak;\n>  \tcase libcamera::formats::NV61:\n>  \t\thorzSubSample_ = 2;\n>  \t\tvertSubSample_ = 1;\n> -\t\tfragmentShaderFile_ = \":YUV_2_planes_VU.frag\";\n> +\t\tfragmentShaderDefines_.append(\"#define YUV_PATTERN_VU\");\n> +\t\tfragmentShaderFile_ = \":YUV_2_planes.frag\";\n>  \t\tbreak;\n>  \tcase libcamera::formats::NV24:\n>  \t\thorzSubSample_ = 1;\n>  \t\tvertSubSample_ = 1;\n> -\t\tfragmentShaderFile_ = \":YUV_2_planes_UV.frag\";\n> +\t\tfragmentShaderDefines_.append(\"#define YUV_PATTERN_UV\");\n> +\t\tfragmentShaderFile_ = \":YUV_2_planes.frag\";\n>  \t\tbreak;\n>  \tcase libcamera::formats::NV42:\n>  \t\thorzSubSample_ = 1;\n>  \t\tvertSubSample_ = 1;\n> -\t\tfragmentShaderFile_ = \":YUV_2_planes_VU.frag\";\n> +\t\tfragmentShaderDefines_.append(\"#define YUV_PATTERN_VU\");\n> +\t\tfragmentShaderFile_ = \":YUV_2_planes.frag\";\n>  \t\tbreak;\n>  \tcase libcamera::formats::YUV420:\n>  \t\thorzSubSample_ = 2;\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 27DA6BF01C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 16 Sep 2020 15:25:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BD3DA62E75;\n\tWed, 16 Sep 2020 17:25:52 +0200 (CEST)","from mail-lf1-x143.google.com (mail-lf1-x143.google.com\n\t[IPv6:2a00:1450:4864:20::143])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9079D61E2B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 16 Sep 2020 17:25:51 +0200 (CEST)","by mail-lf1-x143.google.com with SMTP id y11so7437021lfl.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 16 Sep 2020 08:25:51 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\ty196sm4960402lfa.0.2020.09.16.08.25.50\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 16 Sep 2020 08:25:50 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"b1Dl1jT6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=8kyYpAjzSbufm1TiNeajAGKdLgRV0B9IVKSECVXyyYQ=;\n\tb=b1Dl1jT6gqVKbo5KuzFDXEdQ7X67cA/K7uHvqhxNGFfiOFejuMbUWkhgFQpiQzfE0p\n\tR/k8mKJ/RA/hrEuWR8nMbdF8hep5+ER1T6hWbRAeLn4f/JxZ/WYbkER9q2d6LRB3pyIO\n\tu0Ve3tv5lifA6SoWAVz8siz/cGUoz9ZVKqci6pnpIVrEgENGtYQ30kuPba7rn6Ya9SRT\n\tBWrbiiRonUSAg6JJUylzUxV53bn9K4c35TQKzQcSSJu/tSVnR46YuwgYoobEQuxTpD/F\n\t+9bw+pHMndVBIonocyAU8xWNcd648NFxmIHDUn4cpPJxNroOS1FpMwdgDFWogd795gq5\n\t4Nrg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=8kyYpAjzSbufm1TiNeajAGKdLgRV0B9IVKSECVXyyYQ=;\n\tb=Ix47uWdw7zbfi5EpCk3KIqEH8yiAxaB56QR+Fv2yOl9DIVpRzJflms8+lSGmXcRMIL\n\tL5kncw0xK6S+Z7xQAm5NKYpqHsZSSlT/iEqQdbLr2KKJ9d8K7kU9qqWzK+p0DSrueUWS\n\tThduFpOrH3CCCnCwg9G36dQjtQ2anywhhVQab4i5RZjujo04vLiFOZSpCnGzaL/7duEI\n\tXWQwfWTpNmqMQebbc9q0A4ovgUXBfj47jqC1nEEBlxTgHcZdjyZOMwEptH0LGUV63b78\n\tI0Flye4tRFFCX0ixfVDDCdyDaqpbP7WxelCx8MyVoRXMGLDIoVOKeS0DdWFeL5qiFuGP\n\taQWA==","X-Gm-Message-State":"AOAM530nlL4vC/3Ua1r46xqh4hOt+T1jB2SlTJGGiju8QE5jSGjdDmEw\n\tpTx/xETPBm3WHqdW824ycIzusQ==","X-Google-Smtp-Source":"ABdhPJxRRq5kkrSMUbNgHgTEQUZQpQcuZC4ymmwJoR+vqE4vHunKQlTeitFCudzkCT9bJQwHV3HGLQ==","X-Received":"by 2002:ac2:5541:: with SMTP id l1mr8962857lfk.89.1600269950968; \n\tWed, 16 Sep 2020 08:25:50 -0700 (PDT)","Date":"Wed, 16 Sep 2020 17:25:50 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Message-ID":"<20200916152550.GJ1850958@oden.dyn.berto.se>","References":"<20200916145254.1644-1-laurent.pinchart@ideasonboard.com>\n\t<20200916145254.1644-7-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200916145254.1644-7-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 6/7] qcam: viewfinder_gl: Merge the\n\tsemi-planar UV and VU shaders","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]