{"id":20835,"url":"https://patchwork.libcamera.org/api/1.1/patches/20835/?format=json","web_url":"https://patchwork.libcamera.org/patch/20835/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240808102346.13065-6-naush@raspberrypi.com>","date":"2024-08-08T10:23:44","name":"[v1,5/7] pipeline: rpi: Track which ISP output is configured for a stream","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"1faf68da81ad833eb08d05daa90db6d107a4f124","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20835/mbox/","series":[{"id":4501,"url":"https://patchwork.libcamera.org/api/1.1/series/4501/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4501","date":"2024-08-08T10:23:39","name":"Raspberry Pi: Add controls::rpi::ScalerCrops","version":1,"mbox":"https://patchwork.libcamera.org/series/4501/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20835/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20835/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 D88B0C323E\n\tfor ;\n\tThu, 8 Aug 2024 10:24:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9453A6337F;\n\tThu, 8 Aug 2024 12:23:59 +0200 (CEST)","from mail-wm1-x334.google.com (mail-wm1-x334.google.com\n\t[IPv6:2a00:1450:4864:20::334])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D3A4B63398\n\tfor ;\n\tThu, 8 Aug 2024 12:23:49 +0200 (CEST)","by mail-wm1-x334.google.com with SMTP id\n\t5b1f17b1804b1-42816ca797fso5632385e9.2\n\tfor ;\n\tThu, 08 Aug 2024 03:23:49 -0700 (PDT)","from naush-laptop.pitowers.org ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-36d272290c2sm1404234f8f.92.2024.08.08.03.23.48\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 08 Aug 2024 03:23:48 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"JZgKu1iB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1723112629; x=1723717429;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=Yf16f/8809mBEiavgIV3g6OlgJ66hlAI1lvZj9UlDg4=;\n\tb=JZgKu1iBhAb6oL+1qE53nEtQoCzT7R28M84WLqdw/t6f3bB04/B5PKEwQXGceeiIl4\n\ta5lqV2gqooi2EU2AsHsbEOobRYFPwLfvKo/lSTuhEwDunDeic4gTzlANz5xykAISB3fX\n\ty1owLJfcs93ceeFKAmEElSqhteTnEv8YgFGL10HUGPCUogypXp890dfNM0hu2YHL35H1\n\tNGPDe99RVbVLuoQDDjehHqUoUDt2HnXtF6LTnKXdrLD8YkOoGCPshXsbkpLgyw0uR5vF\n\tlkVHCTofk1DZzysed5n6xmWvrDoKyp14evzeHT5h+rJ3KEGW3ipwL6mQdv9LC4YkUYTH\n\tfOXw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1723112629; x=1723717429;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=Yf16f/8809mBEiavgIV3g6OlgJ66hlAI1lvZj9UlDg4=;\n\tb=ENpkXew9q5JHzzV1JOZTSknnO5kdLbE9fuGKLmGPO07y7p2Vn41werL0qAdT6CHVp2\n\tTnCcidJUBhp2N7uqOy76dVMfW5OGlzq+rICQt6NO0uBgcrhf4Kd1tyBmU2h9hip1vlqY\n\t6YG9/DaFrReEBi1pAlFC76uakFfjQplZIz9U9WqLCIwj60VIX38sSjoKliaCI+dDq4So\n\t0aEZLmR0EEetMrIYD3K8miJzDqZI2IMqu4Kta2csSsg1vQgQTZovsgRTkvYczhJt6bZU\n\tvEA7tSwOeb8/2lt8ebfQcq00kWGHaKABkatWvgLmfMxCnOBhHke4t7JMDWrZ6ub8WBhg\n\tiNkw==","X-Gm-Message-State":"AOJu0Yxy1cC+y/WuB8wl4HMTObrhRGoRMj9Nuh6gDYdhjGaWz6sAo0L1\n\tDARkjXhLFyIpLOYGm0WWBKNJdSNU/ucANXclaUr2QfkFVlggOWgSRF4oMouG3/UfdHUs+wtq2iD\n\t4","X-Google-Smtp-Source":"AGHT+IHsyns4ohzuHV8hf8rQvX1bSTc60E5TDbh8+itCX3HD3Xg1GY/v/wQe6SzNPFaExcFrfpdwMA==","X-Received":"by 2002:a5d:50ca:0:b0:367:8ff0:e022 with SMTP id\n\tffacd0b85a97d-36d275830eamr957298f8f.63.1723112628875; \n\tThu, 08 Aug 2024 03:23:48 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Cc":"Naushir Patuck ","Subject":"[PATCH v1 5/7] pipeline: rpi: Track which ISP output is configured\n\tfor a stream","Date":"Thu, 8 Aug 2024 11:23:44 +0100","Message-Id":"<20240808102346.13065-6-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20240808102346.13065-1-naush@raspberrypi.com>","References":"<20240808102346.13065-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add a ispIndex field to CropParams that is used to track\nwhich ISP output (0/1) will be used for a given stream during\nconfiguration.\n\nTracking this information is required for an upcoming change where crop\nrectangles can be specified for each configured stream. Currently, the\nvalue is fixed to 0.\n\nSigned-off-by: Naushir Patuck \n---\n src/libcamera/pipeline/rpi/common/pipeline_base.h | 6 ++++--\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 2 +-\n 2 files changed, 5 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h\nindex 2bed905178bc..0ccfa4e82e86 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.h\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h\n@@ -135,8 +135,8 @@ public:\n \tIPACameraSensorInfo sensorInfo_;\n \n \tstruct CropParams {\n-\t\tCropParams(Rectangle ispCrop_, Size ispMinCropSize_)\n-\t\t\t: ispCrop(ispCrop_), ispMinCropSize(ispMinCropSize_)\n+\t\tCropParams(Rectangle ispCrop_, Size ispMinCropSize_, unsigned int ispIndex_)\n+\t\t\t: ispCrop(ispCrop_), ispMinCropSize(ispMinCropSize_), ispIndex(ispIndex_)\n \t\t{\n \t\t}\n \n@@ -148,6 +148,8 @@ public:\n \t\tRectangle ispCrop;\n \t\t/* Minimum crop size in ISP output pixels */\n \t\tSize ispMinCropSize;\n+\t\t/* Index of the ISP output channel for this crop */\n+\t\tunsigned int ispIndex;\n \t};\n \n \t/* Mapping of CropParams keyed by the stream index in CameraConfiguration */\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex d118252f02dd..ffc45653daf1 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -715,7 +715,7 @@ int Vc4CameraData::platformConfigure(const RPi::RPiCameraConfiguration *rpiConfi\n \tcropParams_.clear();\n \tcropParams_.emplace(std::piecewise_construct,\n \t\t\t std::forward_as_tuple(0),\n-\t\t\t std::forward_as_tuple(scaleIspCrop(ispCrop), testCrop.size()));\n+\t\t\t std::forward_as_tuple(scaleIspCrop(ispCrop), testCrop.size(), 0));\n \n \treturn 0;\n }\n","prefixes":["v1","5/7"]}