diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-03-20 13:05:03 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-08 05:36:52 -0400 |
| commit | 5ce65d1f874ddc109780fc781bb3b099bff82001 (patch) | |
| tree | 555050a4f8daca86b193b5c8101195f7301848a7 /include/uapi | |
| parent | acd2b672b45e557829c1f080e46457586aab9d74 (diff) | |
[media] videodev2.h/v4l2-dv-timings.h: add V4L2_DV_FL_IS_CE_VIDEO flag
In the past the V4L2_DV_BT_STD_CEA861 standard bit was used to
determine whether the format is a CE (Consumer Electronics) format
or not. However, the 640x480p59.94 format is part of the CEA-861
standard, but it is *not* a CE video format.
Add a new flag to make this explicit. This information is needed
in order to determine the default R'G'B' encoding for the format:
for CE video this is limited range (16-235) instead of full range
(0-255).
The header with all the timings has been updated with this new
flag.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Martin Bugge <marbugge@cisco.com>
Cc: Mats Randgaard <mats.randgaard@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/v4l2-dv-timings.h | 64 | ||||
| -rw-r--r-- | include/uapi/linux/videodev2.h | 6 |
2 files changed, 45 insertions, 25 deletions
diff --git a/include/uapi/linux/v4l2-dv-timings.h b/include/uapi/linux/v4l2-dv-timings.h index 6c8f159e416e..c039f1d68a09 100644 --- a/include/uapi/linux/v4l2-dv-timings.h +++ b/include/uapi/linux/v4l2-dv-timings.h | |||
| @@ -48,14 +48,15 @@ | |||
| 48 | .type = V4L2_DV_BT_656_1120, \ | 48 | .type = V4L2_DV_BT_656_1120, \ |
| 49 | V4L2_INIT_BT_TIMINGS(720, 480, 1, 0, \ | 49 | V4L2_INIT_BT_TIMINGS(720, 480, 1, 0, \ |
| 50 | 13500000, 19, 62, 57, 4, 3, 15, 4, 3, 16, \ | 50 | 13500000, 19, 62, 57, 4, 3, 15, 4, 3, 16, \ |
| 51 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \ | 51 | V4L2_DV_BT_STD_CEA861, \ |
| 52 | V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | #define V4L2_DV_BT_CEA_720X480P59_94 { \ | 55 | #define V4L2_DV_BT_CEA_720X480P59_94 { \ |
| 55 | .type = V4L2_DV_BT_656_1120, \ | 56 | .type = V4L2_DV_BT_656_1120, \ |
| 56 | V4L2_INIT_BT_TIMINGS(720, 480, 0, 0, \ | 57 | V4L2_INIT_BT_TIMINGS(720, 480, 0, 0, \ |
| 57 | 27000000, 16, 62, 60, 9, 6, 30, 0, 0, 0, \ | 58 | 27000000, 16, 62, 60, 9, 6, 30, 0, 0, 0, \ |
| 58 | V4L2_DV_BT_STD_CEA861, 0) \ | 59 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \ |
| 59 | } | 60 | } |
| 60 | 61 | ||
| 61 | /* Note: these are the nominal timings, for HDMI links this format is typically | 62 | /* Note: these are the nominal timings, for HDMI links this format is typically |
| @@ -64,14 +65,15 @@ | |||
| 64 | .type = V4L2_DV_BT_656_1120, \ | 65 | .type = V4L2_DV_BT_656_1120, \ |
| 65 | V4L2_INIT_BT_TIMINGS(720, 576, 1, 0, \ | 66 | V4L2_INIT_BT_TIMINGS(720, 576, 1, 0, \ |
| 66 | 13500000, 12, 63, 69, 2, 3, 19, 2, 3, 20, \ | 67 | 13500000, 12, 63, 69, 2, 3, 19, 2, 3, 20, \ |
| 67 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \ | 68 | V4L2_DV_BT_STD_CEA861, \ |
| 69 | V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 68 | } | 70 | } |
| 69 | 71 | ||
| 70 | #define V4L2_DV_BT_CEA_720X576P50 { \ | 72 | #define V4L2_DV_BT_CEA_720X576P50 { \ |
| 71 | .type = V4L2_DV_BT_656_1120, \ | 73 | .type = V4L2_DV_BT_656_1120, \ |
| 72 | V4L2_INIT_BT_TIMINGS(720, 576, 0, 0, \ | 74 | V4L2_INIT_BT_TIMINGS(720, 576, 0, 0, \ |
| 73 | 27000000, 12, 64, 68, 5, 5, 39, 0, 0, 0, \ | 75 | 27000000, 12, 64, 68, 5, 5, 39, 0, 0, 0, \ |
| 74 | V4L2_DV_BT_STD_CEA861, 0) \ | 76 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \ |
| 75 | } | 77 | } |
| 76 | 78 | ||
| 77 | #define V4L2_DV_BT_CEA_1280X720P24 { \ | 79 | #define V4L2_DV_BT_CEA_1280X720P24 { \ |
| @@ -88,7 +90,7 @@ | |||
| 88 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ | 90 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ |
| 89 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 91 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 90 | 74250000, 2420, 40, 220, 5, 5, 20, 0, 0, 0, \ | 92 | 74250000, 2420, 40, 220, 5, 5, 20, 0, 0, 0, \ |
| 91 | V4L2_DV_BT_STD_CEA861, 0) \ | 93 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \ |
| 92 | } | 94 | } |
| 93 | 95 | ||
| 94 | #define V4L2_DV_BT_CEA_1280X720P30 { \ | 96 | #define V4L2_DV_BT_CEA_1280X720P30 { \ |
| @@ -96,7 +98,8 @@ | |||
| 96 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ | 98 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ |
| 97 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 99 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 98 | 74250000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \ | 100 | 74250000, 1760, 40, 220, 5, 5, 20, 0, 0, 0, \ |
| 99 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \ | 101 | V4L2_DV_BT_STD_CEA861, \ |
| 102 | V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 100 | } | 103 | } |
| 101 | 104 | ||
| 102 | #define V4L2_DV_BT_CEA_1280X720P50 { \ | 105 | #define V4L2_DV_BT_CEA_1280X720P50 { \ |
| @@ -104,7 +107,7 @@ | |||
| 104 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ | 107 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ |
| 105 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 108 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 106 | 74250000, 440, 40, 220, 5, 5, 20, 0, 0, 0, \ | 109 | 74250000, 440, 40, 220, 5, 5, 20, 0, 0, 0, \ |
| 107 | V4L2_DV_BT_STD_CEA861, 0) \ | 110 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \ |
| 108 | } | 111 | } |
| 109 | 112 | ||
| 110 | #define V4L2_DV_BT_CEA_1280X720P60 { \ | 113 | #define V4L2_DV_BT_CEA_1280X720P60 { \ |
| @@ -112,7 +115,8 @@ | |||
| 112 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ | 115 | V4L2_INIT_BT_TIMINGS(1280, 720, 0, \ |
| 113 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 116 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 114 | 74250000, 110, 40, 220, 5, 5, 20, 0, 0, 0, \ | 117 | 74250000, 110, 40, 220, 5, 5, 20, 0, 0, 0, \ |
| 115 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \ | 118 | V4L2_DV_BT_STD_CEA861, \ |
| 119 | V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 116 | } | 120 | } |
| 117 | 121 | ||
| 118 | #define V4L2_DV_BT_CEA_1920X1080P24 { \ | 122 | #define V4L2_DV_BT_CEA_1920X1080P24 { \ |
| @@ -120,7 +124,8 @@ | |||
| 120 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ | 124 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ |
| 121 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 125 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 122 | 74250000, 638, 44, 148, 4, 5, 36, 0, 0, 0, \ | 126 | 74250000, 638, 44, 148, 4, 5, 36, 0, 0, 0, \ |
| 123 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \ | 127 | V4L2_DV_BT_STD_CEA861, \ |
| 128 | V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 124 | } | 129 | } |
| 125 | 130 | ||
| 126 | #define V4L2_DV_BT_CEA_1920X1080P25 { \ | 131 | #define V4L2_DV_BT_CEA_1920X1080P25 { \ |
| @@ -128,7 +133,7 @@ | |||
| 128 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ | 133 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ |
| 129 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 134 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 130 | 74250000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \ | 135 | 74250000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \ |
| 131 | V4L2_DV_BT_STD_CEA861, 0) \ | 136 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \ |
| 132 | } | 137 | } |
| 133 | 138 | ||
| 134 | #define V4L2_DV_BT_CEA_1920X1080P30 { \ | 139 | #define V4L2_DV_BT_CEA_1920X1080P30 { \ |
| @@ -136,7 +141,8 @@ | |||
| 136 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ | 141 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ |
| 137 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 142 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 138 | 74250000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \ | 143 | 74250000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \ |
| 139 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_CAN_REDUCE_FPS) \ | 144 | V4L2_DV_BT_STD_CEA861, \ |
| 145 | V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 140 | } | 146 | } |
| 141 | 147 | ||
| 142 | #define V4L2_DV_BT_CEA_1920X1080I50 { \ | 148 | #define V4L2_DV_BT_CEA_1920X1080I50 { \ |
| @@ -144,7 +150,8 @@ | |||
| 144 | V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \ | 150 | V4L2_INIT_BT_TIMINGS(1920, 1080, 1, \ |
| 145 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 151 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 146 | 74250000, 528, 44, 148, 2, 5, 15, 2, 5, 16, \ | 152 | 74250000, 528, 44, 148, 2, 5, 15, 2, 5, 16, \ |
| 147 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_HALF_LINE) \ | 153 | V4L2_DV_BT_STD_CEA861, \ |
| 154 | V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 148 | } | 155 | } |
| 149 | 156 | ||
| 150 | #define V4L2_DV_BT_CEA_1920X1080P50 { \ | 157 | #define V4L2_DV_BT_CEA_1920X1080P50 { \ |
| @@ -152,7 +159,7 @@ | |||
| 152 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ | 159 | V4L2_INIT_BT_TIMINGS(1920, 1080, 0, \ |
| 153 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 160 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 154 | 148500000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \ | 161 | 148500000, 528, 44, 148, 4, 5, 36, 0, 0, 0, \ |
| 155 | V4L2_DV_BT_STD_CEA861, 0) \ | 162 | V4L2_DV_BT_STD_CEA861, V4L2_DV_FL_IS_CE_VIDEO) \ |
| 156 | } | 163 | } |
| 157 | 164 | ||
| 158 | #define V4L2_DV_BT_CEA_1920X1080I60 { \ | 165 | #define V4L2_DV_BT_CEA_1920X1080I60 { \ |
| @@ -161,7 +168,8 @@ | |||
| 161 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 168 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 162 | 74250000, 88, 44, 148, 2, 5, 15, 2, 5, 16, \ | 169 | 74250000, 88, 44, 148, 2, 5, 15, 2, 5, 16, \ |
| 163 | V4L2_DV_BT_STD_CEA861, \ | 170 | V4L2_DV_BT_STD_CEA861, \ |
| 164 | V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_HALF_LINE) \ | 171 | V4L2_DV_FL_CAN_REDUCE_FPS | \ |
| 172 | V4L2_DV_FL_HALF_LINE | V4L2_DV_FL_IS_CE_VIDEO) \ | ||
| 165 | } | 173 | } |
| 166 | 174 | ||
| 167 | #define V4L2_DV_BT_CEA_1920X1080P60 { \ | 175 | #define V4L2_DV_BT_CEA_1920X1080P60 { \ |
| @@ -170,77 +178,83 @@ | |||
| 170 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ | 178 | V4L2_DV_HSYNC_POS_POL | V4L2_DV_VSYNC_POS_POL, \ |
| 171 | 148500000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \ | 179 | 148500000, 88, 44, 148, 4, 5, 36, 0, 0, 0, \ |
| 172 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \ | 180 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_CEA861, \ |
| 173 | V4L2_DV_FL_CAN_REDUCE_FPS) \ | 181 | V4L2_DV_FL_CAN_REDUCE_FPS | V4L2_DV_FL_IS_CE_VIDEO) \ |
| 174 | } | 182 | } |
| 175 | 183 | ||
| 176 | #define V4L2_DV_BT_CEA_3840X2160P24 { \ | 184 | #define V4L2_DV_BT_CEA_3840X2160P24 { \ |
