On Thursday 19 November 2009 17:09:47 [email protected] wrote:
> From: Muralidharan Karicheri <[email protected]>
>
> This patch add a helper function to get description of a digital
> video preset added by the video timing API. Hope this will be
> usefull for drivers implementing the above API.
>
> Signed-off-by: Muralidharan Karicheri <[email protected]>
> NOTE: depends on the patch that adds video timing API.
This is very inefficient memory-wise. struct v4l2_dv_enum_preset takes 52
bytes and since I expect that we will see a lot of presets in the future,
this can add up very quickly.
IMHO it is better to make a separate struct:
struct v4l2_dv_preset_info {
u16 width;
u16 height;
const char *name;
};
static const struct v4l2_dv_preset_info dv_presets[] = {
{ 0, 0, "Invalid" }, /* V4L2_DV_INVALID */
{ 720, 480, "[email protected]" }, /* V4L2_DV_480P59_94 */
};
This is a lot more compact, especially with the strings.
> ---
> Applies to V4L-DVB linux-next branch
>
> drivers/media/video/v4l2-common.c | 135
> +++++++++++++++++++++++++++++++++++++ include/media/v4l2-common.h |
> 1 +
> 2 files changed, 136 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/media/video/v4l2-common.c
> b/drivers/media/video/v4l2-common.c index f5a93ae..245e727 100644
> --- a/drivers/media/video/v4l2-common.c
> +++ b/drivers/media/video/v4l2-common.c
> @@ -1015,3 +1015,138 @@ void v4l_bound_align_image(u32 *w, unsigned int
> wmin, unsigned int wmax, }
> }
> EXPORT_SYMBOL_GPL(v4l_bound_align_image);
> +
> +/**
> + * v4l_fill_dv_preset_info - fill description of a digital video preset
> + * @preset - preset value
> + * @info - pointer to struct v4l2_dv_enum_preset
> + *
> + * drivers can use this helper function to fill description of dv preset
> + * in info.
> + */
> +int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset
> *info) +{
> + static const struct v4l2_dv_enum_preset dv_presets[] = {
> + {
> + .preset = V4L2_DV_480P59_94,
> + .name = "[email protected]",
> + .width = 720,
> + .height = 480,
> + },
> + {
> + .preset = V4L2_DV_576P50,
> + .name = "5...@50",
> + .width = 720,
> + .height = 576,
> + },
> + {
> + .preset = V4L2_DV_720P24,
> + .name = "7...@24",
> + .width = 1280,
> + .height = 720,
> + },
> + {
> + .preset = V4L2_DV_720P25,
> + .name = "7...@25",
> + .width = 1280,
> + .height = 720,
> + },
> + {
> + .preset = V4L2_DV_720P30,
> + .name = "7...@30",
> + .width = 1280,
> + .height = 720,
> + },
> + {
> + .preset = V4L2_DV_720P50,
> + .name = "7...@50",
> + .width = 1280,
> + .height = 720,
> + },
> + {
> + .preset = V4L2_DV_720P59_94,
> + .name = "[email protected]",
> + .width = 1280,
> + .height = 720,
> + },
> + {
> + .preset = V4L2_DV_720P60,
> + .name = "7...@60",
> + .width = 1280,
> + .height = 720,
> + },
> + {
> + .preset = V4L2_DV_1080I29_97,
> + .name = "[email protected]",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080I30,
> + .name = "10...@30",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080I25,
> + .name = "10...@25",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080I50,
> + .name = "10...@50",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080I60,
> + .name = "10...@60",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080P24,
> + .name = "10...@24",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080P25,
> + .name = "10...@25",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080P30,
> + .name = "10...@30",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080P50,
> + .name = "10...@50",
> + .width = 1920,
> + .height = 1080,
> + },
> + {
> + .preset = V4L2_DV_1080P60,
> + .name = "10...@60",
> + .width = 1920,
> + .height = 1080,
> + },
> + };
> + int i;
> +
> + if (info == NULL)
> + return -EINVAL;
> +
> + for (i = 0; i < ARRAY_SIZE(dv_presets); i++) {
> + if (preset == dv_presets[i].preset) {
> + memcpy(info, &dv_presets[i], sizeof(*info));
Shorter to just do: *info = dv_presets[i];
Regards,
Hans
> + return 0;
> + }
> + }
> + return -EINVAL;
> +}
> +EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info);
> diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
> index 1c25b10..ddc040f 100644
> --- a/include/media/v4l2-common.h
> +++ b/include/media/v4l2-common.h
> @@ -213,4 +213,5 @@ 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); #endif /* V4L2_COMMON_H_ */
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
