diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 11:55:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 11:55:25 -0700 |
| commit | 9c4b00913bff039abcd8852764fe0c9648d8cc8d (patch) | |
| tree | 07c84532b3692ff664098f2315ba2db0a61523ad | |
| parent | 6b48b93453349bcd921ac0cb43e88cfe493b850d (diff) | |
| download | ltsi-kernel-9c4b00913bff039abcd8852764fe0c9648d8cc8d.tar.gz | |
remove xml file from patches.armadillo800eva/0141-v4l-Add-V4L2_PIX_FMT_NV24-and-V4L2_PIX_FMT_NV42-form.patch
| -rw-r--r-- | patches.armadillo800eva/0141-v4l-Add-V4L2_PIX_FMT_NV24-and-V4L2_PIX_FMT_NV42-form.patch | 140 |
1 files changed, 4 insertions, 136 deletions
diff --git a/patches.armadillo800eva/0141-v4l-Add-V4L2_PIX_FMT_NV24-and-V4L2_PIX_FMT_NV42-form.patch b/patches.armadillo800eva/0141-v4l-Add-V4L2_PIX_FMT_NV24-and-V4L2_PIX_FMT_NV42-form.patch index 847fe3beaa31ff..afb958ebecc8df 100644 --- a/patches.armadillo800eva/0141-v4l-Add-V4L2_PIX_FMT_NV24-and-V4L2_PIX_FMT_NV42-form.patch +++ b/patches.armadillo800eva/0141-v4l-Add-V4L2_PIX_FMT_NV24-and-V4L2_PIX_FMT_NV42-form.patch @@ -14,143 +14,14 @@ Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Conflicts: Documentation/DocBook/media/v4l/pixfmt.xml + Documentation/DocBook/media/v4l/pixfmt-nv24.xml Signed-off-by: Simon Horman <horms@verge.net.au> + --- - Documentation/DocBook/media/v4l/pixfmt-nv24.xml | 121 +++++++++++++++++++++++ - include/linux/videodev2.h | 2 + - 2 files changed, 123 insertions(+) - create mode 100644 Documentation/DocBook/media/v4l/pixfmt-nv24.xml + include/linux/videodev2.h | 2 ++ + 1 file changed, 2 insertions(+) -diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv24.xml b/Documentation/DocBook/media/v4l/pixfmt-nv24.xml -new file mode 100644 -index 0000000..fb255f2 ---- /dev/null -+++ b/Documentation/DocBook/media/v4l/pixfmt-nv24.xml -@@ -0,0 +1,121 @@ -+ <refentry> -+ <refmeta> -+ <refentrytitle>V4L2_PIX_FMT_NV24 ('NV24'), V4L2_PIX_FMT_NV42 ('NV42')</refentrytitle> -+ &manvol; -+ </refmeta> -+ <refnamediv> -+ <refname id="V4L2-PIX-FMT-NV24"><constant>V4L2_PIX_FMT_NV24</constant></refname> -+ <refname id="V4L2-PIX-FMT-NV42"><constant>V4L2_PIX_FMT_NV42</constant></refname> -+ <refpurpose>Formats with full horizontal and vertical -+chroma resolutions, also known as YUV 4:4:4. One luminance and one -+chrominance plane with alternating chroma samples as opposed to -+<constant>V4L2_PIX_FMT_YVU420</constant></refpurpose> -+ </refnamediv> -+ <refsect1> -+ <title>Description</title> -+ -+ <para>These are two-plane versions of the YUV 4:4:4 format. The three -+ components are separated into two sub-images or planes. The Y plane is -+ first, with each Y sample stored in one byte per pixel. For -+ <constant>V4L2_PIX_FMT_NV24</constant>, a combined CbCr plane -+ immediately follows the Y plane in memory. The CbCr plane has the same -+ width and height, in pixels, as the Y plane (and the image). Each line -+ contains one CbCr pair per pixel, with each Cb and Cr sample stored in -+ one byte. <constant>V4L2_PIX_FMT_NV42</constant> is the same except that -+ the Cb and Cr samples are swapped, the CrCb plane starts with a Cr -+ sample.</para> -+ -+ <para>If the Y plane has pad bytes after each row, then the CbCr plane -+ has twice as many pad bytes after its rows.</para> -+ -+ <example> -+ <title><constant>V4L2_PIX_FMT_NV24</constant> 4 × 4 -+pixel image</title> -+ -+ <formalpara> -+ <title>Byte Order.</title> -+ <para>Each cell is one byte. -+ <informaltable frame="none"> -+ <tgroup cols="9" align="center"> -+ <colspec align="left" colwidth="2*" /> -+ <tbody valign="top"> -+ <row> -+ <entry>start + 0:</entry> -+ <entry>Y'<subscript>00</subscript></entry> -+ <entry>Y'<subscript>01</subscript></entry> -+ <entry>Y'<subscript>02</subscript></entry> -+ <entry>Y'<subscript>03</subscript></entry> -+ </row> -+ <row> -+ <entry>start + 4:</entry> -+ <entry>Y'<subscript>10</subscript></entry> -+ <entry>Y'<subscript>11</subscript></entry> -+ <entry>Y'<subscript>12</subscript></entry> -+ <entry>Y'<subscript>13</subscript></entry> -+ </row> -+ <row> -+ <entry>start + 8:</entry> -+ <entry>Y'<subscript>20</subscript></entry> -+ <entry>Y'<subscript>21</subscript></entry> -+ <entry>Y'<subscript>22</subscript></entry> -+ <entry>Y'<subscript>23</subscript></entry> -+ </row> -+ <row> -+ <entry>start + 12:</entry> -+ <entry>Y'<subscript>30</subscript></entry> -+ <entry>Y'<subscript>31</subscript></entry> -+ <entry>Y'<subscript>32</subscript></entry> -+ <entry>Y'<subscript>33</subscript></entry> -+ </row> -+ <row> -+ <entry>start + 16:</entry> -+ <entry>Cb<subscript>00</subscript></entry> -+ <entry>Cr<subscript>00</subscript></entry> -+ <entry>Cb<subscript>01</subscript></entry> -+ <entry>Cr<subscript>01</subscript></entry> -+ <entry>Cb<subscript>02</subscript></entry> -+ <entry>Cr<subscript>02</subscript></entry> -+ <entry>Cb<subscript>03</subscript></entry> -+ <entry>Cr<subscript>03</subscript></entry> -+ </row> -+ <row> -+ <entry>start + 24:</entry> -+ <entry>Cb<subscript>10</subscript></entry> -+ <entry>Cr<subscript>10</subscript></entry> -+ <entry>Cb<subscript>11</subscript></entry> -+ <entry>Cr<subscript>11</subscript></entry> -+ <entry>Cb<subscript>12</subscript></entry> -+ <entry>Cr<subscript>12</subscript></entry> -+ <entry>Cb<subscript>13</subscript></entry> -+ <entry>Cr<subscript>13</subscript></entry> -+ </row> -+ <row> -+ <entry>start + 32:</entry> -+ <entry>Cb<subscript>20</subscript></entry> -+ <entry>Cr<subscript>20</subscript></entry> -+ <entry>Cb<subscript>21</subscript></entry> -+ <entry>Cr<subscript>21</subscript></entry> -+ <entry>Cb<subscript>22</subscript></entry> -+ <entry>Cr<subscript>22</subscript></entry> -+ <entry>Cb<subscript>23</subscript></entry> -+ <entry>Cr<subscript>23</subscript></entry> -+ </row> -+ <row> -+ <entry>start + 40:</entry> -+ <entry>Cb<subscript>30</subscript></entry> -+ <entry>Cr<subscript>30</subscript></entry> -+ <entry>Cb<subscript>31</subscript></entry> -+ <entry>Cr<subscript>31</subscript></entry> -+ <entry>Cb<subscript>32</subscript></entry> -+ <entry>Cr<subscript>32</subscript></entry> -+ <entry>Cb<subscript>33</subscript></entry> -+ <entry>Cr<subscript>33</subscript></entry> -+ </row> -+ </tbody> -+ </tgroup> -+ </informaltable> -+ </para> -+ </formalpara> -+ </example> -+ </refsect1> -+ </refentry> -diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h -index eeeda13..bd0ab98 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -343,6 +343,8 @@ struct v4l2_pix_format { @@ -162,6 +33,3 @@ index eeeda13..bd0ab98 100644 /* two non contiguous planes - one Y, one Cr + Cb interleaved */ #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ --- -1.7.10 - |