{"id":15682,"url":"https://patchwork.libcamera.org/api/1.1/patches/15682/?format=json","web_url":"https://patchwork.libcamera.org/patch/15682/","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":"<20220418120923.453131-3-hanlinchen@chromium.org>","date":"2022-04-18T12:09:23","name":"[libcamera-devel,v3,2/2] android: camera_hal_config: Use YamlParser to parse android HAL config","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"14505f2647e2daa07466aa6f0e03ad948069b6e0","submitter":{"id":98,"url":"https://patchwork.libcamera.org/api/1.1/people/98/?format=json","name":"Hanlin Chen","email":"hanlinchen@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15682/mbox/","series":[{"id":3056,"url":"https://patchwork.libcamera.org/api/1.1/series/3056/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3056","date":"2022-04-18T12:09:21","name":"Introduce YamlParser YAML files","version":3,"mbox":"https://patchwork.libcamera.org/series/3056/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15682/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15682/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 30C2FC0F1B\n\tfor ;\n\tMon, 18 Apr 2022 12:09:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DF17E65647;\n\tMon, 18 Apr 2022 14:09:34 +0200 (CEST)","from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com\n\t[IPv6:2607:f8b0:4864:20::52a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 44BD565640\n\tfor ;\n\tMon, 18 Apr 2022 14:09:32 +0200 (CEST)","by mail-pg1-x52a.google.com with SMTP id k29so18500098pgm.12\n\tfor ;\n\tMon, 18 Apr 2022 05:09:32 -0700 (PDT)","from localhost ([2401:fa00:1:17:9775:a6e9:7655:6686])\n\tby smtp.gmail.com with UTF8SMTPSA id\n\td16-20020a056a00245000b004f771b48736sm12991665pfj.194.2022.04.18.05.09.29\n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tMon, 18 Apr 2022 05:09:30 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1650283774;\n\tbh=J6txzjWeCAiHMi7PmlrLW+sYUOs5geXSWcPIXms8Bs4=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=pVCLAXbgpuELZKD7WurNE4nzlOnP9cJxtsfx1QHMDyn0clzpeEWy2kTpFj3dd7wae\n\tnPGHkMAyOcuD/ur1gzv9RZemmA/+lo4KHnMJXggygqbB0NVUATiRNDSI5G7omymAAe\n\tgBvmO3pGLN0J6kzV+aRSrVa3piu4zs5vGUOmqxAteH557IsjwKd2PNK1mg0iPrXaDh\n\tdqLdH/2G/cpgr5vBR0yXjEcEJ+cOceAABevWY/svz7KBFsqgQJw/Lql7oTryjX8ZnB\n\tNEY+/FIwZ0nykS+hjBDdIN2nqxpMzh8Hbv7Wt5gXDEqbTBB0N1b/8z+2SgrM6Fe09M\n\t7N9l46rm+xx7Q==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=wQ7kabCFShC5JW0bIzE4d2rAhrU+VGXBkHHFDjrsPk4=;\n\tb=KQvewgdqWL4SSYapT+GHDGZ0ijzcULo1dkj1Lj6ydZc//xvm6csc0LpYLFXMDPucSP\n\tJTyducOB9L0a+3GbZg8OHMk0VyslaYaetqXjd/CPyqOXnUs8htBsJhDggsnJTWt6CCR8\n\trGnlS2qTPiZhr/YlaROzfDGJRy2NhLNFH+Fco="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=chromium.org\n\theader.i=@chromium.org header.b=\"KQvewgdq\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\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=wQ7kabCFShC5JW0bIzE4d2rAhrU+VGXBkHHFDjrsPk4=;\n\tb=srqcI+esR0Foe58Oyx0I1jRrppmu182L0nsExRcAvIT+/sBPHDBKzqyLXDOYpRyFY+\n\tF6DnyqAhgwGL9moVgDnUH71AQYQkcWanL3+m1QByJ7b3ZtiTvkva5yamLNQl2NFy5Jpi\n\tq1MzEKJhJwOWNDTd0OUtZwXd3qcT5L05E0jQx5vdrLQfAKVYg5uQD8g2GS/LjWdyCwZM\n\tDqrFK45ucRFB1L65SGQWbyXR1yQtOu0aJcOD8bjWcwbvq7JcysYB9wF4dnmgH55HVUms\n\tn24d8jBmeQ/KZ1O5pGRCTqHA5Pi4vXuewug0zhu+Ee5/t5Jpf0Im5cWIaSvH5+1+LHlT\n\t4XxA==","X-Gm-Message-State":"AOAM532pm/DM95s/N7Q/XYjTclnq1G5718ho17JUbApVLsB1e/tYfqXn\n\tLoHTtZTVj3KShJwbSrKg1Zr4182jfl84Yw==","X-Google-Smtp-Source":"ABdhPJxYEgde+CBwkEa86sET74rdNVUM/01EEb9gRQv729KkuFiMoZruTIQzvZSCAHRh3aPt71y2UA==","X-Received":"by 2002:a63:5747:0:b0:381:54b9:b083 with SMTP id\n\th7-20020a635747000000b0038154b9b083mr9812024pgm.178.1650283770585; \n\tMon, 18 Apr 2022 05:09:30 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 18 Apr 2022 20:09:23 +0800","Message-Id":"<20220418120923.453131-3-hanlinchen@chromium.org>","X-Mailer":"git-send-email 2.36.0.rc0.470.gd361397f0d-goog","In-Reply-To":"<20220418120923.453131-1-hanlinchen@chromium.org>","References":"<20220418120923.453131-1-hanlinchen@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/2] android: camera_hal_config: Use\n\tYamlParser to parse android HAL config","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","From":"Han-Lin Chen via libcamera-devel ","Reply-To":"Han-Lin Chen ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use YamlParser to parse android HAL config files, instead of handling\nYAML tokens directly, as a preparation for the further parameter extension.\n\nSigned-off-by: Han-Lin Chen \n---\n src/android/camera_hal_config.cpp | 334 +++++++-----------------------\n src/android/meson.build | 1 -\n 2 files changed, 74 insertions(+), 261 deletions(-)","diff":"diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp\nindex aa90dac7..d269ab25 100644\n--- a/src/android/camera_hal_config.cpp\n+++ b/src/android/camera_hal_config.cpp\n@@ -14,15 +14,15 @@ namespace filesystem = std::experimental::filesystem;\n #else\n #include \n #endif\n-#include \n #include \n #include \n-#include \n \n #include \n \n #include \n \n+#include \n+\n using namespace libcamera;\n \n LOG_DEFINE_CATEGORY(HALConfig)\n@@ -37,16 +37,10 @@ public:\n \tint parseConfigFile(FILE *fh, std::map *cameras);\n \n private:\n-\tstd::string parseValue();\n-\tstd::string parseKey();\n-\tint parseValueBlock();\n-\tint parseCameraLocation(CameraConfigData *cameraConfigData,\n-\t\t\t\tconst std::string &location);\n-\tint parseCameraConfigData(const std::string &cameraId);\n-\tint parseCameras();\n-\tint parseEntry();\n-\n-\tyaml_parser_t parser_;\n+\tint parseCameraConfigData(const std::string &cameraId, const YamlObject &);\n+\tint parseLocation(const YamlObject &, CameraConfigData &cameraConfigData);\n+\tint parseRotation(const YamlObject &, CameraConfigData &cameraConfigData);\n+\n \tstd::map *cameras_;\n };\n \n@@ -54,290 +48,110 @@ CameraHalConfig::Private::Private()\n {\n }\n \n-std::string CameraHalConfig::Private::parseValue()\n+int CameraHalConfig::Private::parseConfigFile(FILE *fh,\n+\t\t\t\t\t std::map *cameras)\n {\n-\tyaml_token_t token;\n-\n-\t/* Make sure the token type is a value and get its content. */\n-\tyaml_parser_scan(&parser_, &token);\n-\tif (token.type != YAML_VALUE_TOKEN) {\n-\t\tyaml_token_delete(&token);\n-\t\treturn \"\";\n-\t}\n-\tyaml_token_delete(&token);\n-\n-\tyaml_parser_scan(&parser_, &token);\n-\tif (token.type != YAML_SCALAR_TOKEN) {\n-\t\tyaml_token_delete(&token);\n-\t\treturn \"\";\n-\t}\n-\n-\tstd::string value(reinterpret_cast(token.data.scalar.value),\n-\t\t\t token.data.scalar.length);\n-\tyaml_token_delete(&token);\n-\n-\treturn value;\n-}\n+\t/*\n+\t * Parse the HAL properties.\n+\t *\n+\t * Each camera properties block is a list of properties associated\n+\t * with the ID (as assembled by CameraSensor::generateId()) of the\n+\t * camera they refer to.\n+\t *\n+\t * cameras:\n+\t * \"camera0 id\":\n+\t * location: value\n+\t * rotation: value\n+\t * ...\n+\t *\n+\t * \"camera1 id\":\n+\t * location: value\n+\t * rotation: value\n+\t * ...\n+\t */\n \n-std::string CameraHalConfig::Private::parseKey()\n-{\n-\tyaml_token_t token;\n+\tcameras_ = cameras;\n \n-\t/* Make sure the token type is a key and get its value. */\n-\tyaml_parser_scan(&parser_, &token);\n-\tif (token.type != YAML_SCALAR_TOKEN) {\n-\t\tyaml_token_delete(&token);\n-\t\treturn \"\";\n-\t}\n+\tstd::unique_ptr root = YamlParser::parse(fh);\n+\tif (!root)\n+\t\treturn -EINVAL;\n \n-\tstd::string value(reinterpret_cast(token.data.scalar.value),\n-\t\t\t token.data.scalar.length);\n-\tyaml_token_delete(&token);\n+\tif (!root->isDictionary())\n+\t\treturn -EINVAL;\n \n-\treturn value;\n-}\n+\t/* Parse property \"cameras\" */\n+\tif (!root->contains(\"cameras\"))\n+\t\treturn -EINVAL;\n \n-int CameraHalConfig::Private::parseValueBlock()\n-{\n-\tyaml_token_t token;\n+\tconst YamlObject &yamlObjectCameras = (*root)[\"cameras\"];\n \n-\t/* Make sure the next token are VALUE and BLOCK_MAPPING_START. */\n-\tyaml_parser_scan(&parser_, &token);\n-\tif (token.type != YAML_VALUE_TOKEN) {\n-\t\tyaml_token_delete(&token);\n+\tif (!yamlObjectCameras.isDictionary())\n \t\treturn -EINVAL;\n-\t}\n-\tyaml_token_delete(&token);\n \n-\tyaml_parser_scan(&parser_, &token);\n-\tif (token.type != YAML_BLOCK_MAPPING_START_TOKEN) {\n-\t\tyaml_token_delete(&token);\n-\t\treturn -EINVAL;\n+\tstd::vector cameraIds = yamlObjectCameras.getMemberNames();\n+\tfor (const std::string &cameraId : cameraIds) {\n+\t\tif (parseCameraConfigData(cameraId,\n+\t\t\t\t\t yamlObjectCameras[cameraId]))\n+\t\t\treturn -EINVAL;\n \t}\n-\tyaml_token_delete(&token);\n \n \treturn 0;\n }\n \n-int CameraHalConfig::Private::parseCameraLocation(CameraConfigData *cameraConfigData,\n-\t\t\t\t\t\t const std::string &location)\n-{\n-\tif (location == \"front\")\n-\t\tcameraConfigData->facing = CAMERA_FACING_FRONT;\n-\telse if (location == \"back\")\n-\t\tcameraConfigData->facing = CAMERA_FACING_BACK;\n-\telse\n-\t\treturn -EINVAL;\n+int CameraHalConfig::Private::parseCameraConfigData(const std::string &cameraId,\n+\t\t\t\t\t\t const YamlObject &cameraObject)\n \n-\treturn 0;\n-}\n-\n-int CameraHalConfig::Private::parseCameraConfigData(const std::string &cameraId)\n {\n-\tint ret = parseValueBlock();\n-\tif (ret)\n-\t\treturn ret;\n-\n-\t/*\n-\t * Parse the camera properties and store them in a cameraConfigData\n-\t * instance.\n-\t *\n-\t * Add a safety counter to make sure we don't loop indefinitely in case\n-\t * the configuration file is malformed.\n-\t */\n-\tCameraConfigData cameraConfigData;\n-\tunsigned int sentinel = 100;\n-\tbool blockEnd = false;\n-\tyaml_token_t token;\n-\n-\tdo {\n-\t\tyaml_parser_scan(&parser_, &token);\n-\t\tswitch (token.type) {\n-\t\tcase YAML_KEY_TOKEN: {\n-\t\t\tyaml_token_delete(&token);\n-\n-\t\t\t/*\n-\t\t\t * Parse the camera property key and make sure it is\n-\t\t\t * valid.\n-\t\t\t */\n-\t\t\tstd::string key = parseKey();\n-\t\t\tstd::string value = parseValue();\n-\t\t\tif (key.empty() || value.empty())\n-\t\t\t\treturn -EINVAL;\n-\n-\t\t\tif (key == \"location\") {\n-\t\t\t\tret = parseCameraLocation(&cameraConfigData, value);\n-\t\t\t\tif (ret) {\n-\t\t\t\t\tLOG(HALConfig, Error)\n-\t\t\t\t\t\t<< \"Unknown location: \" << value;\n-\t\t\t\t\treturn -EINVAL;\n-\t\t\t\t}\n-\t\t\t} else if (key == \"rotation\") {\n-\t\t\t\tret = std::stoi(value);\n-\t\t\t\tif (ret < 0 || ret >= 360) {\n-\t\t\t\t\tLOG(HALConfig, Error)\n-\t\t\t\t\t\t<< \"Unknown rotation: \" << value;\n-\t\t\t\t\treturn -EINVAL;\n-\t\t\t\t}\n-\t\t\t\tcameraConfigData.rotation = ret;\n-\t\t\t} else {\n-\t\t\t\tLOG(HALConfig, Error)\n-\t\t\t\t\t<< \"Unknown key: \" << key;\n-\t\t\t\treturn -EINVAL;\n-\t\t\t}\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\tcase YAML_BLOCK_END_TOKEN:\n-\t\t\tblockEnd = true;\n-\t\t\t[[fallthrough]];\n-\t\tdefault:\n-\t\t\tyaml_token_delete(&token);\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\t--sentinel;\n-\t} while (!blockEnd && sentinel);\n-\tif (!sentinel)\n+\tif (!cameraObject.isDictionary())\n \t\treturn -EINVAL;\n \n-\t(*cameras_)[cameraId] = cameraConfigData;\n-\n-\treturn 0;\n-}\n+\tCameraConfigData &cameraConfigData = (*cameras_)[cameraId];\n \n-int CameraHalConfig::Private::parseCameras()\n-{\n-\tint ret = parseValueBlock();\n-\tif (ret) {\n-\t\tLOG(HALConfig, Error) << \"Configuration file is not valid\";\n-\t\treturn ret;\n-\t}\n+\t/* Parse property \"location\" */\n+\tif (parseLocation(cameraObject, cameraConfigData))\n+\t\treturn -EINVAL;\n \n-\t/*\n-\t * Parse the camera properties.\n-\t *\n-\t * Each camera properties block is a list of properties associated\n-\t * with the ID (as assembled by CameraSensor::generateId()) of the\n-\t * camera they refer to.\n-\t *\n-\t * cameras:\n-\t * \"camera0 id\":\n-\t * key: value\n-\t * key: value\n-\t * ...\n-\t *\n-\t * \"camera1 id\":\n-\t * key: value\n-\t * key: value\n-\t * ...\n-\t */\n-\tbool blockEnd = false;\n-\tyaml_token_t token;\n-\tdo {\n-\t\tyaml_parser_scan(&parser_, &token);\n-\t\tswitch (token.type) {\n-\t\tcase YAML_KEY_TOKEN: {\n-\t\t\tyaml_token_delete(&token);\n-\n-\t\t\t/* Parse the camera ID as key of the property list. */\n-\t\t\tstd::string cameraId = parseKey();\n-\t\t\tif (cameraId.empty())\n-\t\t\t\treturn -EINVAL;\n-\n-\t\t\tret = parseCameraConfigData(cameraId);\n-\t\t\tif (ret)\n-\t\t\t\treturn -EINVAL;\n-\t\t\tbreak;\n-\t\t}\n-\t\tcase YAML_BLOCK_END_TOKEN:\n-\t\t\tblockEnd = true;\n-\t\t\t[[fallthrough]];\n-\t\tdefault:\n-\t\t\tyaml_token_delete(&token);\n-\t\t\tbreak;\n-\t\t}\n-\t} while (!blockEnd);\n+\t/* Parse property \"rotation\" */\n+\tif (parseRotation(cameraObject, cameraConfigData))\n+\t\treturn -EINVAL;\n \n \treturn 0;\n }\n \n-int CameraHalConfig::Private::parseEntry()\n+int CameraHalConfig::Private::parseLocation(const YamlObject &cameraObject,\n+\t\t\t\t\t CameraConfigData &cameraConfigData)\n {\n-\tint ret = -EINVAL;\n+\tif (!cameraObject.contains(\"location\"))\n+\t\treturn -EINVAL;\n \n-\t/*\n-\t * Parse each key we find in the file.\n-\t *\n-\t * The 'cameras' keys maps to a list of (lists) of camera properties.\n-\t */\n+\tstd::string location = cameraObject[\"location\"].get(\"\");\n \n-\tstd::string key = parseKey();\n-\tif (key.empty())\n-\t\treturn ret;\n-\n-\tif (key == \"cameras\")\n-\t\tret = parseCameras();\n+\tif (location == \"front\")\n+\t\tcameraConfigData.facing = CAMERA_FACING_FRONT;\n+\telse if (location == \"back\")\n+\t\tcameraConfigData.facing = CAMERA_FACING_BACK;\n \telse\n-\t\tLOG(HALConfig, Error) << \"Unknown key: \" << key;\n+\t\treturn -EINVAL;\n \n-\treturn ret;\n+\treturn 0;\n }\n \n-int CameraHalConfig::Private::parseConfigFile(FILE *fh,\n-\t\t\t\t\t std::map *cameras)\n+int CameraHalConfig::Private::parseRotation(const YamlObject &cameraObject,\n+\t\t\t\t\t CameraConfigData &cameraConfigData)\n {\n-\tcameras_ = cameras;\n-\n-\tint ret = yaml_parser_initialize(&parser_);\n-\tif (!ret) {\n-\t\tLOG(HALConfig, Error) << \"Failed to initialize yaml parser\";\n-\t\treturn -EINVAL;\n-\t}\n-\tyaml_parser_set_input_file(&parser_, fh);\n-\n-\tyaml_token_t token;\n-\tyaml_parser_scan(&parser_, &token);\n-\tif (token.type != YAML_STREAM_START_TOKEN) {\n-\t\tLOG(HALConfig, Error) << \"Configuration file is not valid\";\n-\t\tyaml_token_delete(&token);\n-\t\tyaml_parser_delete(&parser_);\n+\tif (!cameraObject.contains(\"rotation\"))\n \t\treturn -EINVAL;\n-\t}\n-\tyaml_token_delete(&token);\n \n-\tyaml_parser_scan(&parser_, &token);\n-\tif (token.type != YAML_BLOCK_MAPPING_START_TOKEN) {\n-\t\tLOG(HALConfig, Error) << \"Configuration file is not valid\";\n-\t\tyaml_token_delete(&token);\n-\t\tyaml_parser_delete(&parser_);\n+\tint32_t rotation = cameraObject[\"rotation\"].get(-1);\n+\n+\tif (rotation < 0 || rotation >= 360) {\n+\t\tLOG(HALConfig, Error)\n+\t\t\t<< \"Unknown rotation: \" << rotation;\n \t\treturn -EINVAL;\n \t}\n-\tyaml_token_delete(&token);\n-\n-\t/* Parse the file and parse each single key one by one. */\n-\tdo {\n-\t\tyaml_parser_scan(&parser_, &token);\n-\t\tswitch (token.type) {\n-\t\tcase YAML_KEY_TOKEN:\n-\t\t\tyaml_token_delete(&token);\n-\t\t\tret = parseEntry();\n-\t\t\tbreak;\n-\n-\t\tcase YAML_STREAM_END_TOKEN:\n-\t\t\tret = -ENOENT;\n-\t\t\t[[fallthrough]];\n-\t\tdefault:\n-\t\t\tyaml_token_delete(&token);\n-\t\t\tbreak;\n-\t\t}\n-\t} while (ret >= 0);\n-\tyaml_parser_delete(&parser_);\n-\n-\tif (ret && ret != -ENOENT)\n-\t\tLOG(HALConfig, Error) << \"Configuration file is not valid\";\n-\n-\treturn ret == -ENOENT ? 0 : ret;\n+\n+\tcameraConfigData.rotation = rotation;\n+\treturn 0;\n }\n \n CameraHalConfig::CameraHalConfig()\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex 75b4bf20..1bba54de 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -3,7 +3,6 @@\n android_deps = [\n dependency('libexif', required : get_option('android')),\n dependency('libjpeg', required : get_option('android')),\n- dependency('yaml-0.1', required : get_option('android')),\n libcamera_private,\n ]\n \n","prefixes":["libcamera-devel","v3","2/2"]}