* [PATCH v4 1/8] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 2/8] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs Sakari Ailus
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 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 a5752b9..cc573c9 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
@@ -56,8 +56,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
@@ -71,8 +71,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
@@ -86,8 +86,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
@@ -101,8 +101,8 @@ 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)
.. raw:: latex
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v4 2/8] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 1/8] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 3/8] doc-rst: Clean up raw bayer pixel format definitions Sakari Ailus
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 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 109772f..b2880df 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
@@ -29,7 +29,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] 9+ messages in thread* [PATCH v4 3/8] doc-rst: Clean up raw bayer pixel format definitions
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 1/8] doc-rst: Correct the ordering of LSBs of the 10-bit raw packed formats Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 2/8] doc-rst: Fix number of zeroed high order bits in 12-bit raw format defs Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 4/8] doc-rst: Unify documentation of the 8-bit bayer formats Sakari Ailus
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 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>
Acked-by: Hans Verkuil <hans.verkuil@cisco.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 8af7569..b145c75 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb10.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10.rst
@@ -20,15 +20,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 cc573c9..80e3457 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
@@ -20,10 +20,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 b2880df..4776f3f 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12.rst
@@ -26,10 +26,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] 9+ messages in thread* [PATCH v4 4/8] doc-rst: Unify documentation of the 8-bit bayer formats
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
` (2 preceding siblings ...)
2016-09-06 11:55 ` [PATCH v4 3/8] doc-rst: Clean up raw bayer pixel format definitions Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 5/8] doc-rst: 16-bit BGGR is always 16 bits Sakari Ailus
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 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 | 77 -------------------------
Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst | 80 --------------------------
Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst | 80 --------------------------
Documentation/media/uapi/v4l/pixfmt-srggb8.rst | 38 ++++++------
5 files changed, 20 insertions(+), 258 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 e880ba0..0000000
--- a/Documentation/media/uapi/v4l/pixfmt-sbggr8.rst
+++ /dev/null
@@ -1,77 +0,0 @@
-.. -*- coding: utf-8; mode: rst -*-
-
-.. _V4L2-PIX-FMT-SBGGR8:
-
-****************************
-V4L2_PIX_FMT_SBGGR8 ('BA81')
-****************************
-
-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
-
-
- - .. 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 5cd40d6..0000000
--- a/Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-.. -*- coding: utf-8; mode: rst -*-
-
-.. _V4L2-PIX-FMT-SGBRG8:
-
-****************************
-V4L2_PIX_FMT_SGBRG8 ('GBRG')
-****************************
-
-
-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
-
-
- - .. 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 05a09db..0000000
--- a/Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-.. -*- coding: utf-8; mode: rst -*-
-
-.. _V4L2-PIX-FMT-SGRBG8:
-
-****************************
-V4L2_PIX_FMT_SGRBG8 ('GRBG')
-****************************
-
-
-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
-
-
- - .. 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 41851bb..55a1751 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb8.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb8.rst
@@ -1,24 +1,26 @@
.. -*- 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'),
+***************************************************************************************************************************
-Bayer RGB format
+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.
@@ -35,11 +37,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`
@@ -49,21 +51,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`
@@ -73,8 +75,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] 9+ messages in thread* [PATCH v4 5/8] doc-rst: 16-bit BGGR is always 16 bits
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
` (3 preceding siblings ...)
2016-09-06 11:55 ` [PATCH v4 4/8] doc-rst: Unify documentation of the 8-bit bayer formats Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 6/8] media: Add 1X14 14-bit raw bayer media bus code definitions Sakari Ailus
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 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 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
index 801b78c..e3b53e3 100644
--- a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
@@ -17,11 +17,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] 9+ messages in thread* [PATCH v4 6/8] media: Add 1X14 14-bit raw bayer media bus code definitions
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
` (4 preceding siblings ...)
2016-09-06 11:55 ` [PATCH v4 5/8] doc-rst: 16-bit BGGR is always 16 bits Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 7/8] media: Add 1X16 16-bit " Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 8/8] smiapp: Add support for 14 and 16 bits per sample depths Sakari Ailus
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 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 52013b5..07e7cf98 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -2812,7 +2812,7 @@ organization is given as an example for the first pixel only.
- Code
-
- - :cspan:`11` Data organization
+ - :cspan:`13` Data organization
- .. row 2
@@ -2820,6 +2820,10 @@ organization is given as an example for the first pixel only.
-
- Bit
+ - 13
+
+ - 12
+
- 11
- 10
@@ -2859,6 +2863,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -2890,6 +2898,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2921,6 +2933,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2952,6 +2968,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -2983,6 +3003,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3014,6 +3038,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3045,6 +3073,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3076,6 +3108,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3107,6 +3143,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3138,6 +3178,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3169,6 +3213,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3200,6 +3248,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3231,6 +3283,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- 0
- 0
@@ -3260,6 +3316,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3291,6 +3351,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3320,6 +3384,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- 0
- 0
@@ -3351,6 +3419,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3380,6 +3452,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3411,6 +3487,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3440,6 +3520,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3467,6 +3551,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3498,6 +3586,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3529,6 +3621,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3560,6 +3656,10 @@ organization is given as an example for the first pixel only.
-
+ - -
+
+ - -
+
- r\ :sub:`9`
- r\ :sub:`8`
@@ -3587,6 +3687,10 @@ organization is given as an example for the first pixel only.
- 0x3008
-
+ - -
+
+ - -
+
- b\ :sub:`11`
- b\ :sub:`10`
@@ -3618,6 +3722,10 @@ organization is given as an example for the first pixel only.
- 0x3010
-
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3649,6 +3757,10 @@ organization is given as an example for the first pixel only.
- 0x3011
-
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3680,6 +3792,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] 9+ messages in thread* [PATCH v4 7/8] media: Add 1X16 16-bit raw bayer media bus code definitions
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
` (5 preceding siblings ...)
2016-09-06 11:55 ` [PATCH v4 6/8] media: Add 1X14 14-bit raw bayer media bus code definitions Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
2016-09-06 11:55 ` [PATCH v4 8/8] smiapp: Add support for 14 and 16 bits per sample depths Sakari Ailus
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 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 07e7cf98..06d8981 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -2812,7 +2812,7 @@ organization is given as an example for the first pixel only.
- Code
-
- - :cspan:`13` Data organization
+ - :cspan:`15` Data organization
- .. row 2
@@ -2820,6 +2820,10 @@ organization is given as an example for the first pixel only.
-
- Bit
+ - 15
+
+ - 14
+
- 13
- 12
@@ -2867,6 +2871,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -2902,6 +2910,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2937,6 +2949,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -2972,6 +2988,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3007,6 +3027,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3042,6 +3066,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3077,6 +3105,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3112,6 +3144,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3147,6 +3183,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3182,6 +3222,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3217,6 +3261,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`7`
- g\ :sub:`6`
@@ -3252,6 +3300,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`7`
- r\ :sub:`6`
@@ -3287,6 +3339,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- 0
- 0
@@ -3320,6 +3376,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3355,6 +3415,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`7`
- b\ :sub:`6`
@@ -3388,6 +3452,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- 0
- 0
@@ -3423,6 +3491,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3456,6 +3528,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3491,6 +3567,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`1`
- b\ :sub:`0`
@@ -3524,6 +3604,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3555,6 +3639,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`9`
- b\ :sub:`8`
@@ -3590,6 +3678,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3625,6 +3717,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`9`
- g\ :sub:`8`
@@ -3660,6 +3756,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`9`
- r\ :sub:`8`
@@ -3691,6 +3791,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- b\ :sub:`11`
- b\ :sub:`10`
@@ -3726,6 +3830,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3761,6 +3869,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- g\ :sub:`11`
- g\ :sub:`10`
@@ -3796,6 +3908,10 @@ organization is given as an example for the first pixel only.
- -
+ - -
+
+ - -
+
- r\ :sub:`11`
- r\ :sub:`10`
@@ -3827,6 +3943,10 @@ organization is given as an example for the first pixel only.
- 0x3019
-
+ - -
+
+ - -
+
- b\ :sub:`13`
- b\ :sub:`12`
@@ -3862,6 +3982,10 @@ organization is given as an example for the first pixel only.
- 0x301a
-
+ - -
+
+ - -
+
- g\ :sub:`13`
- g\ :sub:`12`
@@ -3897,6 +4021,10 @@ organization is given as an example for the first pixel only.
- 0x301b
-
+ - -
+
+ - -
+
- g\ :sub:`13`
- g\ :sub:`12`
@@ -3932,6 +4060,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] 9+ messages in thread* [PATCH v4 8/8] smiapp: Add support for 14 and 16 bits per sample depths
2016-09-06 11:55 [PATCH v4 0/8] New raw bayer format definitions, fixes Sakari Ailus
` (6 preceding siblings ...)
2016-09-06 11:55 ` [PATCH v4 7/8] media: Add 1X16 16-bit " Sakari Ailus
@ 2016-09-06 11:55 ` Sakari Ailus
7 siblings, 0 replies; 9+ messages in thread
From: Sakari Ailus @ 2016-09-06 11:55 UTC (permalink / raw)
To: linux-media; +Cc: hverkuil
SMIA++ supports 14 and 16 bits per pixel formats as well. Add support to
these formats in the driver.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/smiapp/smiapp-core.c | 8 ++++++++
drivers/media/i2c/smiapp/smiapp.h | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index d8b78c6..44f8c7e 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -328,6 +328,14 @@ static void __smiapp_update_exposure_limits(struct smiapp_sensor *sensor)
* orders must be defined.
*/
static const struct smiapp_csi_data_format smiapp_csi_data_formats[] = {
+ { MEDIA_BUS_FMT_SGRBG16_1X16, 16, 16, SMIAPP_PIXEL_ORDER_GRBG, },
+ { MEDIA_BUS_FMT_SRGGB16_1X16, 16, 16, SMIAPP_PIXEL_ORDER_RGGB, },
+ { MEDIA_BUS_FMT_SBGGR16_1X16, 16, 16, SMIAPP_PIXEL_ORDER_BGGR, },
+ { MEDIA_BUS_FMT_SGBRG16_1X16, 16, 16, SMIAPP_PIXEL_ORDER_GBRG, },
+ { MEDIA_BUS_FMT_SGRBG14_1X14, 14, 14, SMIAPP_PIXEL_ORDER_GRBG, },
+ { MEDIA_BUS_FMT_SRGGB14_1X14, 14, 14, SMIAPP_PIXEL_ORDER_RGGB, },
+ { MEDIA_BUS_FMT_SBGGR14_1X14, 14, 14, SMIAPP_PIXEL_ORDER_BGGR, },
+ { MEDIA_BUS_FMT_SGBRG14_1X14, 14, 14, SMIAPP_PIXEL_ORDER_GBRG, },
{ MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_GRBG, },
{ MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_RGGB, },
{ MEDIA_BUS_FMT_SBGGR12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_BGGR, },
diff --git a/drivers/media/i2c/smiapp/smiapp.h b/drivers/media/i2c/smiapp/smiapp.h
index c504bd8..aae72bc 100644
--- a/drivers/media/i2c/smiapp/smiapp.h
+++ b/drivers/media/i2c/smiapp/smiapp.h
@@ -151,7 +151,7 @@ struct smiapp_csi_data_format {
#define SMIAPP_PADS 2
#define SMIAPP_COMPRESSED_BASE 8
-#define SMIAPP_COMPRESSED_MAX 12
+#define SMIAPP_COMPRESSED_MAX 16
#define SMIAPP_NR_OF_COMPRESSED (SMIAPP_COMPRESSED_MAX - \
SMIAPP_COMPRESSED_BASE + 1)
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread