Patch Detail
Show a patch.
GET /api/patches/8752/?format=api
{ "id": 8752, "url": "https://patchwork.libcamera.org/api/patches/8752/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8752/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200713084727.232422-3-naush@raspberrypi.com>", "date": "2020-07-13T08:47:21", "name": "[libcamera-devel,2/9] libcamera: pipeline: ipa: raspberrypi: Rework drop frame signalling", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "4f94b8855a3211c77c5896d5999083980ab63f8d", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8752/mbox/", "series": [ { "id": 1100, "url": "https://patchwork.libcamera.org/api/series/1100/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1100", "date": "2020-07-13T08:47:18", "name": "Zero-copy RAW stream work", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1100/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8752/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8752/checks/", "tags": {}, "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 F36D2BD790\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 13 Jul 2020 08:48:02 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BE7F6605B2;\n\tMon, 13 Jul 2020 10:48:02 +0200 (CEST)", "from mail-wm1-x331.google.com (mail-wm1-x331.google.com\n\t[IPv6:2a00:1450:4864:20::331])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8AE87605B9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Jul 2020 10:48:00 +0200 (CEST)", "by mail-wm1-x331.google.com with SMTP id j18so12486114wmi.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Jul 2020 01:48:00 -0700 (PDT)", "from naushir-VirtualBox.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\tg14sm23203357wrm.93.2020.07.13.01.47.58\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 13 Jul 2020 01:47:58 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"mYfyydaV\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=WG8+s91IeG7E6WymCCDki2FQYSW7oGpUVoQKd4yQDQk=;\n\tb=mYfyydaVVzIxnn0Vwi7KuvO9+9dTYmcGm0dLNjdz829SQ1faABpMk2i6HVH8Fdg4yH\n\tUKX0NAMSVk8KBZsSYFzLcrM1DxnTwXvf3gbTuJfbi8VUVsl9M4ii5ksC6MO+InAPVYCW\n\tBBeNNUUlRx8yeE3XhPSPXBwQsQkzJT/yzqnW4HkFCdY9ZXeoE55AJm3RhrSq7WEPU2Ch\n\td2DZ/wQb2umukgv5fC5GULaRVyJ9Sdt/bNlpo6/lk2TCJIcVGzPA5SpOPzXbrHhKmRzM\n\twZEqm6rRrAtyBtGmEU8zM8pPRS3zR4rZ8rFiYl3yDIdVOd2hERO0grfdSyxi27FrJIIF\n\tvSdw==", "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=WG8+s91IeG7E6WymCCDki2FQYSW7oGpUVoQKd4yQDQk=;\n\tb=Ch7MvDB2ZyghHK1tuSezgzz4yKUUVDmqznCH5HCeY7RAE8XhC1IXHRGYu5a2QropaP\n\tSAR6pd8An6Z14DgovXKWdhwtLOpbpia5hlO2A1bGwdn7ZLV4rYunuTPdIHkaKWIglVx1\n\t+BGLMhfaK2FatSVzxGbY5UQqYIOKwLGEa62zlMDOWTkrY2yZmLAU1sOIxB7c4J2kSXTD\n\t5bvRAHbu4kBbjx/BaQFqIi/PGoEWpmLiwx+jv5UUikq0O5xpX5/FO+dvo97aMUyxkR5I\n\tuNAcQtbTJlF2kDXxHH+/SdUbQGN76oLTQxnXTIiPFklaurQ9hMv/hzz9ZbzRzlUmlgtE\n\tOHtw==", "X-Gm-Message-State": "AOAM533Byjx3vb1OC0A1tWWQmS8C59XLiW5kZN+icyVT1/vVcUmLAFbu\n\t617rUrleyhscQF4VbQ4X4cvYzyIlMhc=", "X-Google-Smtp-Source": "ABdhPJxEMbETdpTyfRi9kP7ABf0z6CB5Zkik8BA5yUA6sm180eFsHBUhz5tvQNhBqrDCqxRkkJTs/w==", "X-Received": "by 2002:a1c:9d96:: with SMTP id\n\tg144mr18924145wme.163.1594630079317; \n\tMon, 13 Jul 2020 01:47:59 -0700 (PDT)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 13 Jul 2020 09:47:21 +0100", "Message-Id": "<20200713084727.232422-3-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200713084727.232422-1-naush@raspberrypi.com>", "References": "<20200713084727.232422-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 2/9] libcamera: pipeline: ipa:\n\traspberrypi: Rework drop frame signalling", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The IPA now signals up front how many frames it wants the pipeline\nhandler to drop. This makes it easier to handle up-coming changes to the\nbuffer handling for import/export buffers.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n include/libcamera/ipa/raspberrypi.h | 2 +-\n src/ipa/raspberrypi/raspberrypi.cpp | 21 ++++++------\n .../pipeline/raspberrypi/raspberrypi.cpp | 33 +++++++++++--------\n 3 files changed, 32 insertions(+), 24 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h\nindex a18ce9a8..2dab2b00 100644\n--- a/include/libcamera/ipa/raspberrypi.h\n+++ b/include/libcamera/ipa/raspberrypi.h\n@@ -15,8 +15,8 @@ enum RPiOperations {\n \tRPI_IPA_ACTION_V4L2_SET_ISP,\n \tRPI_IPA_ACTION_STATS_METADATA_COMPLETE,\n \tRPI_IPA_ACTION_RUN_ISP,\n-\tRPI_IPA_ACTION_RUN_ISP_AND_DROP_FRAME,\n \tRPI_IPA_ACTION_SET_SENSOR_CONFIG,\n+\tRPI_IPA_ACTION_SET_DROP_FRAME_COUNT,\n \tRPI_IPA_ACTION_EMBEDDED_COMPLETE,\n \tRPI_IPA_EVENT_SIGNAL_STAT_READY,\n \tRPI_IPA_EVENT_SIGNAL_ISP_PREPARE,\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex b1f27861..f3568882 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -64,8 +64,8 @@ class IPARPi : public IPAInterface\n public:\n \tIPARPi()\n \t\t: lastMode_({}), controller_(), controllerInit_(false),\n-\t\t frame_count_(0), check_count_(0), hide_count_(0),\n-\t\t mistrust_count_(0), lsTableHandle_(0), lsTable_(nullptr)\n+\t\t frame_count_(0), check_count_(0), mistrust_count_(0),\n+\t\t lsTableHandle_(0), lsTable_(nullptr)\n \t{\n \t}\n \n@@ -132,8 +132,6 @@ private:\n \tuint64_t frame_count_;\n \t/* For checking the sequencing of Prepare/Process calls. */\n \tuint64_t check_count_;\n-\t/* How many frames the pipeline handler should hide, or \"drop\". */\n-\tunsigned int hide_count_;\n \t/* How many frames we should avoid running control algos on. */\n \tunsigned int mistrust_count_;\n \t/* LS table allocation passed in from the pipeline handler. */\n@@ -241,14 +239,19 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n \t */\n \tframe_count_ = 0;\n \tcheck_count_ = 0;\n+\tint drop_frame = 0;\n \tif (controllerInit_) {\n-\t\thide_count_ = helper_->HideFramesModeSwitch();\n+\t\tdrop_frame = helper_->HideFramesModeSwitch();\n \t\tmistrust_count_ = helper_->MistrustFramesModeSwitch();\n \t} else {\n-\t\thide_count_ = helper_->HideFramesStartup();\n+\t\tdrop_frame = helper_->HideFramesStartup();\n \t\tmistrust_count_ = helper_->MistrustFramesStartup();\n \t}\n \n+\tIPAOperationData op;\n+\top.operation = RPI_IPA_ACTION_SET_DROP_FRAME_COUNT;\n+\top.data.push_back(drop_frame);\n+\n \tstruct AgcStatus agcStatus;\n \t/* These zero values mean not program anything (unless overwritten). */\n \tagcStatus.shutter_time = 0.0;\n@@ -339,13 +342,11 @@ void IPARPi::processEvent(const IPAOperationData &event)\n \t\t * they are \"unreliable\".\n \t\t */\n \t\tprepareISP(embeddedbufferId);\n+\t\tframe_count_++;\n \n \t\t/* Ready to push the input buffer into the ISP. */\n \t\tIPAOperationData op;\n-\t\tif (++frame_count_ > hide_count_)\n-\t\t\top.operation = RPI_IPA_ACTION_RUN_ISP;\n-\t\telse\n-\t\t\top.operation = RPI_IPA_ACTION_RUN_ISP_AND_DROP_FRAME;\n+\t\top.operation = RPI_IPA_ACTION_RUN_ISP;\n \t\top.data = { bayerbufferId & RPiIpaMask::ID };\n \t\tqueueFrameAction.emit(0, op);\n \t\tbreak;\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 7bae72f9..8b6f578f 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -131,7 +131,7 @@ class RPiCameraData : public CameraData\n public:\n \tRPiCameraData(PipelineHandler *pipe)\n \t\t: CameraData(pipe), sensor_(nullptr), lsTable_(nullptr),\n-\t\t state_(State::Stopped), dropFrame_(false), ispOutputCount_(0)\n+\t\t state_(State::Stopped), dropFrameCount_(0), ispOutputCount_(0)\n \t{\n \t}\n \n@@ -168,8 +168,8 @@ public:\n \n \tCameraSensor *sensor_;\n \t/* Array of Unicam and ISP device streams and associated buffers/streams. */\n-\tRPiDevice<Unicam, 2> unicam_;\n-\tRPiDevice<Isp, 4> isp_;\n+\tRPi::RPiDevice<Unicam, 2> unicam_;\n+\tRPi::RPiDevice<Isp, 4> isp_;\n \t/* The vector below is just for convenience when iterating over all streams. */\n \tstd::vector<RPi::RPiStream *> streams_;\n \t/* Buffers passed to the IPA. */\n@@ -194,14 +194,15 @@ public:\n \tstd::queue<FrameBuffer *> embeddedQueue_;\n \tstd::deque<Request *> requestQueue_;\n \n+\tunsigned int dropFrameCount_;\n+\n private:\n \tvoid checkRequestCompleted();\n \tvoid tryRunPipeline();\n \tvoid tryFlushQueues();\n \tFrameBuffer *updateQueue(std::queue<FrameBuffer *> &q, uint64_t timestamp, V4L2VideoDevice *dev);\n \n-\tbool dropFrame_;\n-\tint ispOutputCount_;\n+\tunsigned int ispOutputCount_;\n };\n \n class RPiCameraConfiguration : public CameraConfiguration\n@@ -1058,6 +1059,11 @@ void RPiCameraData::queueFrameAction(unsigned int frame, const IPAOperationData\n \t\tgoto done;\n \t}\n \n+\tcase RPI_IPA_ACTION_SET_DROP_FRAME_COUNT: {\n+\t\tdropFrameCount_ = action.data[0];\n+\t\tgoto done;\n+\t}\n+\n \tcase RPI_IPA_ACTION_V4L2_SET_ISP: {\n \t\tControlList controls = action.controls[0];\n \t\tisp_[Isp::Input].dev()->setControls(&controls);\n@@ -1091,7 +1097,6 @@ void RPiCameraData::queueFrameAction(unsigned int frame, const IPAOperationData\n \t\tbreak;\n \t}\n \n-\tcase RPI_IPA_ACTION_RUN_ISP_AND_DROP_FRAME:\n \tcase RPI_IPA_ACTION_RUN_ISP: {\n \t\tunsigned int bufferId = action.data[0];\n \t\tFrameBuffer *buffer = unicam_[Unicam::Image].getBuffers()->at(bufferId).get();\n@@ -1100,7 +1105,6 @@ void RPiCameraData::queueFrameAction(unsigned int frame, const IPAOperationData\n \t\t\t\t<< \", timestamp: \" << buffer->metadata().timestamp;\n \n \t\tisp_[Isp::Input].dev()->queueBuffer(buffer);\n-\t\tdropFrame_ = (action.operation == RPI_IPA_ACTION_RUN_ISP_AND_DROP_FRAME) ? true : false;\n \t\tispOutputCount_ = 0;\n \t\tbreak;\n \t}\n@@ -1266,7 +1270,7 @@ void RPiCameraData::clearIncompleteRequests()\n void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream)\n {\n \tif (stream->isExternal()) {\n-\t\tif (!dropFrame_) {\n+\t\tif (!dropFrameCount_) {\n \t\t\tRequest *request = buffer->request();\n \t\t\tpipe_->completeBuffer(camera_, request, buffer);\n \t\t}\n@@ -1278,7 +1282,7 @@ void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream\n \t\t * simply memcpy to the Request buffer and requeue back to the\n \t\t * device.\n \t\t */\n-\t\tif (stream == &unicam_[Unicam::Image] && !dropFrame_) {\n+\t\tif (stream == &unicam_[Unicam::Image] && !dropFrameCount_) {\n \t\t\tconst Stream *rawStream = static_cast<const Stream *>(&isp_[Isp::Input]);\n \t\t\tRequest *request = requestQueue_.front();\n \t\t\tFrameBuffer *raw = request->findBuffer(const_cast<Stream *>(rawStream));\n@@ -1323,7 +1327,7 @@ void RPiCameraData::checkRequestCompleted()\n \t * If we are dropping this frame, do not touch the request, simply\n \t * change the state to IDLE when ready.\n \t */\n-\tif (!dropFrame_) {\n+\tif (!dropFrameCount_) {\n \t\tRequest *request = requestQueue_.front();\n \t\tif (request->hasPendingBuffers())\n \t\t\treturn;\n@@ -1342,10 +1346,13 @@ void RPiCameraData::checkRequestCompleted()\n \t * frame.\n \t */\n \tif (state_ == State::IpaComplete &&\n-\t ((ispOutputCount_ == 3 && dropFrame_) || requestCompleted)) {\n+\t ((ispOutputCount_ == 3 && dropFrameCount_) || requestCompleted)) {\n \t\tstate_ = State::Idle;\n-\t\tif (dropFrame_)\n-\t\t\tLOG(RPI, Info) << \"Dropping frame at the request of the IPA\";\n+\t\tif (dropFrameCount_) {\n+\t\t\tdropFrameCount_--;\n+\t\t\tLOG(RPI, Info) << \"Dropping frame at the request of the IPA ( \"\n+\t\t\t\t << dropFrameCount_ << \" left)\";\n+\t\t}\n \t}\n }\n \n", "prefixes": [ "libcamera-devel", "2/9" ] }