forked from Minki/linux
V4L/DVB: v4l2-common: Move v4l2_find_nearest_format from videodev2.h to v4l2-common.h
This function is an internal API and belongs in v4l2-common.h, not videodev.h. The return pointer and probe argument should be const as well. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
e3cfd447d0
commit
3fd8e647ea
@ -677,12 +677,13 @@ int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info);
|
||||
|
||||
struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe,
|
||||
s32 width, s32 height)
|
||||
const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
|
||||
const struct v4l2_discrete_probe *probe,
|
||||
s32 width, s32 height)
|
||||
{
|
||||
int i;
|
||||
u32 error, min_error = UINT_MAX;
|
||||
struct v4l2_frmsize_discrete *size, *best = NULL;
|
||||
const struct v4l2_frmsize_discrete *size, *best = NULL;
|
||||
|
||||
if (!probe)
|
||||
return best;
|
||||
|
@ -397,14 +397,6 @@ struct v4l2_frmsize_discrete {
|
||||
__u32 height; /* Frame height [pixel] */
|
||||
};
|
||||
|
||||
struct v4l2_discrete_probe {
|
||||
const struct v4l2_frmsize_discrete *sizes;
|
||||
int num_sizes;
|
||||
};
|
||||
|
||||
struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe,
|
||||
s32 width, s32 height);
|
||||
|
||||
struct v4l2_frmsize_stepwise {
|
||||
__u32 min_width; /* Minimum frame width [pixel] */
|
||||
__u32 max_width; /* Maximum frame width [pixel] */
|
||||
|
@ -232,4 +232,14 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
|
||||
unsigned int hmax, unsigned int halign,
|
||||
unsigned int salign);
|
||||
int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info);
|
||||
|
||||
struct v4l2_discrete_probe {
|
||||
const struct v4l2_frmsize_discrete *sizes;
|
||||
int num_sizes;
|
||||
};
|
||||
|
||||
const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
|
||||
const struct v4l2_discrete_probe *probe,
|
||||
s32 width, s32 height);
|
||||
|
||||
#endif /* V4L2_COMMON_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user