leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: v4l: common: Remove v4l2_find_nearest_format

Browse Source 
v4l2_find_nearest_format is not useful for drivers in finding the best
matching format as it assumes a V4L2 specific struct. Drivers will use
v4l2_find_nearest_size instead.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sakari Ailus 2018-02-08 07:00:48 -05:00 committed by Mauro Carvalho Chehab
parent ac53212880
commit 3c91d24fcd
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/v4l2-core/v4l2-common.c
View File

@ -357,32 +357,6 @@ void v4l_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax,
} }
EXPORT_SYMBOL_GPL(v4l_bound_align_image); EXPORT_SYMBOL_GPL(v4l_bound_align_image);
const struct v4l2_frmsize_discrete *
v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,
size_t num_sizes,
s32 width, s32 height)
{
int i;
u32 error, min_error = UINT_MAX;
const struct v4l2_frmsize_discrete *size, *best = NULL;
if (!sizes)
return NULL;
for (i = 0, size = sizes; i < num_sizes; i++, size++) {
error = abs(size->width - width) + abs(size->height - height);
if (error < min_error) {
min_error = error;
best = size;
}
if (!error)
break;
}
return best;
}
EXPORT_SYMBOL_GPL(v4l2_find_nearest_format);
const void * const void *
__v4l2_find_nearest_size(const void *array, size_t array_size, __v4l2_find_nearest_size(const void *array, size_t array_size,
size_t entry_size, size_t width_offset, size_t entry_size, size_t width_offset,

17
include/media/v4l2-common.h
View File

@ -315,23 +315,6 @@ void v4l_bound_align_image(unsigned int *width, unsigned int wmin,
unsigned int hmax, unsigned int halign, unsigned int hmax, unsigned int halign,
unsigned int salign); unsigned int salign);
/**
* v4l2_find_nearest_format - find the nearest format size among a discrete
* set of resolutions.
*
* @sizes: array of &struct v4l2_frmsize_discrete image sizes.
* @num_sizes: length of @sizes array.
* @width: desired width.
* @height: desired height.
*
* Finds the closest resolution to minimize the width and height differences
* between what requested and the supported resolutions.
*/
const struct v4l2_frmsize_discrete *
v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,
const size_t num_sizes,
s32 width, s32 height);
/** /**
* v4l2_find_nearest_size - Find the nearest size among a discrete * v4l2_find_nearest_size - Find the nearest size among a discrete
* set of resolutions contained in an array of a driver specific struct. * set of resolutions contained in an array of a driver specific struct.