From patchwork Mon Oct 19 22:49:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Mader X-Patchwork-Id: 28528 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 3A3B8C3302 for ; Mon, 19 Oct 2026 22:49:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D6C8168ED8; Tue, 20 Oct 2026 00:49:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=robert.mader@collabora.com header.b="R6WzVbqS"; dkim-atps=neutral Received: from sender6-op-o11.zoho.com (sender6-op-o11.zoho.com [165.173.180.11]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7894B68EC5 for ; Tue, 20 Oct 2026 00:49:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; t=1792450153; cv=none; d=zohomail.com; s=zohoarc; b=eaYFygspproHjzURqx/0ikkMug58eIpgBtdrQJT0TfVEVEgj13ApjzwxC08iWXZB9W6TIdt9vbAgX0xUbH6WJQUalca4Y13jXMuNumO1e4mGeOt0rNRrn8hhSoiC1OUNqWtRcyP03VHuutk6aBU3utit0ihGGu7K+R5Cm2ayFko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1792450153; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=JfdEegt3QtlD3UF+WLdbrdfyGIRcopJMG5G3e/0vsZw=; b=VHgZGialpEVaMo/013N2ji1M/3WW1yrvgZldlFzXtSKMVFBnW48vzFN+rZFYJsESaHlJ3dOMCHd6g3G7ZYaXO6aqMgCUqPwd1pHfHA/TfQ5fREGENZ6A5lVkeG8HPWdQNqIm6YYb+PmGL1Ny2sBiuQvHOS/Vh+ODdMSJy9gbOwI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=robert.mader@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1792450153; s=zohomail; d=collabora.com; i=robert.mader@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=JfdEegt3QtlD3UF+WLdbrdfyGIRcopJMG5G3e/0vsZw=; b=R6WzVbqSW8HcRLHzSGWKCLa0ZturUJBhVOe1wGKVOJ9+dk2Mp4Ph+vzLSR6CAmie BVJg3YQAsdRbXOtuIDPw1TBxS9hzdbn0wu2FkzUaJu6mam8K7wV5zl2MOg3ap0YCMBP lyPC97e7FI1yofVfe31VfjAtQ8UATHZskzafY6uc= Received: by smtp.zohomail.com with SMTPS id 1792450152594158.94720025833453; Mon, 19 Oct 2026 15:49:12 -0700 (PDT) From: Robert Mader To: libcamera-devel@lists.libcamera.org Cc: Robert Mader Subject: [PATCH v5 2/3] virtual: Use stride helper for final buffer copy Date: Tue, 20 Oct 2026 00:49:01 +0200 Message-ID: <20261019224902.177382-3-robert.mader@collabora.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261019224902.177382-1-robert.mader@collabora.com> References: <20261019224902.177382-1-robert.mader@collabora.com> MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" In preparation of supporting more output formats, compute the stride based on the used format instead of hardcoding it. Signed-off-by: Robert Mader Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/virtual/image_frame_generator.cpp | 7 +++++-- .../pipeline/virtual/test_pattern_generator.cpp | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/virtual/image_frame_generator.cpp b/src/libcamera/pipeline/virtual/image_frame_generator.cpp index 1853bddeca27..5caad8b72763 100644 --- a/src/libcamera/pipeline/virtual/image_frame_generator.cpp +++ b/src/libcamera/pipeline/virtual/image_frame_generator.cpp @@ -12,9 +12,11 @@ #include #include +#include #include #include "libcamera/internal/dma_buf_allocator.h" +#include "libcamera/internal/formats.h" #include "libcamera/internal/mapped_framebuffer.h" #include "libyuv/convert.h" @@ -141,6 +143,7 @@ int ImageFrameGenerator::generateFrame(const Size &size, const FrameBuffer *buff MappedFrameBuffer::MapFlag::Write); const auto &planes = mappedFrameBuffer.planes(); + const PixelFormatInfo &info = PixelFormatInfo::info(formats::NV12); /* Loop only around the number of images available */ frameIndex_ %= imageFrameDatas_.size(); @@ -148,8 +151,8 @@ int ImageFrameGenerator::generateFrame(const Size &size, const FrameBuffer *buff /* Write the scaledY and scaledUV to the mapped frame buffer */ libyuv::NV12Copy(scaledFrameDatas_[frameIndex_].Y.get(), size.width, scaledFrameDatas_[frameIndex_].UV.get(), size.width, - planes[0].data(), size.width, - planes[1].data(), size.width, + planes[0].data(), info.stride(size.width, 0), + planes[1].data(), info.stride(size.width, 1), size.width, size.height); /* Proceed to the next image every 4 frames */ diff --git a/src/libcamera/pipeline/virtual/test_pattern_generator.cpp b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp index 7b53e8b32327..571be4fbf65d 100644 --- a/src/libcamera/pipeline/virtual/test_pattern_generator.cpp +++ b/src/libcamera/pipeline/virtual/test_pattern_generator.cpp @@ -11,7 +11,9 @@ #include +#include #include "libcamera/internal/dma_buf_allocator.h" +#include "libcamera/internal/formats.h" #include "libcamera/internal/mapped_framebuffer.h" #include @@ -58,13 +60,16 @@ int TestPatternGenerator::generateFrame(const Size &size, MappedFrameBuffer::MapFlag::Write); const auto &planes = mappedFrameBuffer.planes(); + const PixelFormatInfo &info = PixelFormatInfo::info(formats::NV12); rotateLeft1Column(size, template_.get()); /* Convert the template_ to the frame buffer */ int ret = libyuv::ARGBToNV12(template_.get(), size.width * kARGBSize, - planes[0].data(), size.width, - planes[1].data(), size.width, + planes[0].data(), + info.stride(size.width, 0), + planes[1].data(), + info.stride(size.width, 1), size.width, size.height); if (ret != 0) LOG(Virtual, Error) << "ARGBToNV12() failed with " << ret;