diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2014-05-27 09:12:43 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 11:44:47 -0400 |
| commit | c96fd46afb34a554406bce9784126b96ad09091e (patch) | |
| tree | 41da27a48407bbd8d8c50d72221ea7f2ad232754 /Documentation/DocBook | |
| parent | d52e23813672c3c72f92e7b39c7408d4b9a40a96 (diff) | |
[media] v4l: Add premultiplied alpha flag for pixel formats
When set, the new V4L2_PIX_FMT_FLAG_PREMUL_ALPHA flag indicates that the
pixel values are premultiplied by the alpha channel value.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/media/v4l/pixfmt.xml | 31 | ||||
| -rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 2 |
2 files changed, 31 insertions, 2 deletions
diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml index bb36b3829cf9..87ce7f3e7178 100644 --- a/Documentation/DocBook/media/v4l/pixfmt.xml +++ b/Documentation/DocBook/media/v4l/pixfmt.xml | |||
| @@ -135,6 +135,12 @@ extended fields were set to zero. On return drivers must set the | |||
| 135 | <constant>V4L2_PIX_FMT_PRIV_MAGIC</constant> and all the extended fields to | 135 | <constant>V4L2_PIX_FMT_PRIV_MAGIC</constant> and all the extended fields to |
| 136 | applicable values.</para></entry> | 136 | applicable values.</para></entry> |
| 137 | </row> | 137 | </row> |
| 138 | <row> | ||
| 139 | <entry>__u32</entry> | ||
| 140 | <entry><structfield>flags</structfield></entry> | ||
| 141 | <entry>Flags set by the application or driver, see <xref | ||
| 142 | linkend="format-flags" />.</entry> | ||
| 143 | </row> | ||
| 138 | </tbody> | 144 | </tbody> |
| 139 | </tgroup> | 145 | </tgroup> |
| 140 | </table> | 146 | </table> |
| @@ -220,9 +226,15 @@ codes can be used.</entry> | |||
| 220 | and the number of valid entries in the | 226 | and the number of valid entries in the |
| 221 | <structfield>plane_fmt</structfield> array.</entry> | 227 | <structfield>plane_fmt</structfield> array.</entry> |
| 222 | </row> | 228 | </row> |
| 229 | <row> | ||
| 230 | <entry>__u8</entry> | ||
| 231 | <entry><structfield>flags</structfield></entry> | ||
| 232 | <entry>Flags set by the application or driver, see <xref | ||
| 233 | linkend="format-flags" />.</entry> | ||
| 234 | </row> | ||
| 223 | <row> | 235 | <row> |
| 224 | <entry>__u8</entry> | 236 | <entry>__u8</entry> |
| 225 | <entry><structfield>reserved[11]</structfield></entry> | 237 | <entry><structfield>reserved[10]</structfield></entry> |
| 226 | <entry>Reserved for future extensions. Should be zeroed by the | 238 | <entry>Reserved for future extensions. Should be zeroed by the |
| 227 | application.</entry> | 239 | application.</entry> |
| 228 | </row> | 240 | </row> |
| @@ -1079,4 +1091,21 @@ concatenated to form the JPEG stream. </para> | |||
| 1079 | </tbody> | 1091 | </tbody> |
| 1080 | </tgroup> | 1092 | </tgroup> |
| 1081 | </table> | 1093 | </table> |
| 1094 | |||
| 1095 | <table frame="none" pgwide="1" id="format-flags"> | ||
| 1096 | <title>Format Flags</title> | ||
| 1097 | <tgroup cols="3"> | ||
| 1098 | &cs-def; | ||
| 1099 | <tbody valign="top"> | ||
| 1100 | <row> | ||
| 1101 | <entry><constant>V4L2_PIX_FMT_FLAG_PREMUL_ALPHA</constant></entry> | ||
| 1102 | <entry>0x00000001</entry> | ||
| 1103 | <entry>The color values are premultiplied by the alpha channel | ||
| 1104 | value. For example, if a light blue pixel with 50% transparency was described by | ||
| 1105 | RGBA values (128, 192, 255, 128), the same pixel described with premultiplied | ||
| 1106 | colors would be described by RGBA values (64, 96, 128, 128) </entry> | ||
| 1107 | </row> | ||
| 1108 | </tbody> | ||
| 1109 | </tgroup> | ||
| 1110 | </table> | ||
| 1082 | </section> | 1111 | </section> |
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index d0a48bebfa52..f2f81f06a17b 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml | |||
| @@ -155,7 +155,7 @@ applications. --> | |||
| 155 | <revnumber>3.16</revnumber> | 155 | <revnumber>3.16</revnumber> |
| 156 | <date>2014-05-27</date> | 156 | <date>2014-05-27</date> |
| 157 | <authorinitials>lp</authorinitials> | 157 | <authorinitials>lp</authorinitials> |
| 158 | <revremark>Extended &v4l2-pix-format;. | 158 | <revremark>Extended &v4l2-pix-format;. Added format flags. |
| 159 | </revremark> | 159 | </revremark> |
| 160 | </revision> | 160 | </revision> |
| 161 | 161 | ||
