From patchwork Thu Feb 8 12:44:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 10207087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 780D3600F6 for ; Thu, 8 Feb 2018 12:44:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 664F6294EC for ; Thu, 8 Feb 2018 12:44:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57697294F0; Thu, 8 Feb 2018 12:44:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AC15294EC for ; Thu, 8 Feb 2018 12:44:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbeBHMox (ORCPT ); Thu, 8 Feb 2018 07:44:53 -0500 Received: from mga06.intel.com ([134.134.136.31]:60075 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751094AbeBHMoh (ORCPT ); Thu, 8 Feb 2018 07:44:37 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Feb 2018 04:44:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,478,1511856000"; d="scan'208";a="202541630" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga006.fm.intel.com with ESMTP; 08 Feb 2018 04:44:35 -0800 Received: from nauris.fi.intel.com (nauris.localdomain [192.168.240.2]) by paasikivi.fi.intel.com (Postfix) with ESMTP id 2E05620B50; Thu, 8 Feb 2018 14:44:32 +0200 (EET) Received: by nauris.fi.intel.com (Postfix, from userid 1000) id A7F8B201B7; Thu, 8 Feb 2018 14:44:28 +0200 (EET) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: yong.zhi@intel.com, Yang@nauris.fi.intel.com, Hyungwoo , Rapolu@nauris.fi.intel.com, Chiranjeevi , andy.yeh@intel.com Subject: [PATCH 1/5] v4l: common: Add a function to obtain best size from a list Date: Thu, 8 Feb 2018 14:44:24 +0200 Message-Id: <1518093868-3444-2-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518093868-3444-1-git-send-email-sakari.ailus@linux.intel.com> References: <1518093868-3444-1-git-send-email-sakari.ailus@linux.intel.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a function (as well as a helper macro) to obtain the best size in a list of device specific sizes. This helps writing drivers as well as aligns interface behaviour across drivers. The struct in which this information is contained in is typically specific to the driver, therefore the existing function v4l2_find_nearest_format() does not address the need. Signed-off-by: Sakari Ailus --- drivers/media/v4l2-core/v4l2-common.c | 30 ++++++++++++++++++++++++++++++ include/media/v4l2-common.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index 8650ad9..c7a48f2 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -383,6 +383,36 @@ v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes, } EXPORT_SYMBOL_GPL(v4l2_find_nearest_format); +const void * +__v4l2_find_nearest_size(const void *arr, size_t num_entries, size_t entry_size, + size_t width_offset, size_t height_offset, + s32 width, s32 height) +{ + u32 error, min_error = U32_MAX; + const void *best = NULL; + unsigned int i; + + if (!arr) + return NULL; + + for (i = 0; i < num_entries; i++, arr += entry_size) { + const u32 *entry_width = arr + width_offset; + const u32 *entry_height = arr + height_offset; + + error = abs(*entry_width - width) + abs(*entry_height - height); + if (error > min_error) + continue; + + min_error = error; + best = arr; + if (!error) + break; + } + + return best; +} +EXPORT_SYMBOL_GPL(__v4l2_find_nearest_size); + void v4l2_get_timestamp(struct timeval *tv) { struct timespec ts; diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index e0d95a7..520463e 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -333,6 +333,39 @@ v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes, s32 width, s32 height); /** + * v4l2_find_nearest_size - Find the nearest size among a discrete + * set of resolutions contained in an array of a driver specific struct. + * + * @sizes: a driver specific array of image sizes + * @width_field: the name of the width field in the driver specific struct + * @height_field: the name of the height field in the driver specific struct + * @width: desired width. + * @height: desired height. + * + * Finds the closest resolution to minimize the width and height differences + * between what requested and the supported resolutions. The size of the width + * and height fields in the driver specific must equal to that of u32, i.e. four + * bytes. + * + * Returns the best match or NULL if the length of the array is zero. + */ +#define v4l2_find_nearest_size(array, array_size, width_field, height_field, \ + width, height) \ + ({ \ + BUILD_BUG_ON(sizeof((array)->width_field) != sizeof(u32) || \ + sizeof((array)->height_field) != sizeof(u32)); \ + (typeof(&(*(array))))__v4l2_find_nearest_size( \ + (array), array_size, sizeof(*(array)), \ + offsetof(typeof(*(array)), width_field), \ + offsetof(typeof(*(array)), height_field), \ + width, height); \ + }) +const void * +__v4l2_find_nearest_size(const void *arr, size_t entry_size, + size_t width_offset, size_t height_offset, + size_t num_entries, s32 width, s32 height); + +/** * v4l2_get_timestamp - helper routine to get a timestamp to be used when * filling streaming metadata. Internally, it uses ktime_get_ts(), * which is the recommended way to get it.