From patchwork Wed Jan 13 13:08:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10854 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 73362BD80C for ; Wed, 13 Jan 2021 13:09:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 41678680D8; Wed, 13 Jan 2021 14:09:01 +0100 (CET) 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="XQT/3gBS"; dkim-atps=neutral Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 659386054E for ; Wed, 13 Jan 2021 14:08:59 +0100 (CET) Received: by mail-lf1-x135.google.com with SMTP id s26so2639248lfc.8 for ; Wed, 13 Jan 2021 05:08:59 -0800 (PST) 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=veWN98fZcbakbj7dt4jyzAprw0las+6G3CgLk/aoTdY=; b=XQT/3gBSiBbzUppVRAn1Ov1/Us8bjxgmJdoJ16ZYNOGtaS33jzMosINuF88gwfbvRl cGxfRRuHL1VYu/4j3FC+1eBKTqwolaVqxTJMPHgpZ3YqJ/cMYv9RZf8qYx5LUiYT++N9 YUkbyKJSaiM0x6/mM8M3ZjDQ7C5hdjcEyqbl//elCLcCPXQU0+HxZMsTuwAVeqzNTTgT 3VYQfttgpRXdKhvc9JLxZKi/LOTzrblj1jDXqtPtSgJke7GP55WvJuX5XmPcxK+CXneK UWae6TCypiQglb4xPkwrs3ULLjfb+yTDrTPXfDTUaHkTDPFy4kvNQSR6o1Cqn3q9JPGt 9EuQ== 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=veWN98fZcbakbj7dt4jyzAprw0las+6G3CgLk/aoTdY=; b=KgbpXL8iyndy32VQykY/bSPKCeqbRrdOgewH1f7wDQ6YdktJ11vDtF9Gg3FyMtc+6l DIUVNZvCuDKAFB2NxXWAwVN2QcTCHapOK242yOFM0DY1jWgpVQ/UVYyu+VueZR5Tgk0+ b265RYQMETrtW533j7x0lH+uoqeaz/dl9hGBCTr0TMD0+jqZWgUpbdVj6x2CwDyMEgwf N9pIu1o+CvTc1QWeuEZw4X6DyV/ANT8wEKblf9sst5zbWq54Gkhv06eOvnC3aajTZVE1 FesUNeAl+ukjRk8/JUhkU1O9y6XXU2zH64Vcy8VZGoCX3iOK/9AkPEdgMOGnB1hLDkBv /BYw== X-Gm-Message-State: AOAM5313rePX+zmxhUD4IOjnBIbuv6im13frooDiQT8KuUYeFO6ROyzE M0B5eW05G4n0N0bKIheu+ePngIjEOc80fw== X-Google-Smtp-Source: ABdhPJxAaKjMxShOg+CM7ho0389jOL9sNIVoNZXi/3yVo+aIcHqWMBL2YqB1rXaVpt3nzhbC33fWmQ== X-Received: by 2002:a19:94f:: with SMTP id 76mr813380lfj.642.1610543338425; Wed, 13 Jan 2021 05:08:58 -0800 (PST) Received: from localhost.localdomain ([85.249.43.69]) by smtp.googlemail.com with ESMTPSA id d2sm179477ljg.39.2021.01.13.05.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 05:08:57 -0800 (PST) From: Andrey Konovalov To: libcamera-devel@lists.libcamera.org, laurent.pinchart@ideasonboard.com Date: Wed, 13 Jan 2021 16:08:31 +0300 Message-Id: <20210113130832.15549-4-andrey.konovalov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210113130832.15549-1-andrey.konovalov@linaro.org> References: <20210113130832.15549-1-andrey.konovalov@linaro.org> Subject: [libcamera-devel] [PATCH 3/4] qcam: viewfinder_gl: RAW10P: handle the padding bytes properly 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: , Cc: morgan@casual-effects.com MIME-Version: 1.0 Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The texture size must account for the padding bytes which may be present at the end of the lines in the frame. Signed-off-by: Andrey Konovalov --- src/qcam/viewfinder_gl.cpp | 11 +++++++---- src/qcam/viewfinder_gl.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qcam/viewfinder_gl.cpp b/src/qcam/viewfinder_gl.cpp index b324d77f..9db536a6 100644 --- a/src/qcam/viewfinder_gl.cpp +++ b/src/qcam/viewfinder_gl.cpp @@ -111,6 +111,10 @@ void ViewFinderGL::render(libcamera::FrameBuffer *buffer, MappedBuffer *map) renderComplete(buffer_); data_ = static_cast(map->memory); + /* + * \todo Get the stride from the buffer instead of computing it naively + */ + stride_ = buffer->metadata().planes[0].bytesused / size_.height(); update(); buffer_ = buffer; } @@ -594,14 +598,13 @@ void ViewFinderGL::doRender() /* * Packed raw Bayer 10-bit formats are stored in GL_RED texture. * The texture width is 10/8 of the image width. - * TODO: account for padding bytes at the end of the line. */ glActiveTexture(GL_TEXTURE0); configureTexture(*textures_[0]); glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, - size_.width() * 5 / 4, + stride_, size_.height(), 0, GL_RED, @@ -611,12 +614,12 @@ void ViewFinderGL::doRender() shaderProgram_.setUniformValue(textureUniformBayerFirstRed_, firstRed_); shaderProgram_.setUniformValue(textureUniformSize_, - size_.width() * 5 / 4, + stride_, size_.height(), size_.width(), size_.height()); shaderProgram_.setUniformValue(textureUniformStep_, - 1.0f / (size_.width() * 5 / 4 - 1), + 1.0f / (stride_ - 1), 1.0f / (size_.height() - 1)); break; diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h index 337718e3..49f8364a 100644 --- a/src/qcam/viewfinder_gl.h +++ b/src/qcam/viewfinder_gl.h @@ -66,6 +66,7 @@ private: libcamera::FrameBuffer *buffer_; libcamera::PixelFormat format_; QSize size_; + int stride_; unsigned char *data_; /* Shaders */