History

[media] SDI: add flag for SDI formats and SMPTE 125M definition

Adding others generic flags, which could be used by many components like GS1662.

Charles-Antoine Couret committed 10 years ago

Commit 7389e6e1 parent 618cd933 files · +27 −4Browse files

Showing the changes to include/uapi/linux (2 of 3 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/v4l2-dv-timings.h +12 −0
  2. include/uapi/linux/videodev2.h +8 −0
include/uapi/linux/v4l2-dv-timings.h+12−0
@@ -934,4 +934,16 @@ · 933 unmodified lines
934934 V4L2_DV_FL_REDUCED_BLANKING) \
935935 }
936936
937+/* SDI timings definitions */
938+
939+/* SMPTE-125M */
940+#define V4L2_DV_BT_SDI_720X487I60 { \
941+ .type = V4L2_DV_BT_656_1120, \
942+ V4L2_INIT_BT_TIMINGS(720, 487, 1, \
943+ V4L2_DV_HSYNC_POS_POL, \
944+ 13500000, 16, 121, 0, 0, 19, 0, 0, 19, 0, \
945+ V4L2_DV_BT_STD_SDI, \
946+ V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE) \
947+}
948+
937949 #endif
include/uapi/linux/videodev2.h+8−0
@@ -1274,6 +1274,7 @@ struct v4l2_bt_timings { · 1273 unmodified lines
12741274 #define V4L2_DV_BT_STD_DMT (1 << 1) /* VESA Discrete Monitor Timings */
12751275 #define V4L2_DV_BT_STD_CVT (1 << 2) /* VESA Coordinated Video Timings */
12761276 #define V4L2_DV_BT_STD_GTF (1 << 3) /* VESA Generalized Timings Formula */
1277+#define V4L2_DV_BT_STD_SDI (1 << 4) /* SDI Timings */
12771278
12781279 /* Flags */
12791280
@@ -1305,6 +1306,11 @@ struct v4l2_bt_timings { · 25 unmodified lines
13051306 * use the range 16-235) as opposed to 0-255. All formats defined in CEA-861
13061307 * except for the 640x480 format are CE formats. */
13071308 #define V4L2_DV_FL_IS_CE_VIDEO (1 << 4)
1309+/* Some formats like SMPTE-125M have an interlaced signal with a odd
1310+ * total height. For these formats, if this flag is set, the first
1311+ * field has the extra line. If not, it is the second field.
1312+ */
1313+#define V4L2_DV_FL_FIRST_FIELD_EXTRA_LINE (1 << 5)
13081314
13091315 /* A few useful defines to calculate the total blanking and frame sizes */
13101316 #define V4L2_DV_BT_BLANKING_WIDTH(bt) \
@@ -1429,6 +1435,8 @@ struct v4l2_input { · 118 unmodified lines
14291435 /* field 'status' - analog */
14301436 #define V4L2_IN_ST_NO_H_LOCK 0x00000100 /* No horizontal sync lock */
14311437 #define V4L2_IN_ST_COLOR_KILL 0x00000200 /* Color killer is active */
1438+#define V4L2_IN_ST_NO_V_LOCK 0x00000400 /* No vertical sync lock */
1439+#define V4L2_IN_ST_NO_STD_LOCK 0x00000800 /* No standard format lock */
14321440
14331441 /* field 'status' - digital */
14341442 #define V4L2_IN_ST_NO_SYNC 0x00010000 /* No synchronization lock */

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