mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-05 15:08:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2: Fix colorimetry mismatch for encoded format with RGB color-matrix

Browse source 
video-info supports encoded format to have RGB color-matrix, while
v4l2object just leave the v4l2 matrix to default when mapping
GST_VIDEO_COLOR_MATRIX_RGB. It causes gst matrix changed to be
GST_VIDEO_COLOR_MATRIX_BT601 when mapping v4l2 colorimetry.

So add support for encoded format with RGB color-matrix in v4l2object.
Note that for M2M encoders, we should in theory assume that that we can
transfer this value from OUTPUT to CAPTURE queues, though its only true
if the drivers does not do CSC. For now, we don't support any RGB
codecs, but leaving a note for the future.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7284>
This commit is contained in:
Hou Qi 2023-02-13 16:49:40 +08:00 committed by Backport Bot
parent 654901612b
commit dd22125b1e
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c
View file

@ -1526,6 +1526,23 @@ gst_v4l2_object_v4l2fourcc_is_rgb (guint32 fourcc)
return ret;
}
static gboolean
gst_v4l2_object_v4l2fourcc_is_codec (guint32 fourcc)
{
gint i;
for (i = 0; i < GST_V4L2_FORMAT_COUNT; i++) {
if (gst_v4l2_formats[i].format == fourcc) {
if (gst_v4l2_formats[i].flags & (GST_V4L2_CODEC | GST_V4L2_TRANSPORT))
return TRUE;
else
return FALSE;
}
}
return FALSE;
}
static GstStructure *
gst_v4l2_object_v4l2fourcc_to_bare_struct (guint32 fourcc)
{
@ -2245,12 +2262,12 @@ static gboolean
gst_v4l2_object_get_colorspace (GstV4l2Object * v4l2object,
struct v4l2_format *fmt, GstVideoColorimetry * cinfo)
{
gboolean is_rgb =
gst_v4l2_object_v4l2fourcc_is_rgb (fmt->fmt.pix.pixelformat);
gboolean is_rgb = FALSE;
enum v4l2_colorspace colorspace;
enum v4l2_quantization range;
enum v4l2_ycbcr_encoding matrix;
enum v4l2_xfer_func transfer;
guint32 pixelformat;
gboolean ret = TRUE;
if (V4L2_TYPE_IS_MULTIPLANAR (fmt->type)) {
@ -2258,13 +2275,25 @@ gst_v4l2_object_get_colorspace (GstV4l2Object * v4l2object,
range = fmt->fmt.pix_mp.quantization;
matrix = fmt->fmt.pix_mp.ycbcr_enc;
transfer = fmt->fmt.pix_mp.xfer_func;
pixelformat = fmt->fmt.pix_mp.pixelformat;
} else {
colorspace = fmt->fmt.pix.colorspace;
range = fmt->fmt.pix.quantization;
matrix = fmt->fmt.pix.ycbcr_enc;
transfer = fmt->fmt.pix.xfer_func;
pixelformat = fmt->fmt.pix.pixelformat;
}
/* Detect that we are dealing with RGB, this can be that the pixelformat is
* an RGB format, or we have an encoded format for which RGB color matrix
* was set in set_format. */
if (gst_v4l2_object_v4l2fourcc_is_rgb (pixelformat) ||
(v4l2object->matrix == GST_VIDEO_COLOR_MATRIX_RGB &&
gst_v4l2_object_v4l2fourcc_is_codec (pixelformat)))
is_rgb = TRUE;
else
is_rgb = FALSE;
/* First step, set the defaults for each primaries */
switch (colorspace) {
case V4L2_COLORSPACE_SMPTE170M:
@ -3796,6 +3825,7 @@ gst_v4l2_object_set_format_full (GstV4l2Object * v4l2object, GstCaps * caps,
gst_video_info_init (&info);
gst_video_alignment_reset (&align);
v4l2object->transfer = GST_VIDEO_TRANSFER_UNKNOWN;
v4l2object->matrix = GST_VIDEO_COLOR_MATRIX_UNKNOWN;
if (!gst_v4l2_object_get_caps_info (v4l2object, caps, &fmtdesc, &info))
goto invalid_caps;
@ -3882,6 +3912,8 @@ gst_v4l2_object_set_format_full (GstV4l2Object * v4l2object, GstCaps * caps,
switch (info.colorimetry.matrix) {
case GST_VIDEO_COLOR_MATRIX_RGB:
/* save the matrix so we can restore it on get() call from default */
v4l2object->matrix = GST_VIDEO_COLOR_MATRIX_RGB;
/* Unspecified, leave to default */
break;
/* FCC is about the same as BT601 with less digit */
@ -4571,6 +4603,7 @@ gst_v4l2_object_acquire_format (GstV4l2Object * v4l2object, GstVideoInfo * info)
gst_video_info_init (info);
gst_video_alignment_reset (&align);
v4l2object->transfer = GST_VIDEO_TRANSFER_UNKNOWN;
v4l2object->matrix = GST_VIDEO_COLOR_MATRIX_UNKNOWN;
memset (&fmt, 0x00, sizeof (struct v4l2_format));
fmt.type = v4l2object->type;

1
subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.h
View file

@ -149,6 +149,7 @@ struct _GstV4l2Object {
GstVideoAlignment align;
GstVideoTransferFunction transfer;
gsize plane_size[GST_VIDEO_MAX_PLANES];
GstVideoColorMatrix matrix;
/* Features */
gboolean need_video_meta;