History

[media] v4l2-dv-timings: add VICs and picture aspect ratio

Add the CEA-861 VIC, the HDMI VIC and the picture aspect ratio information where applicable.

Hans Verkuil committed 10 years ago

Commit cf038121 parent a5e18f11 file · +63 −34Browse files

Showing the changes to include/uapi/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/v4l2-dv-timings.h+63−34
@@ -1,7 +1,7 @@
11 /*
22 * V4L2 DV timings header.
33 *
4− * Copyright (C) 2012 Hans Verkuil <hans.verkuil@cisco.com>
4+ * Copyright (C) 2012-2016 Hans Verkuil <hans.verkuil@cisco.com>
55 *
66 * This program is free software; you can redistribute it and/or
77 * modify it under the terms of the GNU General Public License
@@ -11,11 +11,6 @@ · 3 unmodified lines
1111 * WITHOUT ANY WARRANTY; without even the implied warranty of
1212 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1313 * General Public License for more details.
14− *
15− * You should have received a copy of the GNU General Public License
16− * along with this program; if not, write to the Free Software
17− * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
18− * 02110-1301 USA
1914 */
2015
2116 #ifndef _V4L2_DV_TIMINGS_H
@@ -33,13 +28,14 @@ · 11 unmodified lines
3328 .bt = { _width , ## args }
3429 #endif
3530
36−/* CEA-861-E timings (i.e. standard HDTV timings) */
31+/* CEA-861-F timings (i.e. standard HDTV timings) */
3732
3833 #define V4L2_DV_BT_CEA_640X480P59_94 { \
3934 .type = V4L2_DV_BT_656_1120, \
4035 V4L2_INIT_BT_TIMINGS(640, 480, 0, 0, \
4136 25175000, 16, 96, 48, 10, 2, 33, 0, 0, 0, \
42− V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, 0) \
37+ V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
38+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 1) \
4339 }
4440
4541 /* Note: these are the nominal timings, for HDMI links this format is typically
@@ -49,14 +45,18 @@ · 3 unmodified lines
4945 V4L2_INIT_BT_TIMINGS(720, 480, 1, 0, \
5046 13500000, 19, 62, 57, 4, 3, 15, 4, 3, 16, \
5147 V4L2_DV_BT_STD_CEA861, \
52− V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
48+ V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO | \
49+ V4L2_DV_FL_HAS_PICTURE_ASPECT | V4L2_DV_FL_HAS_CEA861_VIC, \
50+ { 4, 3 }, 6) \
5351 }
5452
5553 #define V4L2_DV_BT_CEA_720X480P59_94 { \
5654 .type = V4L2_DV_BT_656_1120, \
5755 V4L2_INIT_BT_TIMINGS(720, 480, 0, 0, \
5856 27000000, 16, 62, 60, 9, 6, 30, 0, 0, 0, \
59− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
57+ V4L2_DV_BT_STD_CEA861, \
58+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_PICTURE_ASPECT | \
59+ V4L2_DV_FL_HAS_CEA861_VIC, { 4, 3 }, 2) \
6060 }
6161
6262 /* Note: these are the nominal timings, for HDMI links this format is typically
@@ -66,14 +66,18 @@ · 3 unmodified lines
6666 V4L2_INIT_BT_TIMINGS(720, 576, 1, 0, \
6767 13500000, 12, 63, 69, 2, 3, 19, 2, 3, 20, \
6868 V4L2_DV_BT_STD_CEA861, \
69− V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
69+ V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO | \
70+ V4L2_DV_FL_HAS_PICTURE_ASPECT | V4L2_DV_FL_HAS_CEA861_VIC, \
71+ { 4, 3 }, 21) \
7072 }
7173
7274 #define V4L2_DV_BT_CEA_720X576P50 { \
7375 .type = V4L2_DV_BT_656_1120, \
7476 V4L2_INIT_BT_TIMINGS(720, 576, 0, 0, \
7577 27000000, 12, 64, 68, 5, 5, 39, 0, 0, 0, \
76− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
78+ V4L2_DV_BT_STD_CEA861, \
79+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_PICTURE_ASPECT | \
80+ V4L2_DV_FL_HAS_CEA861_VIC, { 4, 3 }, 17) \
7781 }
7882
7983 #define V4L2_DV_BT_CEA_1280X720P24 { \
@@ -82,7 +86,7 @@ · 2 unmodified lines
8286 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
8387 59400000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
8488 V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
85− V4L2_DV_FL_CAN_REDUCE_FPS) \
89+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 60) \
8690 }
8791
8892 #define V4L2_DV_BT_CEA_1280X720P25 { \
@@ -90,7 +94,8 @@ · 1 unmodified line
9094 V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
9195 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
9296 74250000, 2420, 40, 220, 5, 5, 20, 0, 0, 0, \
93− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
97+ V4L2_DV_BT_STD_CEA861, \
98+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 61) \
9499 }
95100
96101 #define V4L2_DV_BT_CEA_1280X720P30 { \
@@ -99,7 +104,8 @@ · 2 unmodified lines
99104 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
100105 74250000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \
101106 V4L2_DV_BT_STD_CEA861, \
102− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
107+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
108+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 62) \
103109 }
104110
105111 #define V4L2_DV_BT_CEA_1280X720P50 { \
@@ -107,7 +113,8 @@ · 1 unmodified line
107113 V4L2_INIT_BT_TIMINGS(1280, 720, 0, \
108114 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
109115 74250000, 440, 40, 220, 5, 5, 20, 0, 0, 0, \
110− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
116+ V4L2_DV_BT_STD_CEA861, \
117+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 19) \
111118 }
112119
113120 #define V4L2_DV_BT_CEA_1280X720P60 { \
@@ -116,7 +123,8 @@ · 2 unmodified lines
116123 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
117124 74250000, 110, 40, 220, 5, 5, 20, 0, 0, 0, \
118125 V4L2_DV_BT_STD_CEA861, \
119− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
126+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
127+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 4) \
120128 }
121129
122130 #define V4L2_DV_BT_CEA_1920X1080P24 { \
@@ -125,7 +133,8 @@ · 2 unmodified lines
125133 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
126134 74250000, 638, 44, 148, 4, 5, 36, 0, 0, 0, \
127135 V4L2_DV_BT_STD_CEA861, \
128− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
136+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
137+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 32) \
129138 }
130139
131140 #define V4L2_DV_BT_CEA_1920X1080P25 { \
@@ -133,7 +142,8 @@ · 1 unmodified line
133142 V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
134143 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
135144 74250000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
136− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
145+ V4L2_DV_BT_STD_CEA861, \
146+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 33) \
137147 }
138148
139149 #define V4L2_DV_BT_CEA_1920X1080P30 { \
@@ -142,7 +152,8 @@ · 2 unmodified lines
142152 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
143153 74250000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
144154 V4L2_DV_BT_STD_CEA861, \
145− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
155+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
156+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 34) \
146157 }
147158
148159 #define V4L2_DV_BT_CEA_1920X1080I50 { \
@@ -151,7 +162,8 @@ · 2 unmodified lines
151162 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
152163 74250000, 528, 44, 148, 2, 5, 15, 2, 5, 16, \
153164 V4L2_DV_BT_STD_CEA861, \
154− V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
165+ V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO | \
166+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 20) \
155167 }
156168
157169 #define V4L2_DV_BT_CEA_1920X1080P50 { \
@@ -159,7 +171,8 @@ · 1 unmodified line
159171 V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \
160172 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
161173 148500000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \
162− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
174+ V4L2_DV_BT_STD_CEA861, \
175+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 31) \
163176 }
164177
165178 #define V4L2_DV_BT_CEA_1920X1080I60 { \
@@ -169,7 +182,8 @@ · 3 unmodified lines
169182 74250000, 88, 44, 148, 2, 5, 15, 2, 5, 16, \
170183 V4L2_DV_BT_STD_CEA861, \
171184 V4L2_DV_FL_CAN_REDUCE_FPS | \
172− V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \
185+ V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO | \
186+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 5) \
173187 }
174188
175189 #define V4L2_DV_BT_CEA_1920X1080P60 { \
@@ -178,7 +192,8 @@ · 2 unmodified lines
178192 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
179193 148500000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \
180194 V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \
181− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
195+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
196+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 16) \
182197 }
183198
184199 #define V4L2_DV_BT_CEA_3840X2160P24 { \
@@ -187,7 +202,9 @@ · 2 unmodified lines
187202 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
188203 297000000, 1276, 88, 296, 8, 10, 72, 0, 0, 0, \
189204 V4L2_DV_BT_STD_CEA861, \
190− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
205+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
206+ V4L2_DV_FL_HAS_CEA861_VIC | V4L2_DV_FL_HAS_HDMI_VIC, \
207+ { 0, 0 }, 93, 3) \
191208 }
192209
193210 #define V4L2_DV_BT_CEA_3840X2160P25 { \
@@ -195,7 +212,9 @@ · 1 unmodified line
195212 V4L2_INIT_BT_TIMINGS(3840, 2160, 0, \
196213 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
197214 297000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
198− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
215+ V4L2_DV_BT_STD_CEA861, \
216+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC | \
217+ V4L2_DV_FL_HAS_HDMI_VIC, { 0, 0 }, 94, 2) \
199218 }
200219
201220 #define V4L2_DV_BT_CEA_3840X2160P30 { \
@@ -204,7 +223,9 @@ · 2 unmodified lines
204223 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
205224 297000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
206225 V4L2_DV_BT_STD_CEA861, \
207− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
226+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
227+ V4L2_DV_FL_HAS_CEA861_VIC | V4L2_DV_FL_HAS_HDMI_VIC, \
228+ { 0, 0 }, 95, 1) \
208229 }
209230
210231 #define V4L2_DV_BT_CEA_3840X2160P50 { \
@@ -212,7 +233,8 @@ · 1 unmodified line
212233 V4L2_INIT_BT_TIMINGS(3840, 2160, 0, \
213234 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
214235 594000000, 1056, 88, 296, 8, 10, 72, 0, 0, 0, \
215− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
236+ V4L2_DV_BT_STD_CEA861, \
237+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 96) \
216238 }
217239
218240 #define V4L2_DV_BT_CEA_3840X2160P60 { \
@@ -221,7 +243,8 @@ · 2 unmodified lines
221243 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
222244 594000000, 176, 88, 296, 8, 10, 72, 0, 0, 0, \
223245 V4L2_DV_BT_STD_CEA861, \
224− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
246+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
247+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 97) \
225248 }
226249
227250 #define V4L2_DV_BT_CEA_4096X2160P24 { \
@@ -230,7 +253,9 @@ · 2 unmodified lines
230253 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
231254 297000000, 1020, 88, 296, 8, 10, 72, 0, 0, 0, \
232255 V4L2_DV_BT_STD_CEA861, \
233− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
256+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
257+ V4L2_DV_FL_HAS_CEA861_VIC | V4L2_DV_FL_HAS_HDMI_VIC, \
258+ { 0, 0 }, 98, 4) \
234259 }
235260
236261 #define V4L2_DV_BT_CEA_4096X2160P25 { \
@@ -238,7 +263,8 @@ · 1 unmodified line
238263 V4L2_INIT_BT_TIMINGS(4096, 2160, 0, \
239264 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
240265 297000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
241− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
266+ V4L2_DV_BT_STD_CEA861, \
267+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 99) \
242268 }
243269
244270 #define V4L2_DV_BT_CEA_4096X2160P30 { \
@@ -247,7 +273,8 @@ · 2 unmodified lines
247273 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
248274 297000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
249275 V4L2_DV_BT_STD_CEA861, \
250− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
276+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
277+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 100) \
251278 }
252279
253280 #define V4L2_DV_BT_CEA_4096X2160P50 { \
@@ -255,7 +282,8 @@ · 1 unmodified line
255282 V4L2_INIT_BT_TIMINGS(4096, 2160, 0, \
256283 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
257284 594000000, 968, 88, 128, 8, 10, 72, 0, 0, 0, \
258− V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \
285+ V4L2_DV_BT_STD_CEA861, \
286+ V4L2_DV_FL_IS_CE_VIDEO | V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 101) \
259287 }
260288
261289 #define V4L2_DV_BT_CEA_4096X2160P60 { \
@@ -264,7 +292,8 @@ · 2 unmodified lines
264292 V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \
265293 594000000, 88, 88, 128, 8, 10, 72, 0, 0, 0, \
266294 V4L2_DV_BT_STD_CEA861, \
267− V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \
295+ V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO | \
296+ V4L2_DV_FL_HAS_CEA861_VIC, { 0, 0 }, 102) \
268297 }
269298
270299

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t