From patchwork Wed Oct 19 09:01:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17628 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 B7CF6C327C for ; Wed, 19 Oct 2022 09:01:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 59BB962E45; Wed, 19 Oct 2022 11:01:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1666170082; bh=uLP2iD4+d5hVVPRB9S50teMWW/Bbnhk3D9hEpEiufrw=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=rzJHQLgcry5lyfe4YuKlAypa9mxdcOJemv3bQbYqJlhli6PribSm/xhN17GK7xCg0 T+jqk+rOOplRQv9WcxbrrKAGvAQYjkoDBa3Y4AQD/GPi9Eajc5OSQFpO3E8a0AtP06 xKiEV06jsu/6HI3Pm6U1aSXc3v3PdllFyBh6cFDVaVywIDnysDrjnLFJg31YAz5NII gQljuv0zAsI5i+sYBRfFgPr/BKRddKdfKWv0+DW5PRE7ITT8q7vtvaoxtxJwLh3t8c 1eStHY5psHywKhyuWaeaM1PGDikjS6dtEac07HH1GnzjpMTS9LDMPVLK3KjOpRPIH1 UBrkmqpTz3PAA== Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F3F0A62DD7 for ; Wed, 19 Oct 2022 11:01:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="KJLJRTJ6"; dkim-atps=neutral Received: by mail-wr1-x42e.google.com with SMTP id bk15so27951232wrb.13 for ; Wed, 19 Oct 2022 02:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+T3xcs+sb+8OgweMkuTstG9ZLZCS0dNJ3UIDGexYQRk=; b=KJLJRTJ6h7OP8R17WjoJsZ45MjO99Svbg/ekQBQuNBQ8z6MaclHtbV3+AX6bG4LjZJ Q/oJp0OnnRZfxS75UJ0jrZnXtsk2wzr2zXmXybK/ESgV6bFb2PkWMAoxJSRf+vimRhWs kVC6Qw5CVruiDF2ketphO6RK8CRwd0kNpGL2D/Z5XkHkQU0A8Nm9fxhGqD3jFPjdYMFq p8R+tkEtC7/GKH1m3bLrKEsNWzVhD3EUYj2uqiMvIUTWIunHed8enZAQcRMhbwru3z5l EVlhwdN0UuuXIlDO30eOcUshis3d1iuBi0I6eEa2nSPjOKdaPjkOHsyEEMVjAMn5ojf1 LZqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+T3xcs+sb+8OgweMkuTstG9ZLZCS0dNJ3UIDGexYQRk=; b=sxNSOKws79G9B+1hG6gdurDZ44+Wcq/FY0v7JX3uZyuupEn/CU3pucFlBPt/NmiE7v vzvmuvBAr1+lq+4x+Eyo7kd1MjHF5qRViCF9wG10ewtKUv/vKUfVrcHtE8BN05csOPCU v5E8Ngyh0f4bb+QRDpabV0KH2mGM5Rr1Oian3HnvCFjmEE0EQJx80I+V3TAr54ggKOi3 eYdKoyx3aHJVWGESq7ruz+wQ497SKXw8ykPFBIWR5ykjkmsMpbTdJHM8ovQPmPKuMhzA JBzpMuoTFvy2bW2NF0Ktu2cuFMKg4Eh3lSJVRI7ugYkWipEw2y+pbxebCEUvC5Shxerh 80sg== X-Gm-Message-State: ACrzQf3GgBcmeuc1ZjltoZ5D4CvZ1xnUvPcari6pyFqa4cMssWZr+5mP cVjl0pt6mbWz/LG7NJ566kp4J9vldqPZ5g== X-Google-Smtp-Source: AMsMyM5GY850MYVKP/zF/gnzgiV8FQ/Jaf+do/AUTquBo4dvqmkvSqI6THRA6yTQyxkwD6YLhkXoNw== X-Received: by 2002:a05:6000:2aa:b0:231:ac4f:196d with SMTP id l10-20020a05600002aa00b00231ac4f196dmr4170023wry.121.1666170079444; Wed, 19 Oct 2022 02:01:19 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id r9-20020a05600c458900b003b47b913901sm1017595wmo.1.2022.10.19.02.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 02:01:18 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Wed, 19 Oct 2022 10:01:03 +0100 Message-Id: <20221019090107.19975-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221019090107.19975-1-naush@raspberrypi.com> References: <20221019090107.19975-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 3/7] tests: delayed_controls: Add cookie value test 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: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add a test for passing and returning cookie values in DelayedControls. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman --- test/delayed_controls.cpp | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/test/delayed_controls.cpp b/test/delayed_controls.cpp index 322c545998b2..5cc7d3aed4fd 100644 --- a/test/delayed_controls.cpp +++ b/test/delayed_controls.cpp @@ -267,6 +267,45 @@ protected: return TestPass; } + int cookieValue() + { + std::unordered_map delays = { + { V4L2_CID_BRIGHTNESS, { 1, false } }, + }; + std::unique_ptr delayed = + std::make_unique(dev_.get(), delays); + ControlList ctrls; + + /* Set a cookie to the reset value. */ + const unsigned int startCookie = 0x1234; + ctrls.set(V4L2_CID_BRIGHTNESS, 1); + dev_->setControls(&ctrls); + delayed->reset(startCookie); + + /* Trigger the first frame start event */ + delayed->applyControls(0); + + for (unsigned int i = 1; i < 100; i++) { + ctrls.set(V4L2_CID_BRIGHTNESS, 1); + delayed->push(ctrls, startCookie + i); + + delayed->applyControls(i); + + auto [result, cookie] = delayed->get(i); + unsigned int expected = startCookie + i - 1; + if (cookie != expected) { + cerr << "Failed cookie value" + << " frame " << i + << " expected cookie " << expected + << " got cookie " << cookie + << endl; + return TestFail; + } + } + + return TestPass; + } + int run() override { int ret; @@ -291,6 +330,11 @@ protected: if (ret) return ret; + /* Test cookie values. */ + ret = cookieValue(); + if (ret) + return ret; + return TestPass; }