|
Jiri Slaby |
ef7db2 |
From: Ming Qian <ming.qian@nxp.com>
|
|
Jiri Slaby |
ef7db2 |
Date: Fri, 13 Jan 2023 06:25:51 +0100
|
|
Jiri Slaby |
ef7db2 |
Subject: [PATCH] media: amphion: correct the unspecified color space
|
|
Jiri Slaby |
ef7db2 |
References: bsc#1012628
|
|
Jiri Slaby |
ef7db2 |
Patch-mainline: 6.2.3
|
|
Jiri Slaby |
ef7db2 |
Git-commit: 809060c8a357e020010dd8f797a5efd3c5432b13
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
[ Upstream commit 809060c8a357e020010dd8f797a5efd3c5432b13 ]
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
in the E.2.1 of Rec. ITU-T H.264 (06/2019),
|
|
Jiri Slaby |
ef7db2 |
0 of colour primaries is reserved, and 2 is unspecified.
|
|
Jiri Slaby |
ef7db2 |
driver can map V4L2_COLORSPACE_LAST to 0,
|
|
Jiri Slaby |
ef7db2 |
and map V4L2_COLORSPACE_DEFAULT to 2.
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
v4l2_xfer_func and v4l2_ycbcr_encoding are similar case.
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
Fixes: 3cd084519c6f ("media: amphion: add vpu v4l2 m2m support")
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Ming Qian <ming.qian@nxp.com>
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
|
Jiri Slaby |
ef7db2 |
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
|
Jiri Slaby |
ef7db2 |
---
|
|
Jiri Slaby |
ef7db2 |
drivers/media/platform/amphion/vpu_color.c | 6 +++---
|
|
Jiri Slaby |
ef7db2 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
diff --git a/drivers/media/platform/amphion/vpu_color.c b/drivers/media/platform/amphion/vpu_color.c
|
|
Jiri Slaby |
ef7db2 |
index 80b9a53f..4ae435cb 100644
|
|
Jiri Slaby |
ef7db2 |
--- a/drivers/media/platform/amphion/vpu_color.c
|
|
Jiri Slaby |
ef7db2 |
+++ b/drivers/media/platform/amphion/vpu_color.c
|
|
Jiri Slaby |
ef7db2 |
@@ -17,7 +17,7 @@
|
|
Jiri Slaby |
ef7db2 |
#include "vpu_helpers.h"
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
static const u8 colorprimaries[] = {
|
|
Jiri Slaby |
ef7db2 |
- 0,
|
|
Jiri Slaby |
ef7db2 |
+ V4L2_COLORSPACE_LAST,
|
|
Jiri Slaby |
ef7db2 |
V4L2_COLORSPACE_REC709, /*Rec. ITU-R BT.709-6*/
|
|
Jiri Slaby |
ef7db2 |
0,
|
|
Jiri Slaby |
ef7db2 |
0,
|
|
Jiri Slaby |
ef7db2 |
@@ -31,7 +31,7 @@ static const u8 colorprimaries[] = {
|
|
Jiri Slaby |
ef7db2 |
};
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
static const u8 colortransfers[] = {
|
|
Jiri Slaby |
ef7db2 |
- 0,
|
|
Jiri Slaby |
ef7db2 |
+ V4L2_XFER_FUNC_LAST,
|
|
Jiri Slaby |
ef7db2 |
V4L2_XFER_FUNC_709, /*Rec. ITU-R BT.709-6*/
|
|
Jiri Slaby |
ef7db2 |
0,
|
|
Jiri Slaby |
ef7db2 |
0,
|
|
Jiri Slaby |
ef7db2 |
@@ -53,7 +53,7 @@ static const u8 colortransfers[] = {
|
|
Jiri Slaby |
ef7db2 |
};
|
|
Jiri Slaby |
ef7db2 |
|
|
Jiri Slaby |
ef7db2 |
static const u8 colormatrixcoefs[] = {
|
|
Jiri Slaby |
ef7db2 |
- 0,
|
|
Jiri Slaby |
ef7db2 |
+ V4L2_YCBCR_ENC_LAST,
|
|
Jiri Slaby |
ef7db2 |
V4L2_YCBCR_ENC_709, /*Rec. ITU-R BT.709-6*/
|
|
Jiri Slaby |
ef7db2 |
0,
|
|
Jiri Slaby |
ef7db2 |
0,
|
|
Jiri Slaby |
ef7db2 |
--
|
|
Jiri Slaby |
ef7db2 |
2.35.3
|
|
Jiri Slaby |
ef7db2 |
|