diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-02-16 12:23:54 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 20:28:02 -0400 |
commit | d2642485d694027ad8c918844cee0e547cc11bcb (patch) | |
tree | b404424419625b926942cb127dda39230cb39989 | |
parent | 291031192426bfc6ad4ab2eb9fa986025a926598 (diff) |
[media] V4L: Add V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 media bus format
This patch adds media bus pixel code for the interleaved JPEG/UYVY
image format used by S5C73MX Samsung cameras. This interleaved image
data is transferred on MIPI-CSI2 bus as User Defined Byte-based Data.
It also defines an experimental vendor and device specific media bus
formats section and adds related DocBook documentation.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml | 4 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/subdev-formats.xml | 44 | ||||
-rw-r--r-- | include/linux/v4l2-mediabus.h | 5 |
3 files changed, 53 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index c6ae4c9d0e0c..4fdf6b562d1c 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -2582,6 +2582,10 @@ ioctls.</para> | |||
2582 | <listitem> | 2582 | <listitem> |
2583 | <para>Support for frequency band enumeration: &VIDIOC-ENUM-FREQ-BANDS; ioctl.</para> | 2583 | <para>Support for frequency band enumeration: &VIDIOC-ENUM-FREQ-BANDS; ioctl.</para> |
2584 | </listitem> | 2584 | </listitem> |
2585 | <listitem> | ||
2586 | <para>Vendor and device specific media bus pixel formats. | ||
2587 | <xref linkend="v4l2-mbus-vendor-spec-fmts" />.</para> | ||
2588 | </listitem> | ||
2585 | </itemizedlist> | 2589 | </itemizedlist> |
2586 | </section> | 2590 | </section> |
2587 | 2591 | ||
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index 49c532ebbbbe..a0a936455fae 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml | |||
@@ -2565,5 +2565,49 @@ | |||
2565 | </tgroup> | 2565 | </tgroup> |
2566 | </table> | 2566 | </table> |
2567 | </section> | 2567 | </section> |
2568 | |||
2569 | <section id="v4l2-mbus-vendor-spec-fmts"> | ||
2570 | <title>Vendor and Device Specific Formats</title> | ||
2571 | |||
2572 | <note> | ||
2573 | <title>Experimental</title> | ||
2574 | <para>This is an <link linkend="experimental">experimental</link> | ||
2575 | interface and may change in the future.</para> | ||
2576 | </note> | ||
2577 | |||
2578 | <para>This section lists complex data formats that are either vendor or | ||
2579 | device specific. | ||
2580 | </para> | ||
2581 | |||
2582 | <para>The following table lists the existing vendor and device specific | ||
2583 | formats.</para> | ||
2584 | |||
2585 | <table pgwide="0" frame="none" id="v4l2-mbus-pixelcode-vendor-specific"> | ||
2586 | <title>Vendor and device specific formats</title> | ||
2587 | <tgroup cols="3"> | ||
2588 | <colspec colname="id" align="left" /> | ||
2589 | <colspec colname="code" align="left"/> | ||
2590 | <colspec colname="remarks" align="left"/> | ||
2591 | <thead> | ||
2592 | <row> | ||
2593 | <entry>Identifier</entry> | ||
2594 | <entry>Code</entry> | ||
2595 | <entry>Comments</entry> | ||
2596 | </row> | ||
2597 | </thead> | ||
2598 | <tbody valign="top"> | ||
2599 | <row id="V4L2-MBUS-FMT-S5C-UYVY-JPEG-1X8"> | ||
2600 | <entry>V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8</entry> | ||
2601 | <entry>0x5001</entry> | ||
2602 | <entry> | ||
2603 | Interleaved raw UYVY and JPEG image format with embedded | ||
2604 | meta-data used by Samsung S3C73MX camera sensors. | ||
2605 | </entry> | ||
2606 | </row> | ||
2607 | </tbody> | ||
2608 | </tgroup> | ||
2609 | </table> | ||
2610 | </section> | ||
2611 | |||
2568 | </section> | 2612 | </section> |
2569 | </section> | 2613 | </section> |
diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h index 5ea7f753a348..7d64e0e1a18b 100644 --- a/include/linux/v4l2-mediabus.h +++ b/include/linux/v4l2-mediabus.h | |||
@@ -92,6 +92,11 @@ enum v4l2_mbus_pixelcode { | |||
92 | 92 | ||
93 | /* JPEG compressed formats - next is 0x4002 */ | 93 | /* JPEG compressed formats - next is 0x4002 */ |
94 | V4L2_MBUS_FMT_JPEG_1X8 = 0x4001, | 94 | V4L2_MBUS_FMT_JPEG_1X8 = 0x4001, |
95 | |||
96 | /* Vendor specific formats - next is 0x5002 */ | ||
97 | |||
98 | /* S5C73M3 sensor specific interleaved UYVY and JPEG */ | ||
99 | V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 = 0x5001, | ||
95 | }; | 100 | }; |
96 | 101 | ||
97 | /** | 102 | /** |