* [PATCH v3 00/11] New raw bayer format definitions, fixes
@ 2016-08-05 10:45 Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 01/11] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats Sakari Ailus
` (11 more replies)
0 siblings, 12 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
Hi all,
This is a third version of the new bayer format patchset. The second version
of the set may be found here:
<URL:http://www.spinics.net/lists/linux-media/msg101498.html>
These patches fix and add new raw bayer format definitions. 12-bit packed
V4L2 format definition is added as well as definitions of 14-bit media bus
codes as well as unpacked and packed V4L2 formats.
No driver uses them right now, yet they're common formats needed by newer
devices that use higher bit depths so adding them would make sense.
16-bit pixel formats are added as well, and the 16-bit formats are now
expected to have 16 bits of data. 8-bit format documentation is unified.
Since v2:
- Convert documentation changes to ReST
- Use figures and word numerals consistently (3rd patch)
- Change "colour component" -> sample. This makes more sense. (3rd patch as
well as the patches adding new formats)
- Unify the documentation of 8 bits per sample formats
- 16 bpp formats now have 16 significant bits. The drivers that use them
do not depend on the optionally lower bit depth allowed by the old
definition (10th patch)
Despite these changes, I've cunningly kept Hans's acks. I hope that works
out well.
--
Cheers,
Sakari
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 01/11] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 02/11] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs Sakari Ailus
` (10 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
The 10-bit packed raw bayer format documented that the data of the first
pixel of a four-pixel group was found in the first byte and the two
highest bits of the fifth byte. This was not entirely correct. The two
bits in the fifth byte are the two lowest bits. The second pixel occupies
the second byte and third and fourth least significant bits and so on.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Aviv Greenberg <aviv.d.greenberg@intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
index d71368f..32c067c 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
@@ -54,8 +54,8 @@ Each cell is one byte.
- G\ :sub:`03high`
- - B\ :sub:`00low`\ (bits 7--6) G\ :sub:`01low`\ (bits 5--4)
- B\ :sub:`02low`\ (bits 3--2) G\ :sub:`03low`\ (bits 1--0)
+ - G\ :sub:`03low`\ (bits 7--6) B\ :sub:`02low`\ (bits 5--4)
+ G\ :sub:`01low`\ (bits 3--2) B\ :sub:`00low`\ (bits 1--0)
- .. row 2
@@ -69,8 +69,8 @@ Each cell is one byte.
- R\ :sub:`13high`
- - G\ :sub:`10low`\ (bits 7--6) R\ :sub:`11low`\ (bits 5--4)
- G\ :sub:`12low`\ (bits 3--2) R\ :sub:`13low`\ (bits 1--0)
+ - R\ :sub:`13low`\ (bits 7--6) G\ :sub:`12low`\ (bits 5--4)
+ R\ :sub:`11low`\ (bits 3--2) G\ :sub:`10low`\ (bits 1--0)
- .. row 3
@@ -84,8 +84,8 @@ Each cell is one byte.
- G\ :sub:`23high`
- - B\ :sub:`20low`\ (bits 7--6) G\ :sub:`21low`\ (bits 5--4)
- B\ :sub:`22low`\ (bits 3--2) G\ :sub:`23low`\ (bits 1--0)
+ - G\ :sub:`23low`\ (bits 7--6) B\ :sub:`22low`\ (bits 5--4)
+ G\ :sub:`21low`\ (bits 3--2) B\ :sub:`20low`\ (bits 1--0)
- .. row 4
@@ -99,5 +99,5 @@ Each cell is one byte.
- R\ :sub:`33high`
- - G\ :sub:`30low`\ (bits 7--6) R\ :sub:`31low`\ (bits 5--4)
- G\ :sub:`32low`\ (bits 3--2) R\ :sub:`33low`\ (bits 1--0)
+ - R\ :sub:`33low`\ (bits 7--6) G\ :sub:`32low`\ (bits 5--4)
+ R\ :sub:`31low`\ (bits 3--2) G\ :sub:`30low`\ (bits 1--0)
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 02/11] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 01/11] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 03/11] doc-rst: Clean up raw bayer pixel format definitions Sakari Ailus
` (9 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
The number of high order bits in samples was documented to be 6 for 12-bit
data. This is clearly wrong, fix it.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Documentation/media/uapi/v4l/pixfmt-srggb12.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
index f5303ab..b3b0709 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
@@ -30,7 +30,7 @@ described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an example
of one of these formats
**Byte Order.**
-Each cell is one byte, high 6 bits in high bytes are 0.
+Each cell is one byte, high 4 bits in high bytes are 0.
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 03/11] doc-rst: Clean up raw bayer pixel format definitions
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 01/11] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 02/11] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 04/11] doc-rst: Unify documentation of the 8-bit bayer formats Sakari Ailus
` (8 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
- Explicitly state that the most significant n bits are zeroed on 10 and
12 bpp formats.
- Remove extra comma from the last entry of the format list
- Add a missing colon before a list
- Use figures versus word numerals consistently
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
Documentation/media/uapi/v4l/pixfmt-srggb10.rst | 15 ++++++++-------
Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 8 ++++----
Documentation/media/uapi/v4l/pixfmt-srggb12.rst | 5 +++--
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10.rst
index 44a4956..deb6f19 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb10.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10.rst
@@ -21,15 +21,16 @@ Description
===========
These four pixel formats are raw sRGB / Bayer formats with 10 bits per
-colour. Each colour component is stored in a 16-bit word, with 6 unused
-high bits filled with zeros. Each n-pixel row contains n/2 green samples
-and n/2 blue or red samples, with alternating red and blue rows. Bytes
-are stored in memory in little endian order. They are conventionally
-described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an example
-of one of these formats
+sample. Each sample is stored in a 16-bit word, with 6 unused
+high bits filled with zeros. Each n-pixel row contains n/2 green samples and
+n/2 blue or red samples, with alternating red and blue rows. Bytes are
+stored in memory in little endian order. They are conventionally described
+as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an example of one of
+these formats:
**Byte Order.**
-Each cell is one byte, high 6 bits in high bytes are 0.
+Each cell is one byte, the 6 most significant bits in the high bytes
+are 0.
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
index 32c067c..b24f2e4 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
@@ -21,10 +21,10 @@ Description
===========
These four pixel formats are packed raw sRGB / Bayer formats with 10
-bits per colour. Every four consecutive colour components are packed
-into 5 bytes. Each of the first 4 bytes contain the 8 high order bits of
-the pixels, and the fifth byte contains the two least significants bits
-of each pixel, in the same order.
+bits per sample. Every four consecutive samples are packed into 5
+bytes. Each of the first 4 bytes contain the 8 high order bits
+of the pixels, and the 5th byte contains the 2 least significants
+bits of each pixel, in the same order.
Each n-pixel row contains n/2 green samples and n/2 blue or red samples,
with alternating green-red and green-blue rows. They are conventionally
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
index b3b0709..1d217f2 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
@@ -27,10 +27,11 @@ high bits filled with zeros. Each n-pixel row contains n/2 green samples
and n/2 blue or red samples, with alternating red and blue rows. Bytes
are stored in memory in little endian order. They are conventionally
described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an example
-of one of these formats
+of one of these formats:
**Byte Order.**
-Each cell is one byte, high 4 bits in high bytes are 0.
+Each cell is one byte, the 4 most significant bits in the high bytes are
+0.
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 04/11] doc-rst: Unify documentation of the 8-bit bayer formats
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (2 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 03/11] doc-rst: Clean up raw bayer pixel format definitions Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 05/11] v4l: Add packed Bayer raw12 pixel formats Sakari Ailus
` (7 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
The other raw bayer formats had a single sample depth dependent definition
whereas the 8-bit formats had one page for each. Unify the documentation
of the 8-bit formats.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
Documentation/media/uapi/v4l/pixfmt-rgb.rst | 3 -
Documentation/media/uapi/v4l/pixfmt-sbggr8.rst | 81 --------------------------
Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst | 81 --------------------------
Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst | 81 --------------------------
Documentation/media/uapi/v4l/pixfmt-srggb8.rst | 41 +++++++------
5 files changed, 23 insertions(+), 264 deletions(-)
delete mode 100644 Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
delete mode 100644 Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
delete mode 100644 Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index 4b3651c..9cc9808 100644
--- a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
@@ -11,9 +11,6 @@ RGB Formats
:maxdepth: 1
pixfmt-packed-rgb
- pixfmt-sbggr8
- pixfmt-sgbrg8
- pixfmt-sgrbg8
pixfmt-srggb8
pixfmt-sbggr16
pixfmt-srggb10
diff --git a/Documentation/media/uapi/v4l/pixfmt-sbggr8.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
deleted file mode 100644
index db4c523..0000000
--- a/Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-.. -*- coding: utf-8; mode: rst -*-
-
-.. _V4L2-PIX-FMT-SBGGR8:
-
-****************************
-V4L2_PIX_FMT_SBGGR8 ('BA81')
-****************************
-
-*man V4L2_PIX_FMT_SBGGR8(2)*
-
-Bayer RGB format
-
-
-Description
-===========
-
-This is commonly the native format of digital cameras, reflecting the
-arrangement of sensors on the CCD device. Only one red, green or blue
-value is given for each pixel. Missing components must be interpolated
-from neighbouring pixels. From left to right the first row consists of a
-blue and green value, the second row of a green and red value. This
-scheme repeats to the right and down for every two columns and rows.
-
-**Byte Order.**
-Each cell is one byte.
-
-
-
-.. flat-table::
- :header-rows: 0
- :stub-columns: 0
- :widths: 2 1 1 1 1
-
-
- - .. row 1
-
- - start + 0:
-
- - B\ :sub:`00`
-
- - G\ :sub:`01`
-
- - B\ :sub:`02`
-
- - G\ :sub:`03`
-
- - .. row 2
-
- - start + 4:
-
- - G\ :sub:`10`
-
- - R\ :sub:`11`
-
- - G\ :sub:`12`
-
- - R\ :sub:`13`
-
- - .. row 3
-
- - start + 8:
-
- - B\ :sub:`20`
-
- - G\ :sub:`21`
-
- - B\ :sub:`22`
-
- - G\ :sub:`23`
-
- - .. row 4
-
- - start + 12:
-
- - G\ :sub:`30`
-
- - R\ :sub:`31`
-
- - G\ :sub:`32`
-
- - R\ :sub:`33`
diff --git a/Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst b/Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
deleted file mode 100644
index 6345c24..0000000
--- a/Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-.. -*- coding: utf-8; mode: rst -*-
-
-.. _V4L2-PIX-FMT-SGBRG8:
-
-****************************
-V4L2_PIX_FMT_SGBRG8 ('GBRG')
-****************************
-
-*man V4L2_PIX_FMT_SGBRG8(2)*
-
-Bayer RGB format
-
-
-Description
-===========
-
-This is commonly the native format of digital cameras, reflecting the
-arrangement of sensors on the CCD device. Only one red, green or blue
-value is given for each pixel. Missing components must be interpolated
-from neighbouring pixels. From left to right the first row consists of a
-green and blue value, the second row of a red and green value. This
-scheme repeats to the right and down for every two columns and rows.
-
-**Byte Order.**
-Each cell is one byte.
-
-
-
-.. flat-table::
- :header-rows: 0
- :stub-columns: 0
- :widths: 2 1 1 1 1
-
-
- - .. row 1
-
- - start + 0:
-
- - G\ :sub:`00`
-
- - B\ :sub:`01`
-
- - G\ :sub:`02`
-
- - B\ :sub:`03`
-
- - .. row 2
-
- - start + 4:
-
- - R\ :sub:`10`
-
- - G\ :sub:`11`
-
- - R\ :sub:`12`
-
- - G\ :sub:`13`
-
- - .. row 3
-
- - start + 8:
-
- - G\ :sub:`20`
-
- - B\ :sub:`21`
-
- - G\ :sub:`22`
-
- - B\ :sub:`23`
-
- - .. row 4
-
- - start + 12:
-
- - R\ :sub:`30`
-
- - G\ :sub:`31`
-
- - R\ :sub:`32`
-
- - G\ :sub:`33`
diff --git a/Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst b/Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
deleted file mode 100644
index 51b7b8e..0000000
--- a/Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-.. -*- coding: utf-8; mode: rst -*-
-
-.. _V4L2-PIX-FMT-SGRBG8:
-
-****************************
-V4L2_PIX_FMT_SGRBG8 ('GRBG')
-****************************
-
-*man V4L2_PIX_FMT_SGRBG8(2)*
-
-Bayer RGB format
-
-
-Description
-===========
-
-This is commonly the native format of digital cameras, reflecting the
-arrangement of sensors on the CCD device. Only one red, green or blue
-value is given for each pixel. Missing components must be interpolated
-from neighbouring pixels. From left to right the first row consists of a
-green and blue value, the second row of a red and green value. This
-scheme repeats to the right and down for every two columns and rows.
-
-**Byte Order.**
-Each cell is one byte.
-
-
-
-.. flat-table::
- :header-rows: 0
- :stub-columns: 0
- :widths: 2 1 1 1 1
-
-
- - .. row 1
-
- - start + 0:
-
- - G\ :sub:`00`
-
- - R\ :sub:`01`
-
- - G\ :sub:`02`
-
- - R\ :sub:`03`
-
- - .. row 2
-
- - start + 4:
-
- - B\ :sub:`10`
-
- - G\ :sub:`11`
-
- - B\ :sub:`12`
-
- - G\ :sub:`13`
-
- - .. row 3
-
- - start + 8:
-
- - G\ :sub:`20`
-
- - R\ :sub:`21`
-
- - G\ :sub:`22`
-
- - R\ :sub:`23`
-
- - .. row 4
-
- - start + 12:
-
- - B\ :sub:`30`
-
- - G\ :sub:`31`
-
- - B\ :sub:`32`
-
- - G\ :sub:`33`
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb8.rst b/Documentation/media/uapi/v4l/pixfmt-srggb8.rst
index e88de4c..ec58ac5 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb8.rst
@@ -1,25 +1,30 @@
.. -*- coding: utf-8; mode: rst -*-
.. _V4L2-PIX-FMT-SRGGB8:
+.. _v4l2-pix-fmt-sbggr8:
+.. _v4l2-pix-fmt-sgbrg8:
+.. _v4l2-pix-fmt-sgrbg8:
-****************************
-V4L2_PIX_FMT_SRGGB8 ('RGGB')
-****************************
+***************************************************************************************************************************
+V4L2_PIX_FMT_SRGGB8 ('RGGB'), V4L2_PIX_FMT_SGRBG8 ('GRBG'), V4L2_PIX_FMT_SGBRG8 ('GBRG'), V4L2_PIX_FMT_SBGGR8 ('BA81'),
+***************************************************************************************************************************
*man V4L2_PIX_FMT_SRGGB8(2)*
-Bayer RGB format
+V4L2_PIX_FMT_SGRBG8
+V4L2_PIX_FMT_SGBRG8
+V4L2_PIX_FMT_SBGGR8
+8-bit Bayer formats
Description
===========
-This is commonly the native format of digital cameras, reflecting the
-arrangement of sensors on the CCD device. Only one red, green or blue
-value is given for each pixel. Missing components must be interpolated
-from neighbouring pixels. From left to right the first row consists of a
-red and green value, the second row of a green and blue value. This
-scheme repeats to the right and down for every two columns and rows.
+These four pixel formats are raw sRGB / Bayer formats with 8 bits per
+sample. Each sample is stored in a byte. Each n-pixel row contains n/2
+green samples and n/2 blue or red samples, with alternating red and
+blue rows. They are conventionally described as GRGR... BGBG...,
+RGRG... GBGB..., etc. Below is an example of one of these formats:
**Byte Order.**
Each cell is one byte.
@@ -36,11 +41,11 @@ Each cell is one byte.
- start + 0:
- - R\ :sub:`00`
+ - B\ :sub:`00`
- G\ :sub:`01`
- - R\ :sub:`02`
+ - B\ :sub:`02`
- G\ :sub:`03`
@@ -50,21 +55,21 @@ Each cell is one byte.
- G\ :sub:`10`
- - B\ :sub:`11`
+ - R\ :sub:`11`
- G\ :sub:`12`
- - B\ :sub:`13`
+ - R\ :sub:`13`
- .. row 3
- start + 8:
- - R\ :sub:`20`
+ - B\ :sub:`20`
- G\ :sub:`21`
- - R\ :sub:`22`
+ - B\ :sub:`22`
- G\ :sub:`23`
@@ -74,8 +79,8 @@ Each cell is one byte.
- G\ :sub:`30`
- - B\ :sub:`31`
+ - R\ :sub:`31`
- G\ :sub:`32`
- - B\ :sub:`33`
+ - R\ :sub:`33`
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 05/11] v4l: Add packed Bayer raw12 pixel formats
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (3 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 04/11] doc-rst: Unify documentation of the 8-bit bayer formats Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 11:28 ` [PATCH v3.1 " Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 06/11] media: Add 1X14 14-bit raw bayer media bus code definitions Sakari Ailus
` (6 subsequent siblings)
11 siblings, 1 reply; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
These formats are compressed 12-bit raw bayer formats with four different
pixel orders. They are similar to 10-bit variants. The formats added by
this patch are
V4L2_PIX_FMT_SBGGR12P
V4L2_PIX_FMT_SGBRG12P
V4L2_PIX_FMT_SGRBG12P
V4L2_PIX_FMT_SRGGB12P
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1 +
Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 108 +++++++++++++++++++++++
drivers/media/v4l2-core/v4l2-ioctl.c | 12 ++-
include/uapi/linux/videodev2.h | 5 ++
4 files changed, 122 insertions(+), 4 deletions(-)
create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index 9cc9808..81412f7 100644
--- a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
@@ -18,3 +18,4 @@ RGB Formats
pixfmt-srggb10alaw8
pixfmt-srggb10dpcm8
pixfmt-srggb12
+ pixfmt-srggb12p
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
new file mode 100644
index 0000000..807ecf0
--- /dev/null
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
@@ -0,0 +1,108 @@
+.. -*- coding: utf-8; mode: rst -*-
+
+.. _V4L2-PIX-FMT-SRGGB12P:
+.. _v4l2-pix-fmt-sbggr12p:
+.. _v4l2-pix-fmt-sgbrg12p:
+.. _v4l2-pix-fmt-sgrbg12p:
+
+*******************************************************************************************************************************
+V4L2_PIX_FMT_SRGGB12P ('pRAA'), V4L2_PIX_FMT_SGRBG12P ('pgAA'), V4L2_PIX_FMT_SGBRG12P ('pGAA'), V4L2_PIX_FMT_SBGGR12P ('pBAA'),
+*******************************************************************************************************************************
+
+*man V4L2_PIX_FMT_SRGGB12P(2)*
+
+V4L2_PIX_FMT_SGRBG12P
+V4L2_PIX_FMT_SGBRG12P
+V4L2_PIX_FMT_SBGGR12P
+12-bit packed Bayer formats
+
+
+Description
+===========
+
+These four pixel formats are packed raw sRGB / Bayer formats with 12
+bits per colour. Every two consecutive samples are packed into three
+bytes. Each of the first two bytes contain the 8 high order bits of
+the pixels, and the third byte contains the four least significants
+bits of each pixel, in the same order.
+
+Each n-pixel row contains n/2 green samples and n/2 blue or red
+samples, with alternating green-red and green-blue rows. They are
+conventionally described as GRGR... BGBG..., RGRG... GBGB..., etc.
+Below is an example of one of these formats:
+
+**Byte Order.**
+Each cell is one byte.
+
+
+
+.. flat-table::
+ :header-rows: 0
+ :stub-columns: 0
+ :widths: 2 1 1 1 1 1 1
+
+
+ - .. row 1
+
+ - start + 0:
+
+ - B\ :sub:`00high`
+
+ - G\ :sub:`01high`
+
+ - G\ :sub:`01low`\ (bits 7--4) B\ :sub:`00low`\ (bits 3--0)
+
+ - B\ :sub:`02high`
+
+ - G\ :sub:`03high`
+
+ - G\ :sub:`03low`\ (bits 7--4) B\ :sub:`02low`\ (bits 3--0)
+
+ - .. row 2
+
+ - start + 5:
+
+ - G\ :sub:`10high`
+
+ - R\ :sub:`11high`
+
+ - R\ :sub:`11low`\ (bits 7--4) G\ :sub:`10low`\ (bits 3--0)
+
+ - G\ :sub:`12high`
+
+ - R\ :sub:`13high`
+
+ - R\ :sub:`13low`\ (bits 3--2) G\ :sub:`12low`\ (bits 3--0)
+
+ - .. row 3
+
+ - start + 0:
+
+ - B\ :sub:`20high`
+
+ - G\ :sub:`21high`
+
+ - G\ :sub:`21low`\ (bits 7--4) B\ :sub:`20low`\ (bits 3--0)
+
+ - B\ :sub:`22high`
+
+ - G\ :sub:`23high`
+
+ - G\ :sub:`23low`\ (bits 7--4) B\ :sub:`22low`\ (bits 3--0)
+
+ - .. row 4
+
+ - start + 5:
+
+ - G\ :sub:`30high`
+
+ - R\ :sub:`31high`
+
+ - R\ :sub:`31low`\ (bits 7--4) G\ :sub:`30low`\ (bits 3--0)
+
+ - G\ :sub:`32high`
+
+ - R\ :sub:`33high`
+
+ - R\ :sub:`33low`\ (bits 3--2) G\ :sub:`32low`\ (bits 3--0)
+
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 51a0fa1..ebce910 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1213,10 +1213,6 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_SGBRG10: descr = "10-bit Bayer GBGB/RGRG"; break;
case V4L2_PIX_FMT_SGRBG10: descr = "10-bit Bayer GRGR/BGBG"; break;
case V4L2_PIX_FMT_SRGGB10: descr = "10-bit Bayer RGRG/GBGB"; break;
- case V4L2_PIX_FMT_SBGGR12: descr = "12-bit Bayer BGBG/GRGR"; break;
- case V4L2_PIX_FMT_SGBRG12: descr = "12-bit Bayer GBGB/RGRG"; break;
- case V4L2_PIX_FMT_SGRBG12: descr = "12-bit Bayer GRGR/BGBG"; break;
- case V4L2_PIX_FMT_SRGGB12: descr = "12-bit Bayer RGRG/GBGB"; break;
case V4L2_PIX_FMT_SBGGR10P: descr = "10-bit Bayer BGBG/GRGR Packed"; break;
case V4L2_PIX_FMT_SGBRG10P: descr = "10-bit Bayer GBGB/RGRG Packed"; break;
case V4L2_PIX_FMT_SGRBG10P: descr = "10-bit Bayer GRGR/BGBG Packed"; break;
@@ -1229,6 +1225,14 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_SGBRG10DPCM8: descr = "8-bit Bayer GBGB/RGRG (DPCM)"; break;
case V4L2_PIX_FMT_SGRBG10DPCM8: descr = "8-bit Bayer GRGR/BGBG (DPCM)"; break;
case V4L2_PIX_FMT_SRGGB10DPCM8: descr = "8-bit Bayer RGRG/GBGB (DPCM)"; break;
+ case V4L2_PIX_FMT_SBGGR12: descr = "12-bit Bayer BGBG/GRGR"; break;
+ case V4L2_PIX_FMT_SGBRG12: descr = "12-bit Bayer GBGB/RGRG"; break;
+ case V4L2_PIX_FMT_SGRBG12: descr = "12-bit Bayer GRGR/BGBG"; break;
+ case V4L2_PIX_FMT_SRGGB12: descr = "12-bit Bayer RGRG/GBGB"; break;
+ case V4L2_PIX_FMT_SBGGR12P: descr = "12-bit Bayer BGBG/GRGR Packed"; break;
+ case V4L2_PIX_FMT_SGBRG12P: descr = "12-bit Bayer GBGB/RGRG Packed"; break;
+ case V4L2_PIX_FMT_SGRBG12P: descr = "12-bit Bayer GRGR/BGBG Packed"; break;
+ case V4L2_PIX_FMT_SRGGB12P: descr = "12-bit Bayer RGRG/GBGB Packed"; break;
case V4L2_PIX_FMT_SBGGR16: descr = "16-bit Bayer BGBG/GRGR (Exp.)"; break;
case V4L2_PIX_FMT_SN9C20X_I420: descr = "GSPCA SN9C20X I420"; break;
case V4L2_PIX_FMT_SPCA501: descr = "GSPCA SPCA501"; break;
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 724f43e..c9b0055 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -578,6 +578,11 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */
#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */
#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12 RGRG.. GBGB.. */
+ /* 12bit raw bayer packed, 6 bytes for every 4 pixels */
+#define V4L2_PIX_FMT_SBGGR12P v4l2_fourcc('p', 'B', 'C', 'C')
+#define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C')
+#define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C')
+#define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C')
#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */
/* compressed formats */
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 06/11] media: Add 1X14 14-bit raw bayer media bus code definitions
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (4 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 05/11] v4l: Add packed Bayer raw12 pixel formats Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 07/11] doc-rst: Add 14-bit raw bayer pixel format definitions Sakari Ailus
` (5 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil, Jouni Ukkonen
From: Jouni Ukkonen <jouni.ukkonen@intel.com>
The codes will be called:
MEDIA_BUS_FMT_SBGGR14_1X14
MEDIA_BUS_FMT_SGBRG14_1X14
MEDIA_BUS_FMT_SGRBG14_1X14
MEDIA_BUS_FMT_SRGGB14_1X14
Signed-off-by: Jouni Ukkonen <jouni.ukkonen@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Documentation/media/uapi/v4l/subdev-formats.rst | 258 +++++++++++++++++++++++-
include/uapi/linux/media-bus-format.h | 6 +-
2 files changed, 262 insertions(+), 2 deletions(-)
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
index 6dbb27b..238ecfc 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -2782,7 +2782,7 @@ organization is given as an example for the first pixel only.
- Code
-
- - :cspan:`11` Data organization
+ - :cspan:`13` Data organization
- .. row 2
@@ -2790,6 +2790,10 @@ organization is given as an example for the first pixel only.
-
- Bit
+ - 13
+
+ - 12
+
- 11
- 10
@@ -2829,6 +2833,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -2860,6 +2868,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2891,6 +2903,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2922,6 +2938,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -2953,6 +2973,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -2984,6 +3008,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3015,6 +3043,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3046,6 +3078,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3077,6 +3113,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3108,6 +3148,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3139,6 +3183,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3170,6 +3218,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3201,6 +3253,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- 0
- 0
@@ -3230,6 +3286,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3261,6 +3321,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3290,6 +3354,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- 0
- 0
@@ -3321,6 +3389,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3350,6 +3422,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3381,6 +3457,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3410,6 +3490,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3437,6 +3521,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3468,6 +3556,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3499,6 +3591,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3530,6 +3626,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`9`
- r\ :sub:`8`
@@ -3557,6 +3657,10 @@ organization is given as an example for the first pixel only.
- 0x3008
-
+ - -
+
+ - -
+
- b\ :sub:`11`
- b\ :sub:`10`
@@ -3588,6 +3692,10 @@ organization is given as an example for the first pixel only.
- 0x3010
-
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3619,6 +3727,10 @@ organization is given as an example for the first pixel only.
- 0x3011
-
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3650,6 +3762,150 @@ organization is given as an example for the first pixel only.
- 0x3012
-
+ - -
+
+ - -
+
+ - r\ :sub:`11`
+
+ - r\ :sub:`10`
+
+ - r\ :sub:`9`
+
+ - r\ :sub:`8`
+
+ - r\ :sub:`7`
+
+ - r\ :sub:`6`
+
+ - r\ :sub:`5`
+
+ - r\ :sub:`4`
+
+ - r\ :sub:`3`
+
+ - r\ :sub:`2`
+
+ - r\ :sub:`1`
+
+ - r\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SBGGR14-1X14:
+
+ - MEDIA_BUS_FMT_SBGGR14_1X14
+
+ - 0x3019
+
+ -
+ - b\ :sub:`13`
+
+ - b\ :sub:`12`
+
+ - b\ :sub:`11`
+
+ - b\ :sub:`10`
+
+ - b\ :sub:`9`
+
+ - b\ :sub:`8`
+
+ - b\ :sub:`7`
+
+ - b\ :sub:`6`
+
+ - b\ :sub:`5`
+
+ - b\ :sub:`4`
+
+ - b\ :sub:`3`
+
+ - b\ :sub:`2`
+
+ - b\ :sub:`1`
+
+ - b\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SGBRG14-1X14:
+
+ - MEDIA_BUS_FMT_SGBRG14_1X14
+
+ - 0x301a
+
+ -
+ - g\ :sub:`13`
+
+ - g\ :sub:`12`
+
+ - g\ :sub:`11`
+
+ - g\ :sub:`10`
+
+ - g\ :sub:`9`
+
+ - g\ :sub:`8`
+
+ - g\ :sub:`7`
+
+ - g\ :sub:`6`
+
+ - g\ :sub:`5`
+
+ - g\ :sub:`4`
+
+ - g\ :sub:`3`
+
+ - g\ :sub:`2`
+
+ - g\ :sub:`1`
+
+ - g\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SGRBG14-1X14:
+
+ - MEDIA_BUS_FMT_SGRBG14_1X14
+
+ - 0x301b
+
+ -
+ - g\ :sub:`13`
+
+ - g\ :sub:`12`
+
+ - g\ :sub:`11`
+
+ - g\ :sub:`10`
+
+ - g\ :sub:`9`
+
+ - g\ :sub:`8`
+
+ - g\ :sub:`7`
+
+ - g\ :sub:`6`
+
+ - g\ :sub:`5`
+
+ - g\ :sub:`4`
+
+ - g\ :sub:`3`
+
+ - g\ :sub:`2`
+
+ - g\ :sub:`1`
+
+ - g\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SRGGB14-1X14:
+
+ - MEDIA_BUS_FMT_SRGGB14_1X14
+
+ - 0x301c
+
+ -
+ - r\ :sub:`13`
+
+ - r\ :sub:`12`
+
- r\ :sub:`11`
- r\ :sub:`10`
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 190d491..1dff459 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -97,7 +97,7 @@
#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
-/* Bayer - next is 0x3019 */
+/* Bayer - next is 0x301d */
#define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001
#define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013
#define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002
@@ -122,6 +122,10 @@
#define MEDIA_BUS_FMT_SGBRG12_1X12 0x3010
#define MEDIA_BUS_FMT_SGRBG12_1X12 0x3011
#define MEDIA_BUS_FMT_SRGGB12_1X12 0x3012
+#define MEDIA_BUS_FMT_SBGGR14_1X14 0x3019
+#define MEDIA_BUS_FMT_SGBRG14_1X14 0x301a
+#define MEDIA_BUS_FMT_SGRBG14_1X14 0x301b
+#define MEDIA_BUS_FMT_SRGGB14_1X14 0x301c
/* JPEG compressed formats - next is 0x4002 */
#define MEDIA_BUS_FMT_JPEG_1X8 0x4001
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 07/11] doc-rst: Add 14-bit raw bayer pixel format definitions
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (5 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 06/11] media: Add 1X14 14-bit raw bayer media bus code definitions Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 08/11] doc-rst: Add packed Bayer raw14 pixel formats Sakari Ailus
` (4 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
The formats added by this patch are:
V4L2_PIX_FMT_SBGGR14
V4L2_PIX_FMT_SGBRG14
V4L2_PIX_FMT_SGRBG14
V4L2_PIX_FMT_SRGGB14
Signed-off-by: Jouni Ukkonen <jouni.ukkonen@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1 +
Documentation/media/uapi/v4l/pixfmt-srggb14.rst | 122 ++++++++++++++++++++++++
drivers/media/v4l2-core/v4l2-ioctl.c | 4 +
include/uapi/linux/videodev2.h | 4 +
4 files changed, 131 insertions(+)
create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb14.rst
diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index 81412f7..548551a 100644
--- a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
@@ -19,3 +19,4 @@ RGB Formats
pixfmt-srggb10dpcm8
pixfmt-srggb12
pixfmt-srggb12p
+ pixfmt-srggb14
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb14.rst b/Documentation/media/uapi/v4l/pixfmt-srggb14.rst
new file mode 100644
index 0000000..829ce97
--- /dev/null
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb14.rst
@@ -0,0 +1,122 @@
+.. -*- coding: utf-8; mode: rst -*-
+
+.. _V4L2-PIX-FMT-SRGGB14:
+.. _v4l2-pix-fmt-sbggr14:
+.. _v4l2-pix-fmt-sgbrg14:
+.. _v4l2-pix-fmt-sgrbg14:
+
+
+***************************************************************************************************************************
+V4L2_PIX_FMT_SRGGB14 ('RG14'), V4L2_PIX_FMT_SGRBG14 ('GR14'), V4L2_PIX_FMT_SGBRG14 ('GB14'), V4L2_PIX_FMT_SBGGR14 ('BG14'),
+***************************************************************************************************************************
+
+*man V4L2_PIX_FMT_SRGGB14(2)*
+
+V4L2_PIX_FMT_SGRBG14
+V4L2_PIX_FMT_SGBRG14
+V4L2_PIX_FMT_SBGGR14
+14-bit Bayer formats expanded to 16 bits
+
+
+Description
+===========
+
+These four pixel formats are raw sRGB / Bayer formats with 14 bits per
+colour. Each sample is stored in a 16-bit word, with two unused high
+bits filled with zeros. Each n-pixel row contains n/2 green samples
+and n/2 blue or red samples, with alternating red and blue rows. Bytes
+are stored in memory in little endian order. They are conventionally
+described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an
+example of one of these formats:
+
+**Byte Order.**
+Each cell is one byte, the two most significant bits in the high bytes are
+zero.
+
+
+
+.. flat-table::
+ :header-rows: 0
+ :stub-columns: 0
+ :widths: 2 1 1 1 1 1 1 1 1
+
+
+ - .. row 1
+
+ - start + 0:
+
+ - B\ :sub:`00low`
+
+ - B\ :sub:`00high`
+
+ - G\ :sub:`01low`
+
+ - G\ :sub:`01high`
+
+ - B\ :sub:`02low`
+
+ - B\ :sub:`02high`
+
+ - G\ :sub:`03low`
+
+ - G\ :sub:`03high`
+
+ - .. row 2
+
+ - start + 8:
+
+ - G\ :sub:`10low`
+
+ - G\ :sub:`10high`
+
+ - R\ :sub:`11low`
+
+ - R\ :sub:`11high`
+
+ - G\ :sub:`12low`
+
+ - G\ :sub:`12high`
+
+ - R\ :sub:`13low`
+
+ - R\ :sub:`13high`
+
+ - .. row 3
+
+ - start + 16:
+
+ - B\ :sub:`20low`
+
+ - B\ :sub:`20high`
+
+ - G\ :sub:`21low`
+
+ - G\ :sub:`21high`
+
+ - B\ :sub:`22low`
+
+ - B\ :sub:`22high`
+
+ - G\ :sub:`23low`
+
+ - G\ :sub:`23high`
+
+ - .. row 4
+
+ - start + 24:
+
+ - G\ :sub:`30low`
+
+ - G\ :sub:`30high`
+
+ - R\ :sub:`31low`
+
+ - R\ :sub:`31high`
+
+ - G\ :sub:`32low`
+
+ - G\ :sub:`32high`
+
+ - R\ :sub:`33low`
+
+ - R\ :sub:`33high`
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index ebce910..29d9f8f 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1233,6 +1233,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_SGBRG12P: descr = "12-bit Bayer GBGB/RGRG Packed"; break;
case V4L2_PIX_FMT_SGRBG12P: descr = "12-bit Bayer GRGR/BGBG Packed"; break;
case V4L2_PIX_FMT_SRGGB12P: descr = "12-bit Bayer RGRG/GBGB Packed"; break;
+ case V4L2_PIX_FMT_SBGGR14: descr = "14-bit Bayer BGBG/GRGR"; break;
+ case V4L2_PIX_FMT_SGBRG14: descr = "14-bit Bayer GBGB/RGRG"; break;
+ case V4L2_PIX_FMT_SGRBG14: descr = "14-bit Bayer GRGR/BGBG"; break;
+ case V4L2_PIX_FMT_SRGGB14: descr = "14-bit Bayer RGRG/GBGB"; break;
case V4L2_PIX_FMT_SBGGR16: descr = "16-bit Bayer BGBG/GRGR (Exp.)"; break;
case V4L2_PIX_FMT_SN9C20X_I420: descr = "GSPCA SN9C20X I420"; break;
case V4L2_PIX_FMT_SPCA501: descr = "GSPCA SPCA501"; break;
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index c9b0055..dd7b29d 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -583,6 +583,10 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C')
#define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C')
#define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C')
+#define V4L2_PIX_FMT_SBGGR14 v4l2_fourcc('B', 'G', '1', '4') /* 14 BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') /* 14 GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('G', 'R', '1', '4') /* 14 GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB14 v4l2_fourcc('R', 'G', '1', '4') /* 14 RGRG.. GBGB.. */
#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */
/* compressed formats */
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 08/11] doc-rst: Add packed Bayer raw14 pixel formats
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (6 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 07/11] doc-rst: Add 14-bit raw bayer pixel format definitions Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 09/11] media: Add 1X16 16-bit raw bayer media bus code definitions Sakari Ailus
` (3 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
These formats are compressed 14-bit raw bayer formats with four different
pixel orders. They are similar to 10-bit variants. The formats added by
this patch are
V4L2_PIX_FMT_SBGGR14P
V4L2_PIX_FMT_SGBRG14P
V4L2_PIX_FMT_SGRBG14P
V4L2_PIX_FMT_SRGGB14P
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1 +
Documentation/media/uapi/v4l/pixfmt-srggb14p.rst | 127 +++++++++++++++++++++++
include/uapi/linux/videodev2.h | 5 +
3 files changed, 133 insertions(+)
create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb14p.rst
diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index 548551a..69f11ab 100644
--- a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
@@ -20,3 +20,4 @@ RGB Formats
pixfmt-srggb12
pixfmt-srggb12p
pixfmt-srggb14
+ pixfmt-srggb14p
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst
new file mode 100644
index 0000000..88d20c0
--- /dev/null
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb14p.rst
@@ -0,0 +1,127 @@
+.. -*- coding: utf-8; mode: rst -*-
+
+.. _V4L2-PIX-FMT-SRGGB14P:
+.. _v4l2-pix-fmt-sbggr14p:
+.. _v4l2-pix-fmt-sgbrg14p:
+.. _v4l2-pix-fmt-sgrbg14p:
+
+*******************************************************************************************************************************
+V4L2_PIX_FMT_SRGGB14P ('pRCC'), V4L2_PIX_FMT_SGRBG14P ('pgCC'), V4L2_PIX_FMT_SGBRG14P ('pGCC'), V4L2_PIX_FMT_SBGGR14P ('pBCC'),
+*******************************************************************************************************************************
+
+*man V4L2_PIX_FMT_SRGGB14P(2)*
+
+V4L2_PIX_FMT_SGRBG14P
+V4L2_PIX_FMT_SGBRG14P
+V4L2_PIX_FMT_SBGGR14P
+14-bit packed Bayer formats
+
+
+Description
+===========
+
+These four pixel formats are packed raw sRGB / Bayer formats with 14
+bits per colour. Every four consecutive samples are packed into seven
+bytes. Each of the first four bytes contain the eight high order bits
+of the pixels, and the three following bytes contains the six least
+significants bits of each pixel, in the same order.
+
+Each n-pixel row contains n/2 green samples and n/2 blue or red samples,
+with alternating green-red and green-blue rows. They are conventionally
+described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is an example
+of one of these formats:
+
+**Byte Order.**
+Each cell is one byte.
+
+
+
+.. flat-table::
+ :header-rows: 0
+ :stub-columns: 0
+ :widths: 2 1 1 1 1 1 1 1
+
+
+ - .. row 1
+
+ - start + 0:
+
+ - B\ :sub:`00high`
+
+ - G\ :sub:`01high`
+
+ - B\ :sub:`02high`
+
+ - G\ :sub:`03high`
+
+ - G\ :sub:`01low bits 1--0`\ (bits 7--6)
+ B\ :sub:`00low bits 5--0`\ (bits 5--0)
+
+ - R\ :sub:`02low bits 3--0`\ (bits 7--4)
+ G\ :sub:`01low bits 5--2`\ (bits 3--0)
+
+ - G\ :sub:`03low bits 5--0`\ (bits 7--2)
+ R\ :sub:`02low bits 5--4`\ (bits 1--0)
+
+ - .. row 2
+
+ - start + 7:
+
+ - G\ :sub:`00high`
+
+ - R\ :sub:`01high`
+
+ - G\ :sub:`02high`
+
+ - R\ :sub:`03high`
+
+ - R\ :sub:`01low bits 1--0`\ (bits 7--6)
+ G\ :sub:`00low bits 5--0`\ (bits 5--0)
+
+ - G\ :sub:`02low bits 3--0`\ (bits 7--4)
+ R\ :sub:`01low bits 5--2`\ (bits 3--0)
+
+ - R\ :sub:`03low bits 5--0`\ (bits 7--2)
+ G\ :sub:`02low bits 5--4`\ (bits 1--0)
+
+ - .. row 3
+
+ - start + 14
+
+ - B\ :sub:`20high`
+
+ - G\ :sub:`21high`
+
+ - B\ :sub:`22high`
+
+ - G\ :sub:`23high`
+
+ - G\ :sub:`21low bits 1--0`\ (bits 7--6)
+ B\ :sub:`20low bits 5--0`\ (bits 5--0)
+
+ - R\ :sub:`22low bits 3--0`\ (bits 7--4)
+ G\ :sub:`21low bits 5--2`\ (bits 3--0)
+
+ - G\ :sub:`23low bits 5--0`\ (bits 7--2)
+ R\ :sub:`22low bits 5--4`\ (bits 1--0)
+
+ - .. row 4
+
+ - start + 21
+
+ - G\ :sub:`30high`
+
+ - R\ :sub:`31high`
+
+ - G\ :sub:`32high`
+
+ - R\ :sub:`33high`
+
+ - R\ :sub:`31low bits 1--0`\ (bits 7--6)
+ G\ :sub:`30low bits 5--0`\ (bits 5--0)
+
+ - G\ :sub:`32low bits 3--0`\ (bits 7--4)
+ R\ :sub:`31low bits 5--2`\ (bits 3--0)
+
+ - R\ :sub:`33low bits 5--0`\ (bits 7--2)
+ G\ :sub:`32low bits 5--4`\ (bits 1--0)
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index dd7b29d..32e9e74 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -587,6 +587,11 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SGBRG14 v4l2_fourcc('G', 'B', '1', '4') /* 14 GBGB.. RGRG.. */
#define V4L2_PIX_FMT_SGRBG14 v4l2_fourcc('G', 'R', '1', '4') /* 14 GRGR.. BGBG.. */
#define V4L2_PIX_FMT_SRGGB14 v4l2_fourcc('R', 'G', '1', '4') /* 14 RGRG.. GBGB.. */
+ /* 14bit raw bayer packed, 7 bytes for every 4 pixels */
+#define V4L2_PIX_FMT_SBGGR14P v4l2_fourcc('p', 'B', 'E', 'E')
+#define V4L2_PIX_FMT_SGBRG14P v4l2_fourcc('p', 'G', 'E', 'E')
+#define V4L2_PIX_FMT_SGRBG14P v4l2_fourcc('p', 'g', 'E', 'E')
+#define V4L2_PIX_FMT_SRGGB14P v4l2_fourcc('p', 'R', 'E', 'E')
#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */
/* compressed formats */
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 09/11] media: Add 1X16 16-bit raw bayer media bus code definitions
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (7 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 08/11] doc-rst: Add packed Bayer raw14 pixel formats Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 10/11] doc-rst: 16-bit BGGR is always 16 bits Sakari Ailus
` (2 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
The codes will be called:
MEDIA_BUS_FMT_SBGGR16_1X16
MEDIA_BUS_FMT_SGBRG16_1X16
MEDIA_BUS_FMT_SGRBG16_1X16
MEDIA_BUS_FMT_SRGGB16_1X16
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
Documentation/media/uapi/v4l/subdev-formats.rst | 290 +++++++++++++++++++++++-
include/uapi/linux/media-bus-format.h | 6 +-
2 files changed, 294 insertions(+), 2 deletions(-)
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
index 238ecfc..6c1c5af 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -2782,7 +2782,7 @@ organization is given as an example for the first pixel only.
- Code
-
- - :cspan:`13` Data organization
+ - :cspan:`15` Data organization
- .. row 2
@@ -2790,6 +2790,10 @@ organization is given as an example for the first pixel only.
-
- Bit
+ - 15
+
+ - 14
+
- 13
- 12
@@ -2837,6 +2841,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -2872,6 +2880,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2907,6 +2919,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2942,6 +2958,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -2977,6 +2997,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3012,6 +3036,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3047,6 +3075,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3082,6 +3114,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3117,6 +3153,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3152,6 +3192,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3187,6 +3231,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3222,6 +3270,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3257,6 +3309,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- 0
- 0
@@ -3290,6 +3346,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3325,6 +3385,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3358,6 +3422,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- 0
- 0
@@ -3393,6 +3461,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3426,6 +3498,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3461,6 +3537,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3494,6 +3574,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3525,6 +3609,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3560,6 +3648,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3595,6 +3687,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3630,6 +3726,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`9`
- r\ :sub:`8`
@@ -3661,6 +3761,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`11`
- b\ :sub:`10`
@@ -3696,6 +3800,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3731,6 +3839,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3766,6 +3878,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`11`
- r\ :sub:`10`
@@ -3797,6 +3913,10 @@ organization is given as an example for the first pixel only.
- 0x3019
-
+ - -
+
+ - -
+
- b\ :sub:`13`
- b\ :sub:`12`
@@ -3832,6 +3952,10 @@ organization is given as an example for the first pixel only.
- 0x301a
-
+ - -
+
+ - -
+
- g\ :sub:`13`
- g\ :sub:`12`
@@ -3867,6 +3991,10 @@ organization is given as an example for the first pixel only.
- 0x301b
-
+ - -
+
+ - -
+
- g\ :sub:`13`
- g\ :sub:`12`
@@ -3902,6 +4030,166 @@ organization is given as an example for the first pixel only.
- 0x301c
-
+ - -
+
+ - -
+
+ - r\ :sub:`13`
+
+ - r\ :sub:`12`
+
+ - r\ :sub:`11`
+
+ - r\ :sub:`10`
+
+ - r\ :sub:`9`
+
+ - r\ :sub:`8`
+
+ - r\ :sub:`7`
+
+ - r\ :sub:`6`
+
+ - r\ :sub:`5`
+
+ - r\ :sub:`4`
+
+ - r\ :sub:`3`
+
+ - r\ :sub:`2`
+
+ - r\ :sub:`1`
+
+ - r\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SBGGR16-1X16:
+
+ - MEDIA_BUS_FMT_SBGGR16_1X16
+
+ - 0x301d
+
+ -
+ - b\ :sub:`15`
+
+ - b\ :sub:`14`
+
+ - b\ :sub:`13`
+
+ - b\ :sub:`12`
+
+ - b\ :sub:`11`
+
+ - b\ :sub:`10`
+
+ - b\ :sub:`9`
+
+ - b\ :sub:`8`
+
+ - b\ :sub:`7`
+
+ - b\ :sub:`6`
+
+ - b\ :sub:`5`
+
+ - b\ :sub:`4`
+
+ - b\ :sub:`3`
+
+ - b\ :sub:`2`
+
+ - b\ :sub:`1`
+
+ - b\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SGBRG16-1X16:
+
+ - MEDIA_BUS_FMT_SGBRG16_1X16
+
+ - 0x301e
+
+ -
+ - g\ :sub:`15`
+
+ - g\ :sub:`14`
+
+ - g\ :sub:`13`
+
+ - g\ :sub:`12`
+
+ - g\ :sub:`11`
+
+ - g\ :sub:`10`
+
+ - g\ :sub:`9`
+
+ - g\ :sub:`8`
+
+ - g\ :sub:`7`
+
+ - g\ :sub:`6`
+
+ - g\ :sub:`5`
+
+ - g\ :sub:`4`
+
+ - g\ :sub:`3`
+
+ - g\ :sub:`2`
+
+ - g\ :sub:`1`
+
+ - g\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SGRBG16-1X16:
+
+ - MEDIA_BUS_FMT_SGRBG16_1X16
+
+ - 0x301f
+
+ -
+ - g\ :sub:`15`
+
+ - g\ :sub:`14`
+
+ - g\ :sub:`13`
+
+ - g\ :sub:`12`
+
+ - g\ :sub:`11`
+
+ - g\ :sub:`10`
+
+ - g\ :sub:`9`
+
+ - g\ :sub:`8`
+
+ - g\ :sub:`7`
+
+ - g\ :sub:`6`
+
+ - g\ :sub:`5`
+
+ - g\ :sub:`4`
+
+ - g\ :sub:`3`
+
+ - g\ :sub:`2`
+
+ - g\ :sub:`1`
+
+ - g\ :sub:`0`
+
+ - .. _MEDIA-BUS-FMT-SRGGB16-1X16:
+
+ - MEDIA_BUS_FMT_SRGGB16_1X16
+
+ - 0x3020
+
+ -
+ - r\ :sub:`15`
+
+ - r\ :sub:`14`
+
- r\ :sub:`13`
- r\ :sub:`12`
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 1dff459..2168759 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -97,7 +97,7 @@
#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
-/* Bayer - next is 0x301d */
+/* Bayer - next is 0x3021 */
#define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001
#define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013
#define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002
@@ -126,6 +126,10 @@
#define MEDIA_BUS_FMT_SGBRG14_1X14 0x301a
#define MEDIA_BUS_FMT_SGRBG14_1X14 0x301b
#define MEDIA_BUS_FMT_SRGGB14_1X14 0x301c
+#define MEDIA_BUS_FMT_SBGGR16_1X16 0x301d
+#define MEDIA_BUS_FMT_SGBRG16_1X16 0x301e
+#define MEDIA_BUS_FMT_SGRBG16_1X16 0x301f
+#define MEDIA_BUS_FMT_SRGGB16_1X16 0x3020
/* JPEG compressed formats - next is 0x4002 */
#define MEDIA_BUS_FMT_JPEG_1X8 0x4001
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 10/11] doc-rst: 16-bit BGGR is always 16 bits
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (8 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 09/11] media: Add 1X16 16-bit raw bayer media bus code definitions Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 11/11] doc-rst: Add 16-bit raw bayer pixel format definitions Sakari Ailus
2016-08-05 11:26 ` [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
The V4L2_PIX_FMT_SBGGR16 format is documented to contain samples of fewer
than 16 bits. However, we do have specific definitions for smaller sample
sizes. Therefore, this note is redundant from the API point of view.
Currently only two drivers, am437x and davinci, use the
V4L2_PIX_FMT_SBGGR16 pixelformat currently. The sampling precision is
understood to be 16 bits in all current cases.
Remove the note on sampling precision.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
Documentation/media/uapi/v4l/pixfmt-sbggr16.rst | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
index 14446ed..7844dc3 100644
--- a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
@@ -19,9 +19,6 @@ This format is similar to
has a depth of 16 bits. The least significant byte is stored at lower
memory addresses (little-endian).
-..note:: The actual sampling precision may be lower than 16 bits,
- for example 10 bits per pixel with values in tange 0 to 1023.
-
**Byte Order.**
Each cell is one byte.
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 11/11] doc-rst: Add 16-bit raw bayer pixel format definitions
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (9 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 10/11] doc-rst: 16-bit BGGR is always 16 bits Sakari Ailus
@ 2016-08-05 10:45 ` Sakari Ailus
2016-08-05 11:26 ` [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 10:45 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
The formats added by this patch are:
V4L2_PIX_FMT_SBGGR16
V4L2_PIX_FMT_SGBRG16
V4L2_PIX_FMT_SGRBG16
V4L2_PIX_FMT_SRGGB16 already existed before the patch. Rework the
documentation to match that of the other sample depths.
Also align the description of V4L2_PIX_FMT_SRGGB16 to match with other
similar formats.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
Documentation/media/uapi/v4l/pixfmt-rgb.rst | 2 +-
Documentation/media/uapi/v4l/pixfmt-sbggr16.rst | 111 ----------------------
Documentation/media/uapi/v4l/pixfmt-srggb16.rst | 120 ++++++++++++++++++++++++
drivers/media/v4l2-core/v4l2-ioctl.c | 5 +-
include/uapi/linux/videodev2.h | 3 +
5 files changed, 128 insertions(+), 113 deletions(-)
delete mode 100644 Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb16.rst
diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index 69f11ab..ed0ac1b 100644
--- a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
@@ -12,7 +12,6 @@ RGB Formats
pixfmt-packed-rgb
pixfmt-srggb8
- pixfmt-sbggr16
pixfmt-srggb10
pixfmt-srggb10p
pixfmt-srggb10alaw8
@@ -21,3 +20,4 @@ RGB Formats
pixfmt-srggb12p
pixfmt-srggb14
pixfmt-srggb14p
+ pixfmt-srggb16
diff --git a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
deleted file mode 100644
index 7844dc3..0000000
--- a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-.. -*- coding: utf-8; mode: rst -*-
-
-.. _V4L2-PIX-FMT-SBGGR16:
-
-*****************************
-V4L2_PIX_FMT_SBGGR16 ('BYR2')
-*****************************
-
-*man V4L2_PIX_FMT_SBGGR16(2)*
-
-Bayer RGB format
-
-
-Description
-===========
-
-This format is similar to
-:ref:`V4L2_PIX_FMT_SBGGR8 <V4L2-PIX-FMT-SBGGR8>`, except each pixel
-has a depth of 16 bits. The least significant byte is stored at lower
-memory addresses (little-endian).
-
-**Byte Order.**
-Each cell is one byte.
-
-
-
-.. flat-table::
- :header-rows: 0
- :stub-columns: 0
- :widths: 2 1 1 1 1 1 1 1 1
-
-
- - .. row 1
-
- - start + 0:
-
- - B\ :sub:`00low`
-
- - B\ :sub:`00high`
-
- - G\ :sub:`01low`
-
- - G\ :sub:`01high`
-
- - B\ :sub:`02low`
-
- - B\ :sub:`02high`
-
- - G\ :sub:`03low`
-
- - G\ :sub:`03high`
-
- - .. row 2
-
- - start + 8:
-
- - G\ :sub:`10low`
-
- - G\ :sub:`10high`
-
- - R\ :sub:`11low`
-
- - R\ :sub:`11high`
-
- - G\ :sub:`12low`
-
- - G\ :sub:`12high`
-
- - R\ :sub:`13low`
-
- - R\ :sub:`13high`
-
- - .. row 3
-
- - start + 16:
-
- - B\ :sub:`20low`
-
- - B\ :sub:`20high`
-
- - G\ :sub:`21low`
-
- - G\ :sub:`21high`
-
- - B\ :sub:`22low`
-
- - B\ :sub:`22high`
-
- - G\ :sub:`23low`
-
- - G\ :sub:`23high`
-
- - .. row 4
-
- - start + 24:
-
- - G\ :sub:`30low`
-
- - G\ :sub:`30high`
-
- - R\ :sub:`31low`
-
- - R\ :sub:`31high`
-
- - G\ :sub:`32low`
-
- - G\ :sub:`32high`
-
- - R\ :sub:`33low`
-
- - R\ :sub:`33high`
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb16.rst b/Documentation/media/uapi/v4l/pixfmt-srggb16.rst
new file mode 100644
index 0000000..4a3e6f9
--- /dev/null
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb16.rst
@@ -0,0 +1,120 @@
+.. -*- coding: utf-8; mode: rst -*-
+
+.. _V4L2-PIX-FMT-SRGGB16:
+.. _v4l2-pix-fmt-sbggr16:
+.. _v4l2-pix-fmt-sgbrg16:
+.. _v4l2-pix-fmt-sgrbg16:
+
+
+***************************************************************************************************************************
+V4L2_PIX_FMT_SRGGB16 ('RG16'), V4L2_PIX_FMT_SGRBG16 ('GR16'), V4L2_PIX_FMT_SGBRG16 ('GB16'), V4L2_PIX_FMT_SBGGR16 ('BYR2'),
+***************************************************************************************************************************
+
+*man V4L2_PIX_FMT_SRGGB16(2)*
+
+V4L2_PIX_FMT_SGRBG16
+V4L2_PIX_FMT_SGBRG16
+V4L2_PIX_FMT_SBGGR16
+16-bit Bayer formats expanded to 16 bits
+
+
+Description
+===========
+
+These four pixel formats are raw sRGB / Bayer formats with 16 bits per
+sample. Each sample is stored in a 16-bit word. Each n-pixel row contains
+n/2 green samples and n/2 blue or red samples, with alternating red and blue
+rows. Bytes are stored in memory in little endian order. They are
+conventionally described as GRGR... BGBG..., RGRG... GBGB..., etc. Below is
+an example of one of these formats:
+
+**Byte Order.**
+Each cell is one byte.
+
+
+
+.. flat-table::
+ :header-rows: 0
+ :stub-columns: 0
+ :widths: 2 1 1 1 1 1 1 1 1
+
+
+ - .. row 1
+
+ - start + 0:
+
+ - B\ :sub:`00low`
+
+ - B\ :sub:`00high`
+
+ - G\ :sub:`01low`
+
+ - G\ :sub:`01high`
+
+ - B\ :sub:`02low`
+
+ - B\ :sub:`02high`
+
+ - G\ :sub:`03low`
+
+ - G\ :sub:`03high`
+
+ - .. row 2
+
+ - start + 8:
+
+ - G\ :sub:`10low`
+
+ - G\ :sub:`10high`
+
+ - R\ :sub:`11low`
+
+ - R\ :sub:`11high`
+
+ - G\ :sub:`12low`
+
+ - G\ :sub:`12high`
+
+ - R\ :sub:`13low`
+
+ - R\ :sub:`13high`
+
+ - .. row 3
+
+ - start + 16:
+
+ - B\ :sub:`20low`
+
+ - B\ :sub:`20high`
+
+ - G\ :sub:`21low`
+
+ - G\ :sub:`21high`
+
+ - B\ :sub:`22low`
+
+ - B\ :sub:`22high`
+
+ - G\ :sub:`23low`
+
+ - G\ :sub:`23high`
+
+ - .. row 4
+
+ - start + 24:
+
+ - G\ :sub:`30low`
+
+ - G\ :sub:`30high`
+
+ - R\ :sub:`31low`
+
+ - R\ :sub:`31high`
+
+ - G\ :sub:`32low`
+
+ - G\ :sub:`32high`
+
+ - R\ :sub:`33low`
+
+ - R\ :sub:`33high`
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 29d9f8f..cc10118 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1237,7 +1237,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_SGBRG14: descr = "14-bit Bayer GBGB/RGRG"; break;
case V4L2_PIX_FMT_SGRBG14: descr = "14-bit Bayer GRGR/BGBG"; break;
case V4L2_PIX_FMT_SRGGB14: descr = "14-bit Bayer RGRG/GBGB"; break;
- case V4L2_PIX_FMT_SBGGR16: descr = "16-bit Bayer BGBG/GRGR (Exp.)"; break;
+ case V4L2_PIX_FMT_SBGGR16: descr = "16-bit Bayer BGBG/GRGR"; break;
+ case V4L2_PIX_FMT_SGBRG16: descr = "16-bit Bayer GBGB/RGRG"; break;
+ case V4L2_PIX_FMT_SGRBG16: descr = "16-bit Bayer GRGR/BGBG"; break;
+ case V4L2_PIX_FMT_SRGGB16: descr = "16-bit Bayer RGRG/GBGB"; break;
case V4L2_PIX_FMT_SN9C20X_I420: descr = "GSPCA SN9C20X I420"; break;
case V4L2_PIX_FMT_SPCA501: descr = "GSPCA SPCA501"; break;
case V4L2_PIX_FMT_SPCA505: descr = "GSPCA SPCA505"; break;
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 32e9e74..c62c85b 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -593,6 +593,9 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SGRBG14P v4l2_fourcc('p', 'g', 'E', 'E')
#define V4L2_PIX_FMT_SRGGB14P v4l2_fourcc('p', 'R', 'E', 'E')
#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG16 v4l2_fourcc('G', 'B', '1', '6') /* 16 GBGB.. RGRG.. */
+#define V4L2_PIX_FMT_SGRBG16 v4l2_fourcc('G', 'R', '1', '6') /* 16 GRGR.. BGBG.. */
+#define V4L2_PIX_FMT_SRGGB16 v4l2_fourcc('R', 'G', '1', '6') /* 16 RGRG.. GBGB.. */
/* compressed formats */
#define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG */
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v3 00/11] New raw bayer format definitions, fixes
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
` (10 preceding siblings ...)
2016-08-05 10:45 ` [PATCH v3 11/11] doc-rst: Add 16-bit raw bayer pixel format definitions Sakari Ailus
@ 2016-08-05 11:26 ` Sakari Ailus
11 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 11:26 UTC (permalink / raw)
To: Sakari Ailus; +Cc: linux-media, hverkuil
On Fri, Aug 05, 2016 at 01:45:30PM +0300, Sakari Ailus wrote:
> Hi all,
>
> This is a third version of the new bayer format patchset. The second version
> of the set may be found here:
>
> <URL:http://www.spinics.net/lists/linux-media/msg101498.html>
>
> These patches fix and add new raw bayer format definitions. 12-bit packed
> V4L2 format definition is added as well as definitions of 14-bit media bus
> codes as well as unpacked and packed V4L2 formats.
>
> No driver uses them right now, yet they're common formats needed by newer
> devices that use higher bit depths so adding them would make sense.
>
> 16-bit pixel formats are added as well, and the 16-bit formats are now
> expected to have 16 bits of data. 8-bit format documentation is unified.
The HTML documentation can be found here:
<URL:http://salottisipuli.retiisi.org.uk/~sailus/raw14-doc/media/uapi/v4l/pixfmt-rgb.html>
--
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3.1 05/11] v4l: Add packed Bayer raw12 pixel formats
2016-08-05 10:45 ` [PATCH v3 05/11] v4l: Add packed Bayer raw12 pixel formats Sakari Ailus
@ 2016-08-05 11:28 ` Sakari Ailus
0 siblings, 0 replies; 14+ messages in thread
From: Sakari Ailus @ 2016-08-05 11:28 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
These formats are compressed 12-bit raw bayer formats with four different
pixel orders. They are similar to 10-bit variants. The formats added by
this patch are
V4L2_PIX_FMT_SBGGR12P
V4L2_PIX_FMT_SGBRG12P
V4L2_PIX_FMT_SGRBG12P
V4L2_PIX_FMT_SRGGB12P
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Fix line start offsets.
Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1 +
Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 108 +++++++++++++++++++++++
drivers/media/v4l2-core/v4l2-ioctl.c | 12 ++-
include/uapi/linux/videodev2.h | 5 ++
4 files changed, 122 insertions(+), 4 deletions(-)
create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
diff --git a/Documentation/media/uapi/v4l/pixfmt-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
index 9cc9808..81412f7 100644
--- a/Documentation/media/uapi/v4l/pixfmt-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-rgb.rst
@@ -18,3 +18,4 @@ RGB Formats
pixfmt-srggb10alaw8
pixfmt-srggb10dpcm8
pixfmt-srggb12
+ pixfmt-srggb12p
diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
new file mode 100644
index 0000000..f8e9912
--- /dev/null
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
@@ -0,0 +1,108 @@
+.. -*- coding: utf-8; mode: rst -*-
+
+.. _V4L2-PIX-FMT-SRGGB12P:
+.. _v4l2-pix-fmt-sbggr12p:
+.. _v4l2-pix-fmt-sgbrg12p:
+.. _v4l2-pix-fmt-sgrbg12p:
+
+*******************************************************************************************************************************
+V4L2_PIX_FMT_SRGGB12P ('pRAA'), V4L2_PIX_FMT_SGRBG12P ('pgAA'), V4L2_PIX_FMT_SGBRG12P ('pGAA'), V4L2_PIX_FMT_SBGGR12P ('pBAA'),
+*******************************************************************************************************************************
+
+*man V4L2_PIX_FMT_SRGGB12P(2)*
+
+V4L2_PIX_FMT_SGRBG12P
+V4L2_PIX_FMT_SGBRG12P
+V4L2_PIX_FMT_SBGGR12P
+12-bit packed Bayer formats
+
+
+Description
+===========
+
+These four pixel formats are packed raw sRGB / Bayer formats with 12
+bits per colour. Every two consecutive samples are packed into three
+bytes. Each of the first two bytes contain the 8 high order bits of
+the pixels, and the third byte contains the four least significants
+bits of each pixel, in the same order.
+
+Each n-pixel row contains n/2 green samples and n/2 blue or red
+samples, with alternating green-red and green-blue rows. They are
+conventionally described as GRGR... BGBG..., RGRG... GBGB..., etc.
+Below is an example of one of these formats:
+
+**Byte Order.**
+Each cell is one byte.
+
+
+
+.. flat-table::
+ :header-rows: 0
+ :stub-columns: 0
+ :widths: 2 1 1 1 1 1 1
+
+
+ - .. row 1
+
+ - start + 0:
+
+ - B\ :sub:`00high`
+
+ - G\ :sub:`01high`
+
+ - G\ :sub:`01low`\ (bits 7--4) B\ :sub:`00low`\ (bits 3--0)
+
+ - B\ :sub:`02high`
+
+ - G\ :sub:`03high`
+
+ - G\ :sub:`03low`\ (bits 7--4) B\ :sub:`02low`\ (bits 3--0)
+
+ - .. row 2
+
+ - start + 6:
+
+ - G\ :sub:`10high`
+
+ - R\ :sub:`11high`
+
+ - R\ :sub:`11low`\ (bits 7--4) G\ :sub:`10low`\ (bits 3--0)
+
+ - G\ :sub:`12high`
+
+ - R\ :sub:`13high`
+
+ - R\ :sub:`13low`\ (bits 3--2) G\ :sub:`12low`\ (bits 3--0)
+
+ - .. row 3
+
+ - start + 12:
+
+ - B\ :sub:`20high`
+
+ - G\ :sub:`21high`
+
+ - G\ :sub:`21low`\ (bits 7--4) B\ :sub:`20low`\ (bits 3--0)
+
+ - B\ :sub:`22high`
+
+ - G\ :sub:`23high`
+
+ - G\ :sub:`23low`\ (bits 7--4) B\ :sub:`22low`\ (bits 3--0)
+
+ - .. row 4
+
+ - start + 18:
+
+ - G\ :sub:`30high`
+
+ - R\ :sub:`31high`
+
+ - R\ :sub:`31low`\ (bits 7--4) G\ :sub:`30low`\ (bits 3--0)
+
+ - G\ :sub:`32high`
+
+ - R\ :sub:`33high`
+
+ - R\ :sub:`33low`\ (bits 3--2) G\ :sub:`32low`\ (bits 3--0)
+
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 51a0fa1..ebce910 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1213,10 +1213,6 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_SGBRG10: descr = "10-bit Bayer GBGB/RGRG"; break;
case V4L2_PIX_FMT_SGRBG10: descr = "10-bit Bayer GRGR/BGBG"; break;
case V4L2_PIX_FMT_SRGGB10: descr = "10-bit Bayer RGRG/GBGB"; break;
- case V4L2_PIX_FMT_SBGGR12: descr = "12-bit Bayer BGBG/GRGR"; break;
- case V4L2_PIX_FMT_SGBRG12: descr = "12-bit Bayer GBGB/RGRG"; break;
- case V4L2_PIX_FMT_SGRBG12: descr = "12-bit Bayer GRGR/BGBG"; break;
- case V4L2_PIX_FMT_SRGGB12: descr = "12-bit Bayer RGRG/GBGB"; break;
case V4L2_PIX_FMT_SBGGR10P: descr = "10-bit Bayer BGBG/GRGR Packed"; break;
case V4L2_PIX_FMT_SGBRG10P: descr = "10-bit Bayer GBGB/RGRG Packed"; break;
case V4L2_PIX_FMT_SGRBG10P: descr = "10-bit Bayer GRGR/BGBG Packed"; break;
@@ -1229,6 +1225,14 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_SGBRG10DPCM8: descr = "8-bit Bayer GBGB/RGRG (DPCM)"; break;
case V4L2_PIX_FMT_SGRBG10DPCM8: descr = "8-bit Bayer GRGR/BGBG (DPCM)"; break;
case V4L2_PIX_FMT_SRGGB10DPCM8: descr = "8-bit Bayer RGRG/GBGB (DPCM)"; break;
+ case V4L2_PIX_FMT_SBGGR12: descr = "12-bit Bayer BGBG/GRGR"; break;
+ case V4L2_PIX_FMT_SGBRG12: descr = "12-bit Bayer GBGB/RGRG"; break;
+ case V4L2_PIX_FMT_SGRBG12: descr = "12-bit Bayer GRGR/BGBG"; break;
+ case V4L2_PIX_FMT_SRGGB12: descr = "12-bit Bayer RGRG/GBGB"; break;
+ case V4L2_PIX_FMT_SBGGR12P: descr = "12-bit Bayer BGBG/GRGR Packed"; break;
+ case V4L2_PIX_FMT_SGBRG12P: descr = "12-bit Bayer GBGB/RGRG Packed"; break;
+ case V4L2_PIX_FMT_SGRBG12P: descr = "12-bit Bayer GRGR/BGBG Packed"; break;
+ case V4L2_PIX_FMT_SRGGB12P: descr = "12-bit Bayer RGRG/GBGB Packed"; break;
case V4L2_PIX_FMT_SBGGR16: descr = "16-bit Bayer BGBG/GRGR (Exp.)"; break;
case V4L2_PIX_FMT_SN9C20X_I420: descr = "GSPCA SN9C20X I420"; break;
case V4L2_PIX_FMT_SPCA501: descr = "GSPCA SPCA501"; break;
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 724f43e..c9b0055 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -578,6 +578,11 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */
#define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */
#define V4L2_PIX_FMT_SRGGB12 v4l2_fourcc('R', 'G', '1', '2') /* 12 RGRG.. GBGB.. */
+ /* 12bit raw bayer packed, 6 bytes for every 4 pixels */
+#define V4L2_PIX_FMT_SBGGR12P v4l2_fourcc('p', 'B', 'C', 'C')
+#define V4L2_PIX_FMT_SGBRG12P v4l2_fourcc('p', 'G', 'C', 'C')
+#define V4L2_PIX_FMT_SGRBG12P v4l2_fourcc('p', 'g', 'C', 'C')
+#define V4L2_PIX_FMT_SRGGB12P v4l2_fourcc('p', 'R', 'C', 'C')
#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16 BGBG.. GRGR.. */
/* compressed formats */
--
2.7.4
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2016-08-05 11:29 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-05 10:45 [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 01/11] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 02/11] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 03/11] doc-rst: Clean up raw bayer pixel format definitions Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 04/11] doc-rst: Unify documentation of the 8-bit bayer formats Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 05/11] v4l: Add packed Bayer raw12 pixel formats Sakari Ailus
2016-08-05 11:28 ` [PATCH v3.1 " Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 06/11] media: Add 1X14 14-bit raw bayer media bus code definitions Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 07/11] doc-rst: Add 14-bit raw bayer pixel format definitions Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 08/11] doc-rst: Add packed Bayer raw14 pixel formats Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 09/11] media: Add 1X16 16-bit raw bayer media bus code definitions Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 10/11] doc-rst: 16-bit BGGR is always 16 bits Sakari Ailus
2016-08-05 10:45 ` [PATCH v3 11/11] doc-rst: Add 16-bit raw bayer pixel format definitions Sakari Ailus
2016-08-05 11:26 ` [PATCH v3 00/11] New raw bayer format definitions, fixes Sakari Ailus
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.