{"id":11626,"url":"https://patchwork.libcamera.org/api/patches/11626/?format=json","web_url":"https://patchwork.libcamera.org/patch/11626/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210319130120.141563-2-jacopo@jmondi.org>","date":"2021-03-19T13:01:18","name":"[libcamera-devel,v2,1/3] cam: Do not assume Location is available","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d6ba75de2f99723025ff42e92552709a153aae19","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11626/mbox/","series":[{"id":1804,"url":"https://patchwork.libcamera.org/api/series/1804/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1804","date":"2021-03-19T13:01:17","name":"libcamera: Do not default the location property","version":2,"mbox":"https://patchwork.libcamera.org/series/1804/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11626/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11626/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 1485EC32E1\n\tfor ;\n\tFri, 19 Mar 2021 13:00:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B2FB468D69;\n\tFri, 19 Mar 2021 14:00:55 +0100 (CET)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7358D68D60\n\tfor ;\n\tFri, 19 Mar 2021 14:00:53 +0100 (CET)","from uno.homenet.telecomitalia.it\n\t(host-79-22-58-175.retail.telecomitalia.it [79.22.58.175])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id D69FC24000D;\n\tFri, 19 Mar 2021 13:00:52 +0000 (UTC)"],"X-Originating-IP":"79.22.58.175","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 19 Mar 2021 14:01:18 +0100","Message-Id":"<20210319130120.141563-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.30.0","In-Reply-To":"<20210319130120.141563-1-jacopo@jmondi.org>","References":"<20210319130120.141563-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 1/3] cam: Do not assume Location is\n\tavailable","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In preparation to register the Location property only if the firware\ninterface provides it, do not assume it is available and build the\ncamera name using the camera sensor model as a fallback.\n\nSigned-off-by: Jacopo Mondi \n---\n src/cam/main.cpp | 32 ++++++++++++++++++++------------\n 1 file changed, 20 insertions(+), 12 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex e01be63a7058..c087cdd97332 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -379,18 +379,26 @@ std::string const CamApp::cameraName(const Camera *camera)\n \tconst ControlList &props = camera->properties();\n \tstd::string name;\n \n-\tswitch (props.get(properties::Location)) {\n-\tcase properties::CameraLocationFront:\n-\t\tname = \"Internal front camera\";\n-\t\tbreak;\n-\tcase properties::CameraLocationBack:\n-\t\tname = \"Internal back camera\";\n-\t\tbreak;\n-\tcase properties::CameraLocationExternal:\n-\t\tname = \"External camera\";\n-\t\tif (props.contains(properties::Model))\n-\t\t\tname += \" '\" + props.get(properties::Model) + \"'\";\n-\t\tbreak;\n+\tif (props.contains(properties::Location)) {\n+\t\tswitch (props.get(properties::Location)) {\n+\t\tcase properties::CameraLocationFront:\n+\t\t\tname = \"Internal front camera\";\n+\t\t\tbreak;\n+\t\tcase properties::CameraLocationBack:\n+\t\t\tname = \"Internal back camera\";\n+\t\t\tbreak;\n+\t\tcase properties::CameraLocationExternal:\n+\t\t\tname = \"External camera\";\n+\t\t\tif (props.contains(properties::Model))\n+\t\t\t\tname += \" '\" + props.get(properties::Model) + \"'\";\n+\t\t\tbreak;\n+\t\t}\n+\t} else if (props.contains(properties::Model)) {\n+\t\t/*\n+\t\t * If the camera location is not availble use the camera model\n+\t\t * to build the camera name.\n+\t\t */\n+\t\tname = \"'\" + props.get(properties::Model) + \"'\";\n \t}\n \n \tname += \" (\" + camera->id() + \")\";\n","prefixes":["libcamera-devel","v2","1/3"]}