[{"id":14969,"web_url":"https://patchwork.libcamera.org/comment/14969/","msgid":"","date":"2021-02-04T14:47:13","subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Generate JPEG\n\tthumbnail sizes","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 04/02/2021 14:35, Jacopo Mondi wrote:\n> The list of the available thumbnail sizes is generated from the\n> list of available JPEG resolution, one for each aspect ratio.\n> \n> This change fixes the CTS test\n> android.hardware.cts.CameraTest#testJpegThumbnailSize\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 39 ++++++++++++++++++++++++++++++-----\n> 1 file changed, 34 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index df5e295656d7..0b699c957990 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -871,12 +871,41 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> \t\t\t\t &availableControlModes, 1);\n> \n> \t/* JPEG static metadata. */\n> -\tstd::vector availableThumbnailSizes = {\n> -\t\t0, 0,\n> -\t};\n> +\n> +\t/*\n> +\t * Create the list of supported tumbnail sizes by inspecting the\n\ns/tumbnail/thumbnail/\n\n> +\t * available JPEG resolutions collected in streamConfigurations_ and\n> +\t * generate one entry for each aspect ratio.\n> +\t *\n> +\t * The JPEG thumbnailer can freely scale, so pick an arbitrary\n> +\t * (160, 120) size as designated thumbnail size.\n\nShouldn't we give a square size here? 160,160?\n\nThat way a 9:16 ratio would be the same 'size' as a 16:9 for example.\n(Thinking of phones/devices taking portrait rather than landscape pictures).\n\n> +\t */\n> +\tconstexpr Size maxJpegThumbnail(160, 120);\n> +\tstd::vector thumbnailSizes;\n> +\tthumbnailSizes.push_back({ 0, 0 });\n> +\tfor (const auto &entry : streamConfigurations_) {\n> +\t\tif (entry.androidFormat != HAL_PIXEL_FORMAT_BLOB)\n> +\t\t\tcontinue;\n> +\n> +\t\tSize thumbnailSize = maxJpegThumbnail\n> +\t\t\t\t .boundedToAspectRatio({ entry.resolution.width,\n> +\t\t\t\t\t\t\t entry.resolution.height });\n\nI love how easy those helpers make maintaining aspect ratios.\n\n> +\t\tthumbnailSizes.push_back(thumbnailSize);\n> +\t}\n> +\n> +\tstd::sort(thumbnailSizes.begin(), thumbnailSizes.end());\n> +\tauto last = std::unique(thumbnailSizes.begin(), thumbnailSizes.end());\n> +\tthumbnailSizes.erase(last, thumbnailSizes.end());\n> +\n> +\t/* Transform it in a list of integers that can be consumed. */\n\n'in to a list' ?\n\n> +\tstd::vector thumbnailEntries;\n> +\tthumbnailEntries.reserve(thumbnailSizes.size() * 2);\n> +\tfor (const auto &size : thumbnailSizes) {\n> +\t\tthumbnailEntries.push_back(size.width);\n> +\t\tthumbnailEntries.push_back(size.height);\n> +\t}\n> \tstaticMetadata_->addEntry(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n> -\t\t\t\t availableThumbnailSizes.data(),\n> -\t\t\t\t availableThumbnailSizes.size());\n> +\t\t\t\t thumbnailEntries.data(), thumbnailEntries.size());\n\nThe number of times we add a vector to addEntry() shouldn't we have an\naddEntry(id, vector) so we don't duplicate .data(), .size() each time?\n\nBut that's a digression - not for this patch.\n\nOtherwise sounds good to me.\n\nReviewed-by: Kieran Bingham \n\n\n\n> \n> \t/*\n> \t * \\todo Calculate the maximum JPEG buffer size by asking the encoder\n>","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 EC373BD160\n\tfor ;\n\tThu, 4 Feb 2021 14:47:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8165961430;\n\tThu, 4 Feb 2021 15:47:18 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5F7A76141A\n\tfor ;\n\tThu, 4 Feb 2021 15:47:17 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D4D1145D;\n\tThu, 4 Feb 2021 15:47:16 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Zu+2FkvB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1612450037;\n\tbh=6apt00pX1n/JPzSTvhmgRMby1gwKlxmpVg8QTmhR4g8=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=Zu+2FkvBe23IdSdCz3j9OXRL3XXkz+cneNY0Sr8bNpoO/dtwy/woj0fPSGA69jE7o\n\t7H7j5BER2oLNcZhVy/pKCB72H2O7nJNiuNCFKDp7iuEKmyoOT/hkuBB+tI/W6zzDHi\n\tC5HhC29DZyJ8RdxgAv8ueQm5gWkPhxW04v+st+Z0=","To":"Jacopo Mondi , libcamera-devel@lists.libcamera.org","References":"<20210204143503.33498-1-jacopo@jmondi.org>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAlcEEwEKAEECGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEWIQSQLdeYP70o/eNy1HqhHkZyEKRh/QUCXWTtygUJ\n\tCyJXZAAKCRChHkZyEKRh/f8dEACTDsbLN2nioNZMwyLuQRUAFcXNolDX48xcUXsWS2QjxaPm\n\tVsJx8Uy8aYkS85mdPBh0C83OovQR/OVbr8AxhGvYqBs3nQvbWuTl/+4od7DfK2VZOoKBAu5S\n\tQK2FYuUcikDqYcFWJ8DQnubxfE8dvzojHEkXw0sA4igINHDDFX3HJGZtLio+WpEFQtCbfTAG\n\tYZslasz1YZRbwEdSsmO3/kqy5eMnczlm8a21A3fKUo3g8oAZEFM+f4DUNzqIltg31OAB/kZS\n\tenKZQ/SWC8PmLg/ZXBrReYakxXtkP6w3FwMlzOlhGxqhIRNiAJfXJBaRhuUWzPOpEDE9q5YJ\n\tBmqQL2WJm1VSNNVxbXJHpaWMH1sA2R00vmvRrPXGwyIO0IPYeUYQa3gsy6k+En/aMQJd27dp\n\taScf9am9PFICPY5T4ppneeJLif2lyLojo0mcHOV+uyrds9XkLpp14GfTkeKPdPMrLLTsHRfH\n\tfA4I4OBpRrEPiGIZB/0im98MkGY/Mu6qxeZmYLCcgD6qz4idOvfgVOrNh+aA8HzIVR+RMW8H\n\tQGBN9f0E3kfwxuhl3omo6V7lDw8XOdmuWZNC9zPq1UfryVHANYbLGz9KJ4Aw6M+OgBC2JpkD\n\thXMdHUkC+d20dwXrwHTlrJi1YNp6rBc+xald3wsUPOZ5z8moTHUX/uPA/qhGsbkCDQRWBP1m\n\tARAAzijkb+Sau4hAncr1JjOY+KyFEdUNxRy+hqTJdJfaYihxyaj0Ee0P0zEi35CbE6lgU0Uz\n\ttih9fiUbSV3wfsWqg1Ut3/5rTKu7kLFp15kF7eqvV4uezXRD3Qu4yjv/rMmEJbbD4cTvGCYI\n\td6MDC417f7vK3hCbCVIZSp3GXxyC1LU+UQr3fFcOyCwmP9vDUR9JV0BSqHHxRDdpUXE26Dk6\n\tmhf0V1YkspE5St814ETXpEus2urZE5yJIUROlWPIL+hm3NEWfAP06vsQUyLvr/GtbOT79vXl\n\tEn1aulcYyu20dRRxhkQ6iILaURcxIAVJJKPi8dsoMnS8pB0QW12AHWuirPF0g6DiuUfPmrA5\n\tPKe56IGlpkjc8cO51lIxHkWTpCMWigRdPDexKX+Sb+W9QWK/0JjIc4t3KBaiG8O4yRX8ml2R\n\t+rxfAVKM6V769P/hWoRGdgUMgYHFpHGSgEt80OKK5HeUPy2cngDUXzwrqiM5Sz6Od0qw5pCk\n\tNlXqI0W/who0iSVM+8+RmyY0OEkxEcci7rRLsGnM15B5PjLJjh1f2ULYkv8s4SnDwMZ/kE04\n\t/UqCMK/KnX8pwXEMCjz0h6qWNpGwJ0/tYIgQJZh6bqkvBrDogAvuhf60Sogw+mH8b+PBlx1L\n\toeTK396wc+4c3BfiC6pNtUS5GpsPMMjYMk7kVvEAEQEAAYkCPAQYAQoAJgIbDBYhBJAt15g/\n\tvSj943LUeqEeRnIQpGH9BQJdizzIBQkLSKZiAAoJEKEeRnIQpGH9eYgQAJpjaWNgqNOnMTmD\n\tMJggbwjIotypzIXfhHNCeTkG7+qCDlSaBPclcPGYrTwCt0YWPU2TgGgJrVhYT20ierN8LUvj\n\t6qOPTd+Uk7NFzL65qkh80ZKNBFddx1AabQpSVQKbdcLb8OFs85kuSvFdgqZwgxA1vl4TFhNz\n\tPZ79NAmXLackAx3sOVFhk4WQaKRshCB7cSl+RIng5S/ThOBlwNlcKG7j7W2MC06BlTbdEkUp\n\tECzuuRBv8wX4OQl+hbWbB/VKIx5HKlLu1eypen/5lNVzSqMMIYkkZcjV2SWQyUGxSwq0O/sx\n\tS0A8/atCHUXOboUsn54qdxrVDaK+6jIAuo8JiRWctP16KjzUM7MO0/+4zllM8EY57rXrj48j\n\tsbEYX0YQnzaj+jO6kJtoZsIaYR7rMMq9aUAjyiaEZpmP1qF/2sYenDx0Fg2BSlLvLvXM0vU8\n\tpQk3kgDu7kb/7PRYrZvBsr21EIQoIjXbZxDz/o7z95frkP71EaICttZ6k9q5oxxA5WC6sTXc\n\tMW8zs8avFNuA9VpXt0YupJd2ijtZy2mpZNG02fFVXhIn4G807G7+9mhuC4XG5rKlBBUXTvPU\n\tAfYnB4JBDLmLzBFavQfvonSfbitgXwCG3vS+9HEwAjU30Bar1PEOmIbiAoMzuKeRm2LVpmq4\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Thu, 4 Feb 2021 14:47:13 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20210204143503.33498-1-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Generate JPEG\n\tthumbnail sizes","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14970,"web_url":"https://patchwork.libcamera.org/comment/14970/","msgid":"<20210204150403.abqafaijnkymvhsh@uno.localdomain>","date":"2021-02-04T15:04:03","subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Generate JPEG\n\tthumbnail sizes","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran,\n\nOn Thu, Feb 04, 2021 at 02:47:13PM +0000, Kieran Bingham wrote:\n> Hi Jacopo,\n>\n> On 04/02/2021 14:35, Jacopo Mondi wrote:\n> > The list of the available thumbnail sizes is generated from the\n> > list of available JPEG resolution, one for each aspect ratio.\n> >\n> > This change fixes the CTS test\n> > android.hardware.cts.CameraTest#testJpegThumbnailSize\n> >\n> > Signed-off-by: Jacopo Mondi \n> > ---\n> > src/android/camera_device.cpp | 39 ++++++++++++++++++++++++++++++-----\n> > 1 file changed, 34 insertions(+), 5 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index df5e295656d7..0b699c957990 100644\n> > --- a/src/android/camera_device.cpp\n> > +++ b/src/android/camera_device.cpp\n> > @@ -871,12 +871,41 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n> > \t\t\t\t &availableControlModes, 1);\n> >\n> > \t/* JPEG static metadata. */\n> > -\tstd::vector availableThumbnailSizes = {\n> > -\t\t0, 0,\n> > -\t};\n> > +\n> > +\t/*\n> > +\t * Create the list of supported tumbnail sizes by inspecting the\n>\n> s/tumbnail/thumbnail/\n>\n> > +\t * available JPEG resolutions collected in streamConfigurations_ and\n> > +\t * generate one entry for each aspect ratio.\n> > +\t *\n> > +\t * The JPEG thumbnailer can freely scale, so pick an arbitrary\n> > +\t * (160, 120) size as designated thumbnail size.\n>\n> Shouldn't we give a square size here? 160,160?\n>\n> That way a 9:16 ratio would be the same 'size' as a 16:9 for example.\n> (Thinking of phones/devices taking portrait rather than landscape pictures).\n\n(160, 120) is arbitrary, and you're probably right here.\n\nI'll test with 160, 160 and resend with your comments taken in.\n\nThanks\n j\n\n>\n> > +\t */\n> > +\tconstexpr Size maxJpegThumbnail(160, 120);\n> > +\tstd::vector thumbnailSizes;\n> > +\tthumbnailSizes.push_back({ 0, 0 });\n> > +\tfor (const auto &entry : streamConfigurations_) {\n> > +\t\tif (entry.androidFormat != HAL_PIXEL_FORMAT_BLOB)\n> > +\t\t\tcontinue;\n> > +\n> > +\t\tSize thumbnailSize = maxJpegThumbnail\n> > +\t\t\t\t .boundedToAspectRatio({ entry.resolution.width,\n> > +\t\t\t\t\t\t\t entry.resolution.height });\n>\n> I love how easy those helpers make maintaining aspect ratios.\n>\n> > +\t\tthumbnailSizes.push_back(thumbnailSize);\n> > +\t}\n> > +\n> > +\tstd::sort(thumbnailSizes.begin(), thumbnailSizes.end());\n> > +\tauto last = std::unique(thumbnailSizes.begin(), thumbnailSizes.end());\n> > +\tthumbnailSizes.erase(last, thumbnailSizes.end());\n> > +\n> > +\t/* Transform it in a list of integers that can be consumed. */\n>\n> 'in to a list' ?\n>\n> > +\tstd::vector thumbnailEntries;\n> > +\tthumbnailEntries.reserve(thumbnailSizes.size() * 2);\n> > +\tfor (const auto &size : thumbnailSizes) {\n> > +\t\tthumbnailEntries.push_back(size.width);\n> > +\t\tthumbnailEntries.push_back(size.height);\n> > +\t}\n> > \tstaticMetadata_->addEntry(ANDROID_JPEG_AVAILABLE_THUMBNAIL_SIZES,\n> > -\t\t\t\t availableThumbnailSizes.data(),\n> > -\t\t\t\t availableThumbnailSizes.size());\n> > +\t\t\t\t thumbnailEntries.data(), thumbnailEntries.size());\n>\n> The number of times we add a vector to addEntry() shouldn't we have an\n> addEntry(id, vector) so we don't duplicate .data(), .size() each time?\n>\n> But that's a digression - not for this patch.\n>\n> Otherwise sounds good to me.\n>\n> Reviewed-by: Kieran Bingham \n>\n>\n>\n> >\n> > \t/*\n> > \t * \\todo Calculate the maximum JPEG buffer size by asking the encoder\n> >\n>\n> --\n> Regards\n> --\n> Kieran","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 889B8BD162\n\tfor ;\n\tThu, 4 Feb 2021 15:03:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 087FE61437;\n\tThu, 4 Feb 2021 16:03:44 +0100 (CET)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 911EC6141A\n\tfor ;\n\tThu, 4 Feb 2021 16:03:42 +0100 (CET)","from uno.localdomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id F2E7F1C001E;\n\tThu, 4 Feb 2021 15:03:41 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","Date":"Thu, 4 Feb 2021 16:04:03 +0100","From":"Jacopo Mondi ","To":"Kieran Bingham ","Message-ID":"<20210204150403.abqafaijnkymvhsh@uno.localdomain>","References":"<20210204143503.33498-1-jacopo@jmondi.org>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Generate JPEG\n\tthumbnail sizes","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]