From patchwork Mon Jul 6 13:52:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8650 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 C9C2BBD790 for ; Mon, 6 Jul 2020 13:53:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5F5E5603AB; Mon, 6 Jul 2020 15:53:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="P2ajUvDj"; dkim-atps=neutral Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F676603AA for ; Mon, 6 Jul 2020 15:53:04 +0200 (CEST) Received: by mail-wr1-x443.google.com with SMTP id z13so41035409wrw.5 for ; Mon, 06 Jul 2020 06:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zhSxyFS/XevjFqiBYxJve17zgp1EKjQNWhDw4uwoHJ0=; b=P2ajUvDj4slB9hRBGMboFI1O77Q06LQ8D5GUyO6DTOuEKU3XmYg27qeELM+FI7fuTI UIfHyctaPTR5ilIf2iFrpPBV9XQmP5ow0H28Jkr6RKos1yKcA14HOM9hFh0il1THBoqT c71k3kafuJahv+aiXOklr8IQeWDcvx4ncwh9qPcmwPsBeqfub3F+nUMlXqacD+Wll87E FTk+CmjTe7kGeEFn/SnUsO7wJZgKpuIvumL2iz44f4zZQaoNcOc4xplMDfjY57k3bYdb NIyhe8rw1v1eglge7IHAvu9dMILp+lxw4n+21M5ErZWHEpBW+GIJ0QENJIO9m9Ghp4+7 bqOg== 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:mime-version :content-transfer-encoding; bh=zhSxyFS/XevjFqiBYxJve17zgp1EKjQNWhDw4uwoHJ0=; b=BlkNLAyQ2QSAGrTEfHqphInoPFOghBwjYkeHbXbIJo9wbpdfc+ete5gR0QL7p3AKcy WQkGH1K03QpaGCwqnGQyvFRo1y4NrksAnI5GKBBXHNeF5xiXbcAojAQN68DzdYFKxnS+ QkRYNbfq+EH6OjvPzZjaLR4RgEhsND1sJJJjHQnGnFVsBz5UqsGpo9f0/wpBHWvQ0Zau f99HyLUITYqKdV30LgrCoZhOG5rqG0OY98BB/ydiwlpsP6lO35ZTGC0Ycy6Ts+lHxomW PwBR5dUnTY9FrVW5jq2WOzkJ43WtMrrhmF5WFm6f33JEHn0qMsgmYYroVDQbgxm5KbsE pq0g== X-Gm-Message-State: AOAM532ORkAAvrPk+9gDchRjTi/OGJ/OANA9Iak475Qmgoi9xlzYRLcE o5Jj/LiZZoHrh2cAgSCwjXxdBYvM+rw= X-Google-Smtp-Source: ABdhPJxCWZFSjqRn9251+yDrRWtxHGbrn3l1PBZ4Iu13NybPXpH8V0B4cuOiwujAxDjx3+zK21qduA== X-Received: by 2002:a5d:684f:: with SMTP id o15mr44989938wrw.148.1594043583707; Mon, 06 Jul 2020 06:53:03 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id f17sm4028203wme.14.2020.07.06.06.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2020 06:53:02 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 6 Jul 2020 14:52:54 +0100 Message-Id: <20200706135254.1631048-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: pipeline: raspberrypi: Fix initial value for scoring routine 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" Use std::numerical_limits to initialise the best score instead of an arbitrary value. This fixes a failure in v4l2-conformance when using the Raspberry Pi pipeline handler and v4l2-compatibility libcamera layer. Reported-by: Paul Elder Signed-off-by: Naushir Patuck Reviewed-by: Paul Elder --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index f4966f86..bd2ed671 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -69,7 +69,7 @@ double scoreFormat(double desired, double actual) V4L2DeviceFormat findBestMode(V4L2PixFmtMap &formatsMap, const Size &req) { - double bestScore = 9e9, score; + double bestScore = std::numeric_limits::max(), score; V4L2DeviceFormat bestMode = {}; #define PENALTY_AR 1500.0