mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

nvh265encoder: Add support for RGB encoding

Browse source 
Adding GBR format support to nv{autogpu,cuda,d3d11}h265enc.
Note that the only difference between GBR and Y444 encoding
is matrix_coeffs value written in VUI.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5375>
This commit is contained in:
Seungha Yang 2023-09-21 18:35:58 +09:00 committed by GStreamer Marge Bot
parent a80f542f66
commit 907c507680
2 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-bad/sys/nvcodec/gstnvencobject.cpp
View file

@ -301,12 +301,14 @@ GstNvEncObject::InitSession (NV_ENC_INITIALIZE_PARAMS * params,
buffer_format_ = NV_ENC_BUFFER_FORMAT_NV12; buffer_format_ = NV_ENC_BUFFER_FORMAT_NV12;
break; break;
case GST_VIDEO_FORMAT_Y444: case GST_VIDEO_FORMAT_Y444:
case GST_VIDEO_FORMAT_GBR:
buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV444; buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV444;
break; break;
case GST_VIDEO_FORMAT_P010_10LE: case GST_VIDEO_FORMAT_P010_10LE:
buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV420_10BIT; buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV420_10BIT;
break; break;
case GST_VIDEO_FORMAT_Y444_16LE: case GST_VIDEO_FORMAT_Y444_16LE:
case GST_VIDEO_FORMAT_GBR_16LE:
buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV444_10BIT; buffer_format_ = NV_ENC_BUFFER_FORMAT_YUV444_10BIT;
break; break;
default: default:

30
subprojects/gst-plugins-bad/sys/nvcodec/gstnvh265encoder.cpp
View file

@ -991,8 +991,10 @@ gst_nv_h265_encoder_getcaps (GstVideoEncoder * encoder, GstCaps * filter)
allowed_formats.insert("P010_10LE"); allowed_formats.insert("P010_10LE");
} else if (iter == "main-444") { } else if (iter == "main-444") {
allowed_formats.insert("Y444"); allowed_formats.insert("Y444");
allowed_formats.insert("GBR");
} else if (iter == "main-444-10") { } else if (iter == "main-444-10") {
allowed_formats.insert("Y444_16LE"); allowed_formats.insert("Y444_16LE");
allowed_formats.insert("GBR_16LE");
} }
} }
/* *INDENT-ON* */ /* *INDENT-ON* */
@ -1096,6 +1098,7 @@ gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
} }
break; break;
case GST_VIDEO_FORMAT_Y444: case GST_VIDEO_FORMAT_Y444:
case GST_VIDEO_FORMAT_GBR:
if (downstream_profiles.find ("main-444") == downstream_profiles.end ()) { if (downstream_profiles.find ("main-444") == downstream_profiles.end ()) {
GST_ERROR_OBJECT (self, "Downstream does not support 4:4:4 profile"); GST_ERROR_OBJECT (self, "Downstream does not support 4:4:4 profile");
return FALSE; return FALSE;
@ -1105,6 +1108,7 @@ gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
} }
break; break;
case GST_VIDEO_FORMAT_Y444_16LE: case GST_VIDEO_FORMAT_Y444_16LE:
case GST_VIDEO_FORMAT_GBR_16LE:
if (downstream_profiles.find ("main-444-10") == if (downstream_profiles.find ("main-444-10") ==
downstream_profiles.end ()) { downstream_profiles.end ()) {
GST_ERROR_OBJECT (self, GST_ERROR_OBJECT (self,
@ -1341,7 +1345,19 @@ gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
} }
vui->colourDescriptionPresentFlag = 1; vui->colourDescriptionPresentFlag = 1;
vui->colourMatrix = gst_video_color_matrix_to_iso (info->colorimetry.matrix); switch (GST_VIDEO_INFO_FORMAT (info)) {
case GST_VIDEO_FORMAT_GBR:
case GST_VIDEO_FORMAT_GBR_16LE:
/* color matrix must be "Identity" */
vui->colourMatrix =
gst_video_color_matrix_to_iso (GST_VIDEO_COLOR_MATRIX_RGB);
break;
default:
vui->colourMatrix =
gst_video_color_matrix_to_iso (info->colorimetry.matrix);
break;
}
vui->colourPrimaries = vui->colourPrimaries =
gst_video_color_primaries_to_iso (info->colorimetry.primaries); gst_video_color_primaries_to_iso (info->colorimetry.primaries);
vui->transferCharacteristics = vui->transferCharacteristics =
@ -1926,16 +1942,20 @@ gst_nv_h265_encoder_create_class_data (GstObject * device, gpointer session,
formats.insert ("NV12"); formats.insert ("NV12");
break; break;
case NV_ENC_BUFFER_FORMAT_YUV444: case NV_ENC_BUFFER_FORMAT_YUV444:
if (dev_caps.yuv444_encode) if (dev_caps.yuv444_encode) {
formats.insert ("Y444"); formats.insert ("Y444");
formats.insert ("GBR");
}
break; break;
case NV_ENC_BUFFER_FORMAT_YUV420_10BIT: case NV_ENC_BUFFER_FORMAT_YUV420_10BIT:
if (dev_caps.supports_10bit_encode) if (dev_caps.supports_10bit_encode)
formats.insert ("P010_10LE"); formats.insert ("P010_10LE");
break; break;
case NV_ENC_BUFFER_FORMAT_YUV444_10BIT: case NV_ENC_BUFFER_FORMAT_YUV444_10BIT:
if (dev_caps.supports_10bit_encode && dev_caps.yuv444_encode) if (dev_caps.supports_10bit_encode && dev_caps.yuv444_encode) {
formats.insert ("Y444_16LE"); formats.insert ("Y444_16LE");
formats.insert ("GBR_16LE");
}
break; break;
default: default:
break; break;
@ -1965,6 +1985,8 @@ gst_nv_h265_encoder_create_class_data (GstObject * device, gpointer session,
APPEND_STRING (format_str, formats, "P010_10LE"); APPEND_STRING (format_str, formats, "P010_10LE");
APPEND_STRING (format_str, formats, "Y444"); APPEND_STRING (format_str, formats, "Y444");
APPEND_STRING (format_str, formats, "Y444_16LE"); APPEND_STRING (format_str, formats, "Y444_16LE");
APPEND_STRING (format_str, formats, "GBR");
APPEND_STRING (format_str, formats, "GBR_16LE");
format_str += " }"; format_str += " }";
} }
@ -2301,6 +2323,8 @@ gst_nv_h265_encoder_register_auto_select (GstPlugin * plugin,
APPEND_STRING (format_str, formats, "P010_10LE"); APPEND_STRING (format_str, formats, "P010_10LE");
APPEND_STRING (format_str, formats, "Y444"); APPEND_STRING (format_str, formats, "Y444");
APPEND_STRING (format_str, formats, "Y444_16LE"); APPEND_STRING (format_str, formats, "Y444_16LE");
APPEND_STRING (format_str, formats, "GBR");
APPEND_STRING (format_str, formats, "GBR_16LE");
format_str += " }"; format_str += " }";
} }