[{"id":11683,"web_url":"https://patchwork.libcamera.org/comment/11683/","msgid":"<20200729000927.GD151012@oden.dyn.berto.se>","date":"2020-07-29T00:09:27","subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Construct\n\tVideoRecording request template","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for your work.\n\nOn 2020-07-25 18:42:42 +0200, Jacopo Mondi wrote:\n> Construct the template for the VIDEO_RECORDING request template.\n> \n> The constructed control pack is quite similar to the one used for\n> preview, with the exception that the desired FPS rage is a single value.\n> \n> This fixes the CTS 9.0.r12 test:\n> android.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceRecordingTemplate\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/android/camera_device.cpp | 86 ++++++++++++++++++++++++++++++++++-\n> src/android/camera_device.h | 1 +\n> 2 files changed, 86 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index ca746b685c26..bd501a9b1660 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -918,6 +918,90 @@ CameraMetadata *CameraDevice::requestTemplatePreview()\n> \treturn requestTemplate;\n> }\n> \n> +CameraMetadata *CameraDevice::requestTemplateVideoRecord()\n> +{\n> +\t/*\n> +\t * \\todo Keep this in sync with the actual number of entries.\n> +\t * Currently: 20 entries, 35 bytes\n> +\t */\n> +\tCameraMetadata *requestTemplate = new CameraMetadata(20, 35);\n> +\tif (!requestTemplate->isValid()) {\n> +\t\tdelete requestTemplate;\n> +\t\treturn nullptr;\n> +\t}\n> +\n> +\tuint8_t aeMode = ANDROID_CONTROL_AE_MODE_ON;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_MODE,\n> +\t\t\t\t &aeMode, 1);\n> +\n> +\tint32_t aeExposureCompensation = 0;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,\n> +\t\t\t\t &aeExposureCompensation, 1);\n> +\n> +\tuint8_t aePrecaptureTrigger = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,\n> +\t\t\t\t &aePrecaptureTrigger, 1);\n> +\n> +\tuint8_t aeLock = ANDROID_CONTROL_AE_LOCK_OFF;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_LOCK,\n> +\t\t\t\t &aeLock, 1);\n> +\n> +\tstd::vector aeFpsTarget = {\n> +\t\t30, 30,\n> +\t};\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE,\n> +\t\t\t\t aeFpsTarget.data(),\n> +\t\t\t\t aeFpsTarget.size());\n> +\n> +\tuint8_t aeAntibandingMode = ANDROID_CONTROL_AE_ANTIBANDING_MODE_AUTO;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AE_ANTIBANDING_MODE,\n> +\t\t\t\t &aeAntibandingMode, 1);\n> +\n> +\tuint8_t afTrigger = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AF_TRIGGER,\n> +\t\t\t\t &afTrigger, 1);\n> +\n> +\tuint8_t awbMode = ANDROID_CONTROL_AWB_MODE_AUTO;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_MODE,\n> +\t\t\t\t &awbMode, 1);\n> +\n> +\tuint8_t awbLock = ANDROID_CONTROL_AWB_LOCK_OFF;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK,\n> +\t\t\t\t &awbLock, 1);\n> +\n> +\tuint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n> +\trequestTemplate->addEntry(ANDROID_FLASH_MODE,\n> +\t\t\t\t &flashMode, 1);\n> +\n> +\tuint8_t faceDetectMode = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n> +\trequestTemplate->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n> +\t\t\t\t &faceDetectMode, 1);\n> +\n> +\tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n> +\trequestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE,\n> +\t\t\t\t &noiseReduction, 1);\n> +\n> +\tuint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF;\n> +\trequestTemplate->addEntry(ANDROID_COLOR_CORRECTION_ABERRATION_MODE,\n> +\t\t\t\t &aberrationMode, 1);\n> +\n> +\tuint8_t controlMode = ANDROID_CONTROL_MODE_AUTO;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_MODE, &controlMode, 1);\n> +\n> +\tfloat lensAperture = 2.53 / 100;\n> +\trequestTemplate->addEntry(ANDROID_LENS_APERTURE, &lensAperture, 1);\n> +\n> +\tuint8_t opticalStabilization = ANDROID_LENS_OPTICAL_STABILIZATION_MODE_OFF;\n> +\trequestTemplate->addEntry(ANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n> +\t\t\t\t &opticalStabilization, 1);\n> +\n> +\tuint8_t captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_PREVIEW;\n> +\trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n> +\t\t\t\t &captureIntent, 1);\n> +\n> +\treturn requestTemplate;\n> +}\n> +\n> CameraMetadata *CameraDevice::requestTemplateManual()\n> {\n> \t/*\n> @@ -1024,7 +1108,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n> \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n> \t\tbreak;\n> \tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n> -\t\trequestTemplate = requestTemplatePreview();\n> +\t\trequestTemplate = requestTemplateVideoRecord();\n> \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n> \t\tbreak;\n> \tcase CAMERA3_TEMPLATE_VIDEO_SNAPSHOT:\n> diff --git a/src/android/camera_device.h b/src/android/camera_device.h\n> index db7b3c558993..87ee36e96805 100644\n> --- a/src/android/camera_device.h\n> +++ b/src/android/camera_device.h\n> @@ -84,6 +84,7 @@ private:\n> \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n> \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n> \tCameraMetadata *requestTemplatePreview();\n> +\tCameraMetadata *requestTemplateVideoRecord();\n> \tCameraMetadata *requestTemplateManual();\n> \tlibcamera::PixelFormat toPixelFormat(int format);\n> \tstd::unique_ptr getResultMetadata(int frame_number,\n> -- \n> 2.27.0\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 A1E44BD86F\n\tfor ;\n\tWed, 29 Jul 2020 00:09:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 300EB617AF;\n\tWed, 29 Jul 2020 02:09:32 +0200 (CEST)","from mail-lj1-x244.google.com (mail-lj1-x244.google.com\n\t[IPv6:2a00:1450:4864:20::244])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E1AC260535\n\tfor ;\n\tWed, 29 Jul 2020 02:09:29 +0200 (CEST)","by mail-lj1-x244.google.com with SMTP id h19so23087293ljg.13\n\tfor ;\n\tTue, 28 Jul 2020 17:09:29 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tj19sm41673lfe.85.2020.07.28.17.09.28\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 28 Jul 2020 17:09:28 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"fZXqTCb+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=bXS9VCltb4FwXBOPcaTxcF+PyJIV5xks+T436Ymlz6M=;\n\tb=fZXqTCb+TYNWdjTBXcO/+wD+j8GC+B6BvT3anOQH2hdyGIur5EP9kIbyhprT2NdGLX\n\tb2rkfTyy/9USo2akNK27w8pTvV8QCdu1flUgJXY9U051NCrlJmNXP3y10l1Rv2ixZJeF\n\t1X3Gu5RRtxZWhrgWgXUjvTE9+vebeEyRIuzMpeTBHTqVedMEjLeU33duOWLcAVlhNRu/\n\tchE/F4aSqyemOMixoEvoh2QzSWjbtm2qmKKGxE2Rp3OGZb+Q+h+QF3e+/E7ucAtIGcbg\n\tnrfCdzoxSccELR8G4TqY7va3yz4W05hopWtJk4T4SmhkWxZ0qy+K3d/9OZMBUPKPEIRv\n\t7aaA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=bXS9VCltb4FwXBOPcaTxcF+PyJIV5xks+T436Ymlz6M=;\n\tb=e/ubEQ0BzeFkT+j01K5gc3A9XE81tyNiSfeKuOzJ9A2DScDeofkeNe3550qztbHPOL\n\tg9tWctMfJJrkjki5C0sN8Rg37+89fcoaERECHMbqkvzZWC7kRa5GnGhSMd6ZDi/z1TBL\n\tFuPHlryLAzwspIbZrAWfVeY/DPK3QbYdEM1Mb6kJBFe52NCNCbQ5HxJDk4gylON9ggYw\n\t9d7U9LUyLlLqfg8eVxNcvJ74EzWUUplFAIgEsJwiinafijqlJ4jUVh+ghpGsNzHbRYfh\n\tbkyjINp2EKVVC7+ZxR1IB2rQNG2y1HmlX2F30Bf+OBN1G3Rta75t45w225nIiNR35AIX\n\taPEQ==","X-Gm-Message-State":"AOAM533HJVwgR08KIg17TgR4PKio2kXuugJsjagBnIXNNuOMTZDbmlQx\n\tqkWGh/aNAAlPJoXvR+JqnpFgFg==","X-Google-Smtp-Source":"ABdhPJzHrfb8+B/pwNWRIeiP/+R3TkRPiMByNddmmid4Lx9F/z29xN/oAA1hvsxJcUOYqh313hHFzQ==","X-Received":"by 2002:a05:651c:314:: with SMTP id\n\ta20mr6769789ljp.434.1595981369090; \n\tTue, 28 Jul 2020 17:09:29 -0700 (PDT)","Date":"Wed, 29 Jul 2020 02:09:27 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Message-ID":"<20200729000927.GD151012@oden.dyn.berto.se>","References":"<20200725164243.168297-1-jacopo@jmondi.org>\n\t<20200725164243.168297-5-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200725164243.168297-5-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 4/5] android: camera_device: Construct\n\tVideoRecording request template","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]