Patch Detail
Show a patch.
GET /api/patches/11744/?format=api
{ "id": 11744, "url": "https://patchwork.libcamera.org/api/patches/11744/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11744/", "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": "<20210328201715.51816-1-pnguyen@baylibre.com>", "date": "2021-03-28T20:17:15", "name": "[libcamera-devel] android: camera_device: Always add mandatory metadata entries", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "b441272fecc0f1a4be7a96e410849603322756f6", "submitter": { "id": 79, "url": "https://patchwork.libcamera.org/api/people/79/?format=api", "name": "Phi-bang Nguyen", "email": "pnguyen@baylibre.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11744/mbox/", "series": [ { "id": 1853, "url": "https://patchwork.libcamera.org/api/series/1853/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1853", "date": "2021-03-28T20:17:15", "name": "[libcamera-devel] android: camera_device: Always add mandatory metadata entries", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1853/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11744/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11744/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 46DADC32ED\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSun, 28 Mar 2021 20:18:07 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BE7D86877C;\n\tSun, 28 Mar 2021 22:18:06 +0200 (CEST)", "from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com\n\t[IPv6:2a00:1450:4864:20::42b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4A5786084F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 28 Mar 2021 22:18:05 +0200 (CEST)", "by mail-wr1-x42b.google.com with SMTP id k8so10784422wrc.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 28 Mar 2021 13:18:05 -0700 (PDT)", "from localhost.localdomain (206.159.69.91.rev.sfr.net.\n\t[91.69.159.206]) by smtp.googlemail.com with ESMTPSA id\n\tc2sm19978925wme.15.2021.03.28.13.18.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 28 Mar 2021 13:18:04 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=baylibre-com.20150623.gappssmtp.com\n\theader.i=@baylibre-com.20150623.gappssmtp.com\n\theader.b=\"gGcuM9I9\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=w1X69dQEcf085y6Xa0DcOI3XoyWgWjrKLmZOv78FQbE=;\n\tb=gGcuM9I9csveDG1ateL00CleAAhqS6+Qf4zD2SxSenNDAxlyRXOfAKiDR58McOl2Rs\n\tGFjdGhHil44u0j7Bz9DbI1bZAHoIzkTSpIv0pk35d9+ykjA5HyzByc5lnUrqEeri4LhV\n\tkGXDLMAog8/Srs8+lZQC1QqNp72xRLJ0NHypEVy94jjkpHcRfxaeAxN0mUer4IbKG50Q\n\txdePcLnMF8aNt9/c871RQgw2WIDn1siM8kKayVvRtutES/jgn523NEvmR9OvIOcvOioU\n\tbGRTgMj+khh+xRNe1i+bE1GAxXg5SmUv9zEIAXi5mmXj4fFGFig/z4Zvi54L69A6hJJY\n\t7RHg==", "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:mime-version\n\t:content-transfer-encoding;\n\tbh=w1X69dQEcf085y6Xa0DcOI3XoyWgWjrKLmZOv78FQbE=;\n\tb=TuBiLtMCFC01t/MR3/yJcWTObXCG1A1snug6OiE2X72hn6Ky3U/0GQh59dCAcNLfyf\n\t9y6LQk9B2gIPyKjCjpYOWSXaUIULevZ4mww/c54lg/zh5ga4MVYtptX6SuyhJtH+8dum\n\tLxO4mtJIvIvuuX8t377CecZqagguKmmMm/yFR/nO2j47v+r+iXBCnGkCxR2IYXSTCzn6\n\tGBYbuKf5ZTW3A8NtD/5Fni5lECzWYTVhGtvxd/d+bCqbMgcP/EU0gSX5bQAEl1xGwSVE\n\tI3fxLa/ihwYVR0NiSXpoh6zS9OQnyDme3R7+RLLF8pyj044rq8L4oKLlyHgmZBNBMhLZ\n\tPPtQ==", "X-Gm-Message-State": "AOAM531fiIH+gLzELTWKImd3/6Tm5hgtu4akvou6gQdcf5Hwxn12p6A6\n\tZWtADZIHRmH0NmUtLfUQ2+9VrV5JGKGotg==", "X-Google-Smtp-Source": "ABdhPJycDIyKYBFXZGq7uLYmVilVhJ0lxxCKEJaaqK125ptmjyZZSTlxk6yySxxubah8RrSlEgRhEw==", "X-Received": "by 2002:adf:d851:: with SMTP id\n\tk17mr25538514wrl.254.1616962684716; \n\tSun, 28 Mar 2021 13:18:04 -0700 (PDT)", "From": "Phi-Bang Nguyen <pnguyen@baylibre.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 28 Mar 2021 22:17:15 +0200", "Message-Id": "<20210328201715.51816-1-pnguyen@baylibre.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH] android: camera_device: Always add\n\tmandatory metadata entries", "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 following static metadata entries are mandatory. Without them,\nthe Android camera service cannot work properly and application will\nfail to start (error: \"This device doesn't support camera2 API\"):\n\n- ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES\n- ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS\n\nFixes: edd4b1dab26b (\"android: camera_device: Compute frame durations\")\n\nSigned-off-by: Phi-Bang Nguyen <pnguyen@baylibre.com>\n---\n src/android/camera_device.cpp | 32 ++++++++++++++++++--------------\n 1 file changed, 18 insertions(+), 14 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a8108e3a..4b5d8f97 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -769,6 +769,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \n \tint64_t minFrameDurationNsec = -1;\n \tint64_t maxFrameDurationNsec = -1;\n+\tstd::vector<int32_t> availableAeFpsTarget = {\n+\t\t15, 30, 30, 30,\n+\t};\n \tconst auto frameDurationsInfo = controlsInfo.find(&controls::FrameDurations);\n \tif (frameDurationsInfo != controlsInfo.end()) {\n \t\tminFrameDurationNsec = frameDurationsInfo->second.min().get<int64_t>() * 1000;\n@@ -803,12 +806,12 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t * Register to the camera service {min, max} and {max, max}\n \t\t * intervals as requested by the metadata documentation.\n \t\t */\n-\t\tint32_t availableAeFpsTarget[] = {\n+\t\tavailableAeFpsTarget = {\n \t\t\tminFps, maxFps, maxFps, maxFps\n \t\t};\n-\t\tstaticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n-\t\t\t\t\t availableAeFpsTarget, 4);\n \t}\n+\tstaticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n+\t\t\t\t availableAeFpsTarget.data(), availableAeFpsTarget.size());\n \n \tstd::vector<int32_t> aeCompensationRange = {\n \t\t0, 0,\n@@ -1140,19 +1143,20 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\t\t\t availableStallDurations.size());\n \n \t/* Use the minimum frame duration for all the YUV/RGB formats. */\n-\tif (minFrameDurationNsec > 0) {\n-\t\tstd::vector<int64_t> minFrameDurations;\n-\t\tminFrameDurations.reserve(streamConfigurations_.size() * 4);\n-\t\tfor (const auto &entry : streamConfigurations_) {\n-\t\t\tminFrameDurations.push_back(entry.androidFormat);\n-\t\t\tminFrameDurations.push_back(entry.resolution.width);\n-\t\t\tminFrameDurations.push_back(entry.resolution.height);\n+\tstd::vector<int64_t> minFrameDurations;\n+\tminFrameDurations.reserve(streamConfigurations_.size() * 4);\n+\tfor (const auto &entry : streamConfigurations_) {\n+\t\tminFrameDurations.push_back(entry.androidFormat);\n+\t\tminFrameDurations.push_back(entry.resolution.width);\n+\t\tminFrameDurations.push_back(entry.resolution.height);\n+\t\tif (minFrameDurationNsec > 0)\n \t\t\tminFrameDurations.push_back(minFrameDurationNsec);\n-\t\t}\n-\t\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n-\t\t\t\t\t minFrameDurations.data(),\n-\t\t\t\t\t minFrameDurations.size());\n+\t\telse\n+\t\t\tminFrameDurations.push_back(33333333);\n \t}\n+\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n+\t\t\t\t minFrameDurations.data(),\n+\t\t\t\t minFrameDurations.size());\n \n \tuint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;\n \tstaticMetadata_->addEntry(ANDROID_SCALER_CROPPING_TYPE, &croppingType, 1);\n", "prefixes": [ "libcamera-devel" ] }