From patchwork Fri Nov 20 22:53:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: m-karicheri2@ti.com X-Patchwork-Id: 2147 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 20 Nov 2009 22:53:33 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Fri, 20 Nov 2009 20:56:48 -0200 (BRST) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NBcM9-0002Jo-Jp; Fri, 20 Nov 2009 22:53:33 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754868AbZKTWxO (ORCPT + 1 other); Fri, 20 Nov 2009 17:53:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754242AbZKTWxO (ORCPT ); Fri, 20 Nov 2009 17:53:14 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:48161 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754151AbZKTWxN (ORCPT ); Fri, 20 Nov 2009 17:53:13 -0500 Received: from dlep35.itg.ti.com ([157.170.170.118]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id nAKMrJAq030082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 Nov 2009 16:53:19 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id nAKMrIVX002508; Fri, 20 Nov 2009 16:53:19 -0600 (CST) Received: from gt516km11.gt.design.ti.com (gt516km11.gt.design.ti.com [158.218.100.179]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id nAKMrIZ08922; Fri, 20 Nov 2009 16:53:18 -0600 (CST) Received: from gt516km11.gt.design.ti.com (localhost.localdomain [127.0.0.1]) by gt516km11.gt.design.ti.com (8.13.1/8.13.1) with ESMTP id nAKMrIvx014241; Fri, 20 Nov 2009 17:53:18 -0500 Received: (from a0868495@localhost) by gt516km11.gt.design.ti.com (8.13.1/8.13.1/Submit) id nAKMrIbi014238; Fri, 20 Nov 2009 17:53:18 -0500 From: m-karicheri2@ti.com To: linux-media@vger.kernel.org, hverkuil@xs4all.nl Cc: davinci-linux-open-source@linux.davincidsp.com, Muralidharan Karicheri Subject: [PATCH - v1]V4L - Adding helper function to get dv preset description Date: Fri, 20 Nov 2009 17:53:18 -0500 Message-Id: <1258757598-14216-1-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.6.0.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Muralidharan Karicheri Resending adding Reviewed-by... Updated based on review comments This patch adds a helper function to get description of a digital video preset added by the video timing API. This will be usefull for drivers implementing the above API. Signed-off-by: Muralidharan Karicheri Reviewed-by: Hans Verkuil NOTE: depends on the patch that adds video timing API. --- Applies to V4L-DVB linux-next branch drivers/media/video/v4l2-common.c | 43 +++++++++++++++++++++++++++++++++++++ include/media/v4l2-common.h | 7 ++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index f5a93ae..8b13d8e 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c @@ -1015,3 +1015,46 @@ 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_preset_info dv_presets[] = { + {0, 0, "Invalid"},/* V4L2_DV_INVALID */ + {720, 480, "480p@59.94"},/* V4L2_DV_480P59_94 */ + {720, 576, "576p@50"},/* V4L2_DV_576P50 */ + {1280, 720, "720p@24"},/* V4L2_DV_720P24 */ + {1280, 720, "720p@25"},/* V4L2_DV_720P25 */ + {1280, 720, "720p@30"},/* V4L2_DV_720P30 */ + {1280, 720, "720p@50"},/* V4L2_DV_720P50 */ + {1280, 720, "720p@59.94"},/* V4L2_DV_720P59_94 */ + {1280, 720, "720p@60"},/* V4L2_DV_720P60 */ + {1920, 1080, "1080i@29.97"},/* V4L2_DV_1080I29_97 */ + {1920, 1080, "1080i@30"},/* V4L2_DV_1080I30 */ + {1920, 1080, "1080i@25"},/* V4L2_DV_1080I25 */ + {1920, 1080, "1080i@50"},/* V4L2_DV_1080I50 */ + {1920, 1080, "1080i@60"},/* V4L2_DV_1080I60 */ + {1920, 1080, "1080p@24"},/* V4L2_DV_1080P24 */ + {1920, 1080, "1080p@25"},/* V4L2_DV_1080P25 */ + {1920, 1080, "1080p@30"},/* V4L2_DV_1080P30 */ + {1920, 1080, "1080p@50"},/* V4L2_DV_1080P50 */ + {1920, 1080, "1080p@60"},/* V4L2_DV_1080P60 */ + }; + + if (info == NULL || preset >= ARRAY_SIZE(dv_presets)) + return -EINVAL; + + info->preset = preset; + info->width = dv_presets[preset].width; + info->height = dv_presets[preset].height; + strcpy(info->name, dv_presets[preset].name); + return 0; +} +EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info); diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 1c25b10..6ec9986 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -213,4 +213,11 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin, unsigned int hmax, unsigned int halign, unsigned int salign); +struct v4l2_dv_preset_info { + u16 width; + u16 height; + const char *name; +}; + +int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info); #endif /* V4L2_COMMON_H_ */