mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
62b7f5931c
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
152 lines
5.7 KiB
Diff
152 lines
5.7 KiB
Diff
From 59a535539277240c4bdbb9c21bc07c8b586b2c3a Mon Sep 17 00:00:00 2001
|
|
From: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
Date: Mon, 24 Feb 2020 18:52:20 +0100
|
|
Subject: [PATCH] media: v4l: Add 14-bit raw bayer pixel formats
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit d12127ed0e18192491c2508caae45bb19c2f8fdd upstream.
|
|
|
|
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>
|
|
[dg@emlix.com: rebased onto current media_tree]
|
|
Signed-off-by: Daniel Glöckner <dg@emlix.com>
|
|
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
---
|
|
Documentation/media/uapi/v4l/pixfmt-bayer.rst | 1 +
|
|
.../media/uapi/v4l/pixfmt-srggb14.rst | 82 +++++++++++++++++++
|
|
drivers/media/v4l2-core/v4l2-ioctl.c | 4 +
|
|
include/uapi/linux/videodev2.h | 4 +
|
|
4 files changed, 91 insertions(+)
|
|
create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb14.rst
|
|
|
|
--- a/Documentation/media/uapi/v4l/pixfmt-bayer.rst
|
|
+++ b/Documentation/media/uapi/v4l/pixfmt-bayer.rst
|
|
@@ -34,5 +34,6 @@ orders. See also `the Wikipedia article
|
|
pixfmt-srggb10-ipu3
|
|
pixfmt-srggb12
|
|
pixfmt-srggb12p
|
|
+ pixfmt-srggb14
|
|
pixfmt-srggb14p
|
|
pixfmt-srggb16
|
|
--- /dev/null
|
|
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb14.rst
|
|
@@ -0,0 +1,82 @@
|
|
+.. Permission is granted to copy, distribute and/or modify this
|
|
+.. document under the terms of the GNU Free Documentation License,
|
|
+.. Version 1.1 or any later version published by the Free Software
|
|
+.. Foundation, with no Invariant Sections, no Front-Cover Texts
|
|
+.. and no Back-Cover Texts. A copy of the license is included at
|
|
+.. Documentation/media/uapi/fdl-appendix.rst.
|
|
+..
|
|
+.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
|
|
+
|
|
+.. _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'),
|
|
+***************************************************************************************************************************
|
|
+
|
|
+
|
|
+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 a small V4L2_PIX_FMT_SBGGR14 image:
|
|
+
|
|
+**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
|
|
+
|
|
+
|
|
+ * - 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`
|
|
+ * - 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`
|
|
+ * - 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`
|
|
+ * - 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`
|
|
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
@@ -1298,6 +1298,10 @@ static void v4l_fill_fmtdesc(struct v4l2
|
|
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_SBGGR14P: descr = "14-bit Bayer BGBG/GRGR Packed"; break;
|
|
case V4L2_PIX_FMT_SGBRG14P: descr = "14-bit Bayer GBGB/RGRG Packed"; break;
|
|
case V4L2_PIX_FMT_SGRBG14P: descr = "14-bit Bayer GRGR/BGBG Packed"; break;
|
|
--- a/include/uapi/linux/videodev2.h
|
|
+++ b/include/uapi/linux/videodev2.h
|
|
@@ -666,6 +666,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.. */
|
|
/* 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')
|