forked from Openwrt/openwrt
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
105 lines
4.0 KiB
Diff
105 lines
4.0 KiB
Diff
From 947c71f9b8d3770171860a0c97a779cccf60d2a1 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 25 Jun 2020 17:51:03 +0100
|
|
Subject: [PATCH 0227/1085] media: Add a pixel format for MIPI packed 14bit
|
|
luma only.
|
|
|
|
This is the format used by monochrome 14bit image sensors.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
.../userspace-api/media/v4l/pixfmt-y14p.rst | 54 +++++++++++++++++++
|
|
.../userspace-api/media/v4l/yuv-formats.rst | 1 +
|
|
drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
|
|
include/uapi/linux/videodev2.h | 1 +
|
|
4 files changed, 57 insertions(+)
|
|
create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-y14p.rst
|
|
|
|
--- /dev/null
|
|
+++ b/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst
|
|
@@ -0,0 +1,54 @@
|
|
+.. 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-Y14P:
|
|
+
|
|
+**************************
|
|
+V4L2_PIX_FMT_Y14P ('Y14P')
|
|
+**************************
|
|
+
|
|
+Grey-scale image as a MIPI RAW14 packed array
|
|
+
|
|
+
|
|
+Description
|
|
+===========
|
|
+
|
|
+This is a packed grey-scale image format with a depth of 14 bits per
|
|
+pixel. 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.
|
|
+
|
|
+**Byte Order.**
|
|
+Each cell is one byte.
|
|
+
|
|
+.. tabularcolumns:: |p{1.8cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{1.1cm}|p{3.3cm}|p{3.3cm}|p{3.3cm}|
|
|
+
|
|
+.. flat-table::
|
|
+ :header-rows: 0
|
|
+ :stub-columns: 0
|
|
+ :widths: 2 1 1 1 1 3 3 3
|
|
+
|
|
+
|
|
+ - - start + 0:
|
|
+ - Y'\ :sub:`00high`
|
|
+ - Y'\ :sub:`01high`
|
|
+ - Y'\ :sub:`02high`
|
|
+ - Y'\ :sub:`03high`
|
|
+ - Y'\ :sub:`01low bits 1--0`\ (bits 7--6)
|
|
+
|
|
+ Y'\ :sub:`00low bits 5--0`\ (bits 5--0)
|
|
+
|
|
+ - Y'\ :sub:`02low bits 3--0`\ (bits 7--4)
|
|
+
|
|
+ Y'\ :sub:`01low bits 5--2`\ (bits 3--0)
|
|
+
|
|
+ - Y'\ :sub:`03low bits 5--0`\ (bits 7--2)
|
|
+
|
|
+ Y'\ :sub:`02low bits 5--4`\ (bits 1--0)
|
|
--- a/Documentation/userspace-api/media/v4l/yuv-formats.rst
|
|
+++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst
|
|
@@ -268,6 +268,7 @@ image.
|
|
pixfmt-yuv-planar
|
|
pixfmt-yuv-luma
|
|
pixfmt-y12p
|
|
+ pixfmt-y14p
|
|
pixfmt-y8i
|
|
pixfmt-y12i
|
|
pixfmt-uv8
|
|
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
|
|
@@ -1312,6 +1312,7 @@ static void v4l_fill_fmtdesc(struct v4l2
|
|
case V4L2_PIX_FMT_Y10BPACK: descr = "10-bit Greyscale (Packed)"; break;
|
|
case V4L2_PIX_FMT_Y10P: descr = "10-bit Greyscale (MIPI Packed)"; break;
|
|
case V4L2_PIX_FMT_Y12P: descr = "12-bit Greyscale (MIPI Packed)"; break;
|
|
+ case V4L2_PIX_FMT_Y14P: descr = "14-bit Greyscale (MIPI Packed)"; break;
|
|
case V4L2_PIX_FMT_IPU3_Y10: descr = "10-bit greyscale (IPU3 Packed)"; break;
|
|
case V4L2_PIX_FMT_Y8I: descr = "Interleaved 8-bit Greyscale"; break;
|
|
case V4L2_PIX_FMT_Y12I: descr = "Interleaved 12-bit Greyscale"; break;
|
|
--- a/include/uapi/linux/videodev2.h
|
|
+++ b/include/uapi/linux/videodev2.h
|
|
@@ -604,6 +604,7 @@ struct v4l2_pix_format {
|
|
#define V4L2_PIX_FMT_Y10BPACK v4l2_fourcc('Y', '1', '0', 'B') /* 10 Greyscale bit-packed */
|
|
#define V4L2_PIX_FMT_Y10P v4l2_fourcc('Y', '1', '0', 'P') /* 10 Greyscale, MIPI RAW10 packed */
|
|
#define V4L2_PIX_FMT_Y12P v4l2_fourcc('Y', '1', '2', 'P') /* 12 Greyscale, MIPI RAW12 packed */
|
|
+#define V4L2_PIX_FMT_Y14P v4l2_fourcc('Y', '1', '4', 'P') /* 14 Greyscale, MIPI RAW12 packed */
|
|
#define V4L2_PIX_FMT_IPU3_Y10 v4l2_fourcc('i', 'p', '3', 'y') /* IPU3 packed 10-bit greyscale */
|
|
|
|
/* Palette formats */
|