From patchwork Fri Mar 4 15:41:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 609441 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p24Fg7M8003392 for ; Fri, 4 Mar 2011 15:42:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932347Ab1CDPmV (ORCPT ); Fri, 4 Mar 2011 10:42:21 -0500 Received: from mailout2.w1.samsung.com ([210.118.77.12]:27370 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759767Ab1CDPmF (ORCPT ); Fri, 4 Mar 2011 10:42:05 -0500 Received: from eu_spt1 (mailout2.w1.samsung.com [210.118.77.12]) by mailout2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTP id <0LHJ00K90IA2GT@mailout2.w1.samsung.com>; Fri, 04 Mar 2011 15:42:02 +0000 (GMT) Received: from linux.samsung.com ([106.116.38.10]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LHJ00COAIA131@spt1.w1.samsung.com>; Fri, 04 Mar 2011 15:42:01 +0000 (GMT) Received: from localhost.localdomain (davsrvsmtp01.bs.local [106.116.38.10]) by linux.samsung.com (Postfix) with ESMTP id 2E47727005E; Fri, 04 Mar 2011 16:42:44 +0100 (CET) Date: Fri, 04 Mar 2011 16:41:51 +0100 From: Tomasz Stanislawski Subject: [PATCH 3/6] v4l: add macro for 1080p59_54 preset In-reply-to: <1299253314-10065-1-git-send-email-t.stanislaws@samsung.com> To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, m.szyprowski@samsung.com, t.stanislaws@samsung.com, kyungmin.park@samsung.com Message-id: <1299253314-10065-4-git-send-email-t.stanislaws@samsung.com> MIME-version: 1.0 X-Mailer: git-send-email 1.7.2.3 Content-type: TEXT/PLAIN Content-transfer-encoding: 7BIT References: <1299253314-10065-1-git-send-email-t.stanislaws@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 04 Mar 2011 15:42:25 +0000 (UTC) diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 940b5db..ef684f6 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c @@ -645,6 +645,7 @@ int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info) { 1920, 1080, "1080p@30" }, /* V4L2_DV_1080P30 */ { 1920, 1080, "1080p@50" }, /* V4L2_DV_1080P50 */ { 1920, 1080, "1080p@60" }, /* V4L2_DV_1080P60 */ + { 1920, 1080, "1080p@59.94" }, /* V4L2_DV_1080P59_94 */ }; if (info == NULL || preset >= ARRAY_SIZE(dv_presets)) diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index a48a42e..4a44b45 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -875,6 +875,7 @@ struct v4l2_dv_enum_preset { #define V4L2_DV_1080P30 16 /* SMPTE 296M */ #define V4L2_DV_1080P50 17 /* BT.1120 */ #define V4L2_DV_1080P60 18 /* BT.1120 */ +#define V4L2_DV_1080P59_94 19 /* * D V B T T I M I N G S