From patchwork Wed Nov 18 18:57:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 61139 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAIIwqte015042 for ; Wed, 18 Nov 2009 18:58:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932489AbZKRS5Z (ORCPT ); Wed, 18 Nov 2009 13:57:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758268AbZKRS5Z (ORCPT ); Wed, 18 Nov 2009 13:57:25 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:53185 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932489AbZKRS5Y (ORCPT ); Wed, 18 Nov 2009 13:57:24 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id nAIIvK0v002958 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 18 Nov 2009 12:57:20 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id nAIIvJLG001600; Wed, 18 Nov 2009 12:57: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 nAIIvIZ24201; Wed, 18 Nov 2009 12:57:19 -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 nAIIvI8F004958; Wed, 18 Nov 2009 13:57:18 -0500 Received: (from a0868495@localhost) by gt516km11.gt.design.ti.com (8.13.1/8.13.1/Submit) id nAIIvH4e004955; Wed, 18 Nov 2009 13:57:17 -0500 From: m-karicheri2@ti.com To: linux-media@vger.kernel.org, hverkuil@xs4all.nl, mchehab@infradead.org Cc: davinci-linux-open-source@linux.davincidsp.com, Muralidharan Karicheri Subject: [PATCH v2] V4L - Digital Video Timings API documentation Date: Wed, 18 Nov 2009 13:57:17 -0500 Message-Id: <1258570637-4932-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 diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/common.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/common.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/common.xml 2009-11-12 09:21:05.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/common.xml 2009-11-18 12:13:34.000000000 -0500 @@ -716,6 +716,41 @@ } +
+ Digital Video (DV) Timings + + The video standards discussed so far has been dealing with Analog TV and the +corresponding video timings. Today there are many more different hardware interfaces +such as High Definition TV interfaces (HDMI), VGA, DVI connectors etc., that carries +video signals and there is a need to extend the API to allow settings video timings + on these interfaces. Since it is not possible to extend the v4l2-std-id due to +the limited bits available, a new set of IOCTLs are added to set/get video timings at +the input and output:- + + DV Presets :- Digital Video (DV) presets. These are IDs representing a +video timing at the input/output. Presets can be thought of pre-defined timings implemented +by the hardware like standards. A __u32 data type is used to represent a preset unlike the + bit mask that is used in &v4l2-std-id; allowing future extensions to support many +different presets as needed + + + Custom DV Timings :- This will allow applications to define a more detailed +custom video timings at the interface. This includes parameters such as width, height, + polarities, frontporch, backporch etc. + + + + To Enumerate and query the attributes of DV presets supported by a device, + applications use the &VIDIOC-ENUM-DV-PRESETS; ioctl. To Get the current DV preset, + application use the &VIDIOC-G-DV-PRESET; ioctl and to Set a preset it uses the + &VIDIOC-S-DV-PRESET; ioctl. + To Set a Custom DV timings at the device, applications use the + &VIDIOC-S-DV-TIMINGS; ioctl and to Get current Custom DV timings, it uses the + &VIDIOC-G-DV-TIMINGS; ioctl. + Applications can make use of the and + flags to decide what ioctls available to set the +video timings at the device. +
&sub-controls; diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/v4l2.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/v4l2.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/v4l2.xml 2009-11-12 09:21:05.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/v4l2.xml 2009-11-18 12:13:57.000000000 -0500 @@ -416,6 +416,10 @@ &sub-enum-frameintervals; &sub-enuminput; &sub-enumoutput; + &sub-enum-dv-presets; + &sub-g-dv-preset; + &sub-query-dv-preset; + &sub-g-dv-timings; &sub-enumstd; &sub-g-audio; &sub-g-audioout; diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml 1969-12-31 19:00:00.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-enum-dv-presets.xml 2009-11-18 12:14:25.000000000 -0500 @@ -0,0 +1,167 @@ + + + ioctl VIDIOC_ENUM_DV_PRESETS + &manvol; + + + + VIDIOC_ENUM_DV_PRESETS + Enumerate supported Digital Video Presets + + + + + + int ioctl + int fd + int request + struct v4l2_dv_enum_preset *argp + + + + + + Arguments + + + + fd + + &fd; + + + + request + + VIDIOC_ENUM_DV_PRESETS + + + + argp + + + + + + + + + Description + + To query the attributes of a DV preset, applications initialize the +index field of &v4l2-dv-enum-preset; and call the +VIDIOC_ENUM_DV_PRESETS ioctl with a pointer to this +structure. Drivers fill the rest of the structure or return an +&EINVAL; when the index is out of bounds. To enumerate all DV Presets supported, +applications shall begin at index zero, incrementing by one until the +driver returns EINVAL. Drivers may enumerate a +different set of DV Presets after switching the video input or +output. + + + struct <structname>v4l2_dv_enum_presets</structname> + + &cs-str; + + + __u32 + index + Number of the DV preset, set by the +application. + + + __u32 + preset + This field identify one of the DV Preset value listed below + + + __u8 + name[24] + Name of the preset, a NUL-terminated ASCII +string, for example: "720P-60", "1080I-60". This information is +intended for the user. + + + __u32 + width + Width in pixels of the DV preset. + + + __u32 + height + Height in lines of the DV preset. + + + __u32 + reserved[4] + Reserved for future extensions. Drivers must set +the array to zero. + + + +
+ + +#define V4L2_DV_PRESET_BASE 0x00000000 +#define V4L2_DV_INVALID (V4L2_DV_PRESET_BASE + 0) +/* BT.1362 */ +#define V4L2_DV_480P59_94 (V4L2_DV_PRESET_BASE + 1) +/* BT.1362 */ +#define V4L2_DV_576P50 (V4L2_DV_PRESET_BASE + 2) +/* SMPTE 296M */ +#define V4L2_DV_720P24 (V4L2_DV_PRESET_BASE + 3) +/* SMPTE 296M */ +#define V4L2_DV_720P25 (V4L2_DV_PRESET_BASE + 4) +/* SMPTE 296M */ +#define V4L2_DV_720P30 (V4L2_DV_PRESET_BASE + 5) +/* SMPTE 296M */ +#define V4L2_DV_720P50 (V4L2_DV_PRESET_BASE + 6) +/* SMPTE 274M */ +#define V4L2_DV_720P59_94 (V4L2_DV_PRESET_BASE + 7) +/* SMPTE 274M/296M */ +#define V4L2_DV_720P60 (V4L2_DV_PRESET_BASE + 8) +/* BT.1120/ SMPTE 274M */ +#define V4L2_DV_1080I29_97 (V4L2_DV_PRESET_BASE + 9) +/* BT.1120/ SMPTE 274M */ +#define V4L2_DV_1080I30 (V4L2_DV_PRESET_BASE + 10) +/* BT.1120 */ +#define V4L2_DV_1080I25 (V4L2_DV_PRESET_BASE + 11) +/* SMPTE 296M */ +#define V4L2_DV_1080I50 (V4L2_DV_PRESET_BASE + 12) +/* SMPTE 296M */ +#define V4L2_DV_1080I60 (V4L2_DV_PRESET_BASE + 13) +/* SMPTE 296M */ +#define V4L2_DV_1080P24 (V4L2_DV_PRESET_BASE + 14) +/* SMPTE 296M */ +#define V4L2_DV_1080P25 (V4L2_DV_PRESET_BASE + 15) +/* SMPTE 296M */ +#define V4L2_DV_1080P30 (V4L2_DV_PRESET_BASE + 16) +/* BT.1120 */ +#define V4L2_DV_1080P50 (V4L2_DV_PRESET_BASE + 17) +/* BT.1120 */ +#define V4L2_DV_1080P60 (V4L2_DV_PRESET_BASE + 18) + + + + + &return-value; + + + + EINVAL + + The &v4l2-dv-enum-preset; index +is out of bounds. + + + + + + + diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-enuminput.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-enuminput.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-enuminput.xml 2009-11-12 09:21:05.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-enuminput.xml 2009-11-18 12:14:54.000000000 -0500 @@ -124,7 +124,13 @@ __u32 - reserved[4] + capabilities + This field provides capabilities that exists at the +input. See for flags + + + __u32 + reserved[3] Reserved for future extensions. Drivers must set the array to zero. @@ -261,6 +267,34 @@ + + + + Input capabilities + + &cs-def; + + + V4L2_IN_CAP_PRESETS + 0x00000001 + This input supports setting DV PRESET using VIDIOC_S_DV_PRESET + + + V4L2_OUT_CAP_CUSTOM_TIMINGS + 0x00000002 + This input supports setting Custom timings using VIDIOC_S_DV_TIMINGS + + + V4L2_IN_CAP_STD + 0x00000004 + This input supports setting standard using VIDIOC_S_STD + + + +
diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-enumoutput.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-enumoutput.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-enumoutput.xml 2009-11-12 09:21:05.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-enumoutput.xml 2009-11-18 12:15:09.000000000 -0500 @@ -114,7 +114,13 @@ __u32 - reserved[4] + capabilities + This field provides capabilities that exists at the +output. See for flags + + + __u32 + reserved[3] Reserved for future extensions. Drivers must set the array to zero. @@ -147,6 +153,34 @@ + + + Output capabilities + + &cs-def; + + + V4L2_OUT_CAP_PRESETS + 0x00000001 + This output supports setting DV PRESET using VIDIOC_S_DV_PRESET + + + V4L2_OUT_CAP_CUSTOM_TIMINGS + 0x00000002 + This output supports setting Custom timings using VIDIOC_S_DV_TIMINGS + + + V4L2_OUT_CAP_STD + 0x00000004 + This output supports setting standard using VIDIOC_S_STD + + + +
+ &return-value; diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml 1969-12-31 19:00:00.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-g-dv-preset.xml 2009-11-18 12:15:31.000000000 -0500 @@ -0,0 +1,103 @@ + + + ioctl VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET + &manvol; + + + + VIDIOC_G_DV_PRESET + VIDIOC_S_DV_PRESET + Query or select the DV preset of the current input or output + + + + + + int ioctl + int fd + int request + &v4l2-dv-preset; +*argp + + + + + + Arguments + + + + fd + + &fd; + + + + request + + VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET + + + + argp + + + + + + + + + Description + To query and select the current DV preset, applications +use the VIDIOC_G_DV_PRESET and VIDIOC_S_DV_PRESET +ioctls which take a pointer to a &v4l2-dv-preset; type as argument. VIDIOC_G_DV_PRESET +returns a dv preset in the field preset of &v4l2-dv-preset; + + VIDIOC_S_DV_PRESET accepts a pointer to a &v4l2-dv-preset; +that has the preset value to be set. If the preset is not supported, it +returns an &EINVAL; + + + + &return-value; + + + + EINVAL + + This ioctl is not supported, or the +VIDIOC_S_DV_PRESET,VIDIOC_S_DV_PRESET parameter was unsuitable. + + + + + + struct <structname>v4l2_dv_preset</structname> + + &cs-str; + + + __u32 + preset + preset value to represent the digital video timings + + + __u32 + reserved[4] + Reserved fields for future use + + + +
+ + + + + diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml 1969-12-31 19:00:00.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-g-dv-timings.xml 2009-11-18 12:15:42.000000000 -0500 @@ -0,0 +1,195 @@ + + + ioctl VIDIOC_G_DV_TIMINGS, VIDIOC_S_DV_TIMINGS + &manvol; + + + + VIDIOC_G_DV_TIMINGS + VIDIOC_S_DV_TIMINGS + Get or Set Custom DV Timings at input or output + + + + + + int ioctl + int fd + int request + &v4l2-dv-timings; +*argp + + + + + + Arguments + + + + fd + + &fd; + + + + request + + VIDIOC_G_DV_TIMINGS, VIDIOC_S_DV_TIMINGS + + + + argp + + + + + + + + + Description + To Set Custom DV timings at the input or output, applications use the +VIDIOC_S_DV_TIMINGS ioctl and to Get the current custom timings, +applications use VIDIOC_G_DV_TIMINGS ioctl. The detailed timing +informations are filled in using the structure &v4l2-dv-timings;. These ioctls take + a pointer to &v4l2-dv-timings; structure as argument. If the ioctl is not supported +or the timing values are not correct, driver returns an &EINVAL; + + + + &return-value; + + + + EINVAL + + This ioctl is not supported, or the +VIDIOC_S_DV_TIMINGS parameter was unsuitable. + + + + + + DV Timing types + + &cs-def; + + + V4L2_DV_BT_656_1120 + + BT.656/BT.1120 timings + + + +
+ + + + struct <structname>v4l2_bt_timings</structname> + + &cs-str; + + + __u32 + width + width in pixels + + + __u32 + height + height in lines + + + __u32 + interlaced + Interlaced or progressive + + + __u32 + polarities + Positive or negative polarity + + + __u32 + pixelclock + Pixel clock in HZ. Ex. 74.25MHz->74250000 + + + __u32 + hfrontporch + Horizpontal front porch in pixels + + + __u32 + hsync + Horizontal Sync length in pixels + + + __u32 + hbackporch + Horizontal back porch in pixels + + + __u32 + vfrontporch + Vertical front porch in pixels + + + __u32 + vsync + Vertical Sync length in lines + + + __u32 + vbackporch + Vertical back porch in lines + + + __u32 + il_vfrontporch + Vertical front porch for bottom field of interlaced field formats + + + __u32 + il_vsync + Vertical sync length for bottom field of interlaced field formats + + + __u32 + il_vbackporch + Vertical back porch for bottom field of interlaced field formats + + + +
+ + + struct <structname>v4l2_dv_timings</structname> + + &cs-str; + + + &v4l2-dv-timings-type; + type + + + + union + &v4l2-bt-timings; bt and reserved[32] + + + + +
+ + + + + diff -uNr v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml --- v4l-dvb-aba823ecaea6/linux/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml 1969-12-31 19:00:00.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/Documentation/DocBook/v4l/vidioc-query-dv-preset.xml 2009-11-18 12:15:53.000000000 -0500 @@ -0,0 +1,80 @@ + + + ioctl VIDIOC_QUERY_DV_PRESET + &manvol; + + + + VIDIOC_QUERY_DV_PRESET + Sense the DV preset received by the current +input + + + + + + int ioctl + int fd + int request + &v4l2-dv-preset; *argp + + + + + + Arguments + + + + fd + + &fd; + + + + request + + VIDIOC_QUERY_DV_PRESET + + + + argp + + + + + + + + + Description + + The hardware may be able to detect the current DV preset +automatically similar to sensing the video standard. To do so, applications +call VIDIOC_QUERY_DV_PRESET with a pointer to a + &v4l2-dv-preset; type. Once hardware detects a preset, the same is +returned in the preset field of &v4l2-dv-preset; When detection is not +possible or fails, the value V4L2_DV_INVALID is returned + + + + &return-value; + + + + EINVAL + + This ioctl is not supported. + + + + + + + diff -uNr v4l-dvb-aba823ecaea6/linux/include/linux/videodev2.h v4l-dvb-aba823ecaea6_new/linux/include/linux/videodev2.h --- v4l-dvb-aba823ecaea6/linux/include/linux/videodev2.h 2009-11-12 09:21:05.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/linux/include/linux/videodev2.h 2009-11-18 12:16:26.000000000 -0500 @@ -731,6 +731,119 @@ }; /* + * V I D E O T I M I N G S D V P R E S E T + */ +struct v4l2_dv_preset { + __u32 preset; + __u32 reserved[4]; +}; + +/* + * D V P R E S E T S E N U M E R A T I O N + */ +struct v4l2_dv_enum_preset { + __u32 index; + __u32 preset; + __u8 name[32]; /* Name of the preset timing */ + __u32 width; + __u32 height; + __u32 reserved[4]; +}; + +/* + * D V P R E S E T V A L U E S + */ +#define V4L2_DV_PRESET_BASE 0x00000000 +#define V4L2_DV_INVALID (V4L2_DV_PRESET_BASE + 0) +/* BT.1362 */ +#define V4L2_DV_480P59_94 (V4L2_DV_PRESET_BASE + 1) +/* BT.1362 */ +#define V4L2_DV_576P50 (V4L2_DV_PRESET_BASE + 2) +/* SMPTE 296M */ +#define V4L2_DV_720P24 (V4L2_DV_PRESET_BASE + 3) +/* SMPTE 296M */ +#define V4L2_DV_720P25 (V4L2_DV_PRESET_BASE + 4) +/* SMPTE 296M */ +#define V4L2_DV_720P30 (V4L2_DV_PRESET_BASE + 5) +/* SMPTE 296M */ +#define V4L2_DV_720P50 (V4L2_DV_PRESET_BASE + 6) +/* SMPTE 274M */ +#define V4L2_DV_720P59_94 (V4L2_DV_PRESET_BASE + 7) +/* SMPTE 274M/296M */ +#define V4L2_DV_720P60 (V4L2_DV_PRESET_BASE + 8) +/* BT.1120/ SMPTE 274M */ +#define V4L2_DV_1080I29_97 (V4L2_DV_PRESET_BASE + 9) +/* BT.1120/ SMPTE 274M */ +#define V4L2_DV_1080I30 (V4L2_DV_PRESET_BASE + 10) +/* BT.1120 */ +#define V4L2_DV_1080I25 (V4L2_DV_PRESET_BASE + 11) +/* SMPTE 296M */ +#define V4L2_DV_1080I50 (V4L2_DV_PRESET_BASE + 12) +/* SMPTE 296M */ +#define V4L2_DV_1080I60 (V4L2_DV_PRESET_BASE + 13) +/* SMPTE 296M */ +#define V4L2_DV_1080P24 (V4L2_DV_PRESET_BASE + 14) +/* SMPTE 296M */ +#define V4L2_DV_1080P25 (V4L2_DV_PRESET_BASE + 15) +/* SMPTE 296M */ +#define V4L2_DV_1080P30 (V4L2_DV_PRESET_BASE + 16) +/* BT.1120 */ +#define V4L2_DV_1080P50 (V4L2_DV_PRESET_BASE + 17) +/* BT.1120 */ +#define V4L2_DV_1080P60 (V4L2_DV_PRESET_BASE + 18) + +/* + * D V B T T I M I N G S + */ + +/* BT.656/BT.1120 timing data */ +struct v4l2_bt_timings { + __u32 width; /* width in pixels */ + __u32 height; /* height in lines */ + __u32 interlaced; /* Interlaced or progressive */ + __u32 polarities; /* Positive or negative polarity */ + __u64 pixelclock; /* Pixel clock in HZ. Ex. 74.25MHz->74250000 */ + __u32 hfrontporch; /* Horizpontal front porch in pixels */ + __u32 hsync; /* Horizontal Sync length in pixels */ + __u32 hbackporch; /* Horizontal back porch in pixels */ + __u32 vfrontporch; /* Vertical front porch in pixels */ + __u32 vsync; /* Vertical Sync length in lines */ + __u32 vbackporch; /* Vertical back porch in lines */ + __u32 il_vfrontporch; /* Vertical front porch for bottom field of + * interlaced field formats + */ + __u32 il_vsync; /* Vertical sync length for bottom field of + * interlaced field formats + */ + __u32 il_vbackporch; /* Vertical back porch for bottom field of + * interlaced field formats + */ + __u32 reserved[16]; +}; + +/* Interlaced or progressive format */ +#define V4L2_DV_PROGRESSIVE 0 +#define V4L2_DV_INTERLACED 1 + +/* Polarities. If bit is not set, it is assumed to be negative polarity */ +#define V4L2_DV_VSYNC_POS_POL 0x00000001 +#define V4L2_DV_HSYNC_POS_POL 0x00000002 + +/* BT.656/1120 timing type */ +enum v4l2_dv_timings_type { + V4L2_DV_BT_656_1120, +}; + +/* DV timings */ +struct v4l2_dv_timings { + enum v4l2_dv_timings_type type; + union { + struct v4l2_bt_timings bt; + __u32 reserved[32]; + }; +}; + +/* * V I D E O I N P U T S */ struct v4l2_input { @@ -741,7 +854,8 @@ __u32 tuner; /* Associated tuner */ v4l2_std_id std; __u32 status; - __u32 reserved[4]; + __u32 capabilities; + __u32 reserved[3]; }; /* Values for the 'type' field */ @@ -772,6 +886,11 @@ #define V4L2_IN_ST_NO_ACCESS 0x02000000 /* Conditional access denied */ #define V4L2_IN_ST_VTR 0x04000000 /* VTR time constant */ +/* capabilities flags */ +#define V4L2_IN_CAP_PRESETS 0x00000001 /* Supports DV_PRESETS */ +#define V4L2_IN_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports Custom timings */ +#define V4L2_IN_CAP_STD 0x00000004 /* Supports STD */ + /* * V I D E O O U T P U T S */ @@ -782,13 +901,19 @@ __u32 audioset; /* Associated audios (bitfield) */ __u32 modulator; /* Associated modulator */ v4l2_std_id std; - __u32 reserved[4]; + __u32 capabilities; + __u32 reserved[3]; }; /* Values for the 'type' field */ #define V4L2_OUTPUT_TYPE_MODULATOR 1 #define V4L2_OUTPUT_TYPE_ANALOG 2 #define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY 3 +/* capabilities flags */ +#define V4L2_OUT_CAP_PRESETS 0x00000001 /* Supports DV_PRESETS */ +#define V4L2_OUT_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports Custom timings */ +#define V4L2_OUT_CAP_STD 0x00000004 /* Supports STD */ + /* * C O N T R O L S */ @@ -1621,6 +1746,13 @@ #endif #define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek) +#define VIDIOC_ENUM_DV_PRESETS _IOWR('V', 83, struct v4l2_dv_enum_preset) +#define VIDIOC_S_DV_PRESET _IOWR('V', 84, struct v4l2_dv_preset) +#define VIDIOC_G_DV_PRESET _IOWR('V', 85, struct v4l2_dv_preset) +#define VIDIOC_QUERY_DV_PRESET _IOR('V', 86, struct v4l2_dv_preset) +#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings) +#define VIDIOC_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings) + /* Reminder: when adding new ioctls please add support for them to drivers/media/video/v4l2-compat-ioctl32.c as well! */ diff -uNr v4l-dvb-aba823ecaea6/media-specs/Makefile v4l-dvb-aba823ecaea6_new/media-specs/Makefile --- v4l-dvb-aba823ecaea6/media-specs/Makefile 2009-11-12 09:21:05.000000000 -0500 +++ v4l-dvb-aba823ecaea6_new/media-specs/Makefile 2009-11-18 12:16:59.000000000 -0500 @@ -60,6 +60,10 @@ v4l/vidioc-enumaudioout.xml \ v4l/vidioc-enuminput.xml \ v4l/vidioc-enumoutput.xml \ + v4l/vidioc-enum-dv-presets.xml \ + v4l/vidioc-g-dv-preset.xml \ + v4l/vidioc-query-dv-preset.xml \ + v4l/vidioc-g-dv-timings.xml \ v4l/vidioc-enumstd.xml \ v4l/vidioc-g-audio.xml \ v4l/vidioc-g-audioout.xml \ @@ -191,6 +195,12 @@ VIDIOC_ENUMAUDOUT \ VIDIOC_ENUMINPUT \ VIDIOC_ENUMOUTPUT \ + VIDIOC_ENUM_DV_PRESETS \ + VIDIOC_QUERY_DV_PRESET \ + VIDIOC_G_DV_PRESET \ + VIDIOC_S_DV_PRESET \ + VIDIOC_G_DV_TIMINGS \ + VIDIOC_S_DV_TIMINGS \ VIDIOC_ENUMSTD \ VIDIOC_ENUM_FMT \ VIDIOC_ENUM_FRAMEINTERVALS \ @@ -283,6 +293,7 @@ v4l2_priority \ v4l2_tuner_type \ v4l2_preemphasis \ + v4l2_dv_timings_type \ STRUCTS = \ v4l2_audio \ @@ -333,6 +344,10 @@ v4l2_tuner \ v4l2_vbi_format \ v4l2_window \ + v4l2_dv_enum_preset \ + v4l2_dv_preset \ + v4l2_dv_timings \ + v4l2_bt_timings \ ERRORS = \ EACCES \