{"id":12450,"url":"https://patchwork.libcamera.org/api/patches/12450/?format=json","web_url":"https://patchwork.libcamera.org/patch/12450/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210527105511.447089-4-andrey.konovalov@linaro.org>","date":"2021-05-27T10:55:09","name":"[libcamera-devel,v2,3/5] qcam: viewfinder_gl: RAW10P: handle the padding bytes properly","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2a058bd182259bef32218f6c2248972e01400ab5","submitter":{"id":25,"url":"https://patchwork.libcamera.org/api/people/25/?format=json","name":"Andrey Konovalov","email":"andrey.konovalov@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12450/mbox/","series":[{"id":2086,"url":"https://patchwork.libcamera.org/api/series/2086/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2086","date":"2021-05-27T10:55:06","name":"qcam: viewfinder_gl: add RAW8, RAW10P and RAW12P formats","version":2,"mbox":"https://patchwork.libcamera.org/series/2086/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12450/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12450/checks/","tags":{},"headers":{"Return-Path":"","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 C9249C3203\n\tfor ;\n\tThu, 27 May 2021 10:55:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0447568930;\n\tThu, 27 May 2021 12:55:32 +0200 (CEST)","from mail-lj1-x231.google.com (mail-lj1-x231.google.com\n\t[IPv6:2a00:1450:4864:20::231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7F83768923\n\tfor ;\n\tThu, 27 May 2021 12:55:28 +0200 (CEST)","by mail-lj1-x231.google.com with SMTP id o8so268822ljp.0\n\tfor ;\n\tThu, 27 May 2021 03:55:28 -0700 (PDT)","from localhost.localdomain ([85.249.41.56])\n\tby smtp.googlemail.com with ESMTPSA id\n\th23sm170148lfc.52.2021.05.27.03.55.26\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 27 May 2021 03:55:26 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"r83vRxX1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=qAip27BP+CSOHYaYAUIBsQQCEYbNM1TjHaCu7Zmcni4=;\n\tb=r83vRxX1CYVmXaxL5WRtsgGfEFnQqMmvgIwVBEz35NmD3g/frGwVGkPY/DMbvq01gk\n\tLMJzQU0c8m5P3nE5xMVqu3cdh8Vjo0cmwhPqZRwFXpZBUkMuX74t/bOqLUFjIBxEuKes\n\t32JNNufNePFM05tHLmTQrWkbOIMtoFgrJmlreZB7dishoVsaHtfO9kHohsyi7cTgxODb\n\tz5PpU61P6IfSA+wx8qc8oBK0FIjQNOvurZJoT+74vZTI9wxaUOQCUD8Gas5gIHI2Jvtr\n\tuPuMMU26Oy5BFHtxg53YHdJekDVHMpUdH1gVWKVUvz14BThriAl9mYz6uqI9ei5ajD0j\n\tmcjw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=qAip27BP+CSOHYaYAUIBsQQCEYbNM1TjHaCu7Zmcni4=;\n\tb=ILtIi45yJC9WGsaUaSNs7gGn+OECKFRxmwYVrb2cBteVyCljhOGwu/yEAiYwbLqBEs\n\t9L+DCuAaaXP+2F/UF5mcZn21aolJmXTze6Z+OgFQ2GvNqC9fXHcpXPB+QPpzJ4J4kx51\n\tfXU5tg8mdAXRsXpzmGm3vfIzA3VNfiFQF/kNbFmnDHqnsKWQNMvqiw2mvBuoODyNZAR4\n\txpsYH8pYgKRHV+M06T0JGxjq9hpd65Ytu5hmUHyPSgZn8RA27EznoqLHsDAcp3Gw4B30\n\tmESwzUemGTmocQrqAOo6eqH/Nh7Qm2W6yl7avTbgvRlQXk01reYKM1Osir3lhxC0+Lr1\n\tBXNw==","X-Gm-Message-State":"AOAM531NFi7/W5Ym7LsWQE4sOaqvP8xw5ENgQgSqOMOV0rIZy0Uu79YO\n\tP/HASFS3D74GXsjKQCN5xIjgUGD9orw75A==","X-Google-Smtp-Source":"ABdhPJzF2B4pbHcYAiaDMIkLdFIQi6pZMf320MSbq/CShFlGs5NaZOi+8fkgbH+f2db7wbOGSbQRIA==","X-Received":"by 2002:a05:651c:3db:: with SMTP id\n\tf27mr2026396ljp.241.1622112927387; \n\tThu, 27 May 2021 03:55:27 -0700 (PDT)","From":"Andrey Konovalov ","To":"libcamera-devel@lists.libcamera.org,\n\tlaurent.pinchart@ideasonboard.com","Date":"Thu, 27 May 2021 13:55:09 +0300","Message-Id":"<20210527105511.447089-4-andrey.konovalov@linaro.org>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210527105511.447089-1-andrey.konovalov@linaro.org>","References":"<20210527105511.447089-1-andrey.konovalov@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 3/5] qcam: viewfinder_gl: RAW10P:\n\thandle the padding bytes properly","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"morgan@casual-effects.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The texture size must account for the padding bytes which may be present\nat the end of the lines in the frame.\n\nSigned-off-by: Andrey Konovalov \n---\n src/qcam/viewfinder_gl.cpp | 11 +++++++----\n src/qcam/viewfinder_gl.h | 1 +\n 2 files changed, 8 insertions(+), 4 deletions(-)","diff":"diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp\nindex b324d77f..9db536a6 100644\n--- a/src/qcam/viewfinder_gl.cpp\n+++ b/src/qcam/viewfinder_gl.cpp\n@@ -111,6 +111,10 @@ void ViewFinderGL::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)\n \t\trenderComplete(buffer_);\n \n \tdata_ = static_cast(map->memory);\n+\t/*\n+\t * \\todo Get the stride from the buffer instead of computing it naively\n+\t */\n+\tstride_ = buffer->metadata().planes[0].bytesused / size_.height();\n \tupdate();\n \tbuffer_ = buffer;\n }\n@@ -594,14 +598,13 @@ void ViewFinderGL::doRender()\n \t\t/*\n \t\t * Packed raw Bayer 10-bit formats are stored in GL_RED texture.\n \t\t * The texture width is 10/8 of the image width.\n-\t\t * TODO: account for padding bytes at the end of the line.\n \t\t */\n \t\tglActiveTexture(GL_TEXTURE0);\n \t\tconfigureTexture(*textures_[0]);\n \t\tglTexImage2D(GL_TEXTURE_2D,\n \t\t\t 0,\n \t\t\t GL_RED,\n-\t\t\t size_.width() * 5 / 4,\n+\t\t\t stride_,\n \t\t\t size_.height(),\n \t\t\t 0,\n \t\t\t GL_RED,\n@@ -611,12 +614,12 @@ void ViewFinderGL::doRender()\n \t\tshaderProgram_.setUniformValue(textureUniformBayerFirstRed_,\n \t\t\t\t\t firstRed_);\n \t\tshaderProgram_.setUniformValue(textureUniformSize_,\n-\t\t\t\t\t size_.width() * 5 / 4,\n+\t\t\t\t\t stride_,\n \t\t\t\t\t size_.height(),\n \t\t\t\t\t size_.width(),\n \t\t\t\t\t size_.height());\n \t\tshaderProgram_.setUniformValue(textureUniformStep_,\n-\t\t\t\t\t 1.0f / (size_.width() * 5 / 4 - 1),\n+\t\t\t\t\t 1.0f / (stride_ - 1),\n \t\t\t\t\t 1.0f / (size_.height() - 1));\n \t\tbreak;\n \ndiff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h\nindex 337718e3..49f8364a 100644\n--- a/src/qcam/viewfinder_gl.h\n+++ b/src/qcam/viewfinder_gl.h\n@@ -66,6 +66,7 @@ private:\n \tlibcamera::FrameBuffer *buffer_;\n \tlibcamera::PixelFormat format_;\n \tQSize size_;\n+\tint stride_;\n \tunsigned char *data_;\n \n \t/* Shaders */\n","prefixes":["libcamera-devel","v2","3/5"]}