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

nvencoder: Add support for RGB formats

Browse source 
Adding RGBA, RGBx, BGRA, BGRx, VUYA and RGB10A2_LE format support for performance.
However, these formats are not still recommended if upstream can support
native YUV formats (e.g., NV12, P010) since NVENC does not expose
conversion related optiones. Note that VUYA format is 4:4:4 YUV format
already but NVENC runtime will convert it to 4:2:0 format internally

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6417>
This commit is contained in:
Seungha Yang 2024-03-22 01:03:11 +09:00 committed by GStreamer Marge Bot
parent e6f496a240
commit 106187cc59
3 changed files with 144 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,6 +313,20 @@ GstNvEncObject::InitSession (NV_ENC_INITIALIZE_PARAMS * params,
case GST_VIDEO_FORMAT_GBR_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;
case GST_VIDEO_FORMAT_VUYA:
buffer_format_ = NV_ENC_BUFFER_FORMAT_AYUV;
break;
case GST_VIDEO_FORMAT_RGBA:
case GST_VIDEO_FORMAT_RGBx:
buffer_format_ = NV_ENC_BUFFER_FORMAT_ABGR;
break;
case GST_VIDEO_FORMAT_BGRA:
case GST_VIDEO_FORMAT_BGRx:
buffer_format_ = NV_ENC_BUFFER_FORMAT_ARGB;
break;
case GST_VIDEO_FORMAT_RGB10A2_LE:
buffer_format_ = NV_ENC_BUFFER_FORMAT_ABGR10;
break;
default: default:
GST_ERROR_ID (id_.c_str (), "Unexpected format %s", GST_ERROR_ID (id_.c_str (), "Unexpected format %s",
gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info))); gst_video_format_to_string (GST_VIDEO_INFO_FORMAT (info)));

63
subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264encoder.cpp
View file

@ -1067,15 +1067,19 @@ gst_nv_h264_encoder_getcaps (GstVideoEncoder * encoder, GstCaps * filter)
/* *INDENT-OFF* */ /* *INDENT-OFF* */
for (const auto &iter: downstream_profiles) { for (const auto &iter: downstream_profiles) {
if (iter == "high" || iter == "main") { if (iter == "high" || iter == "main")
profile_support_interlaced = TRUE; profile_support_interlaced = TRUE;
}
if (iter == "high-4:4:4") { if (iter == "high-4:4:4") {
profile_support_interlaced = TRUE; profile_support_interlaced = TRUE;
allowed_formats.insert("Y444"); allowed_formats.insert("Y444");
} else { } else {
allowed_formats.insert("NV12"); allowed_formats.insert("NV12");
allowed_formats.insert("VUYA");
allowed_formats.insert("RGBA");
allowed_formats.insert("RGBx");
allowed_formats.insert("BGRA");
allowed_formats.insert("BGRx");
} }
} }
/* *INDENT-ON* */ /* *INDENT-ON* */
@ -1466,21 +1470,32 @@ gst_nv_h264_encoder_set_format (GstNvEncoder * encoder,
h264_config->entropyCodingMode = NV_ENC_H264_ENTROPY_CODING_MODE_AUTOSELECT; h264_config->entropyCodingMode = NV_ENC_H264_ENTROPY_CODING_MODE_AUTOSELECT;
} }
GstVideoColorimetry cinfo;
switch (GST_VIDEO_INFO_FORMAT (info)) {
case GST_VIDEO_FORMAT_NV12:
case GST_VIDEO_FORMAT_Y444:
cinfo = info->colorimetry;
break;
default:
/* Other formats will be converted 4:2:0 YUV by runtime */
gst_video_colorimetry_from_string (&cinfo, GST_VIDEO_COLORIMETRY_BT709);
break;
}
vui->videoSignalTypePresentFlag = 1; vui->videoSignalTypePresentFlag = 1;
/* Unspecified */ /* Unspecified */
vui->videoFormat = 5; vui->videoFormat = 5;
if (info->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255) { if (cinfo.range == GST_VIDEO_COLOR_RANGE_0_255) {
vui->videoFullRangeFlag = 1; vui->videoFullRangeFlag = 1;
} else { } else {
vui->videoFullRangeFlag = 0; vui->videoFullRangeFlag = 0;
} }
vui->colourDescriptionPresentFlag = 1; vui->colourDescriptionPresentFlag = 1;
vui->colourMatrix = gst_video_color_matrix_to_iso (info->colorimetry.matrix); vui->colourMatrix = gst_video_color_matrix_to_iso (cinfo.matrix);
vui->colourPrimaries = vui->colourPrimaries = gst_video_color_primaries_to_iso (cinfo.primaries);
gst_video_color_primaries_to_iso (info->colorimetry.primaries);
vui->transferCharacteristics = vui->transferCharacteristics =
gst_video_transfer_function_to_iso (info->colorimetry.transfer); gst_video_transfer_function_to_iso (cinfo.transfer);
g_mutex_unlock (&self->prop_lock); g_mutex_unlock (&self->prop_lock);
@ -1699,6 +1714,19 @@ gst_nv_h264_encoder_set_output_state (GstNvEncoder * encoder,
output_state = gst_video_encoder_set_output_state (GST_VIDEO_ENCODER (self), output_state = gst_video_encoder_set_output_state (GST_VIDEO_ENCODER (self),
caps, state); caps, state);
switch (GST_VIDEO_INFO_FORMAT (&state->info)) {
case GST_VIDEO_FORMAT_NV12:
case GST_VIDEO_FORMAT_Y444:
/* Native formats */
break;
default:
/* Format converted by runtime */
gst_video_colorimetry_from_string (&output_state->info.colorimetry,
GST_VIDEO_COLORIMETRY_BT709);
output_state->info.chroma_site = GST_VIDEO_CHROMA_SITE_H_COSITED;
break;
}
GST_INFO_OBJECT (self, "Output caps: %" GST_PTR_FORMAT, output_state->caps); GST_INFO_OBJECT (self, "Output caps: %" GST_PTR_FORMAT, output_state->caps);
gst_video_codec_state_unref (output_state); gst_video_codec_state_unref (output_state);
@ -1997,6 +2025,17 @@ gst_nv_h264_encoder_create_class_data (GstObject * device, gpointer session,
if (dev_caps.yuv444_encode) if (dev_caps.yuv444_encode)
formats.insert ("Y444"); formats.insert ("Y444");
break; break;
case NV_ENC_BUFFER_FORMAT_AYUV:
formats.insert ("VUYA");
break;
case NV_ENC_BUFFER_FORMAT_ABGR:
formats.insert ("RGBA");
formats.insert ("RGBx");
break;
case NV_ENC_BUFFER_FORMAT_ARGB:
formats.insert ("BGRA");
formats.insert ("BGRx");
break;
default: default:
break; break;
} }
@ -2023,6 +2062,11 @@ gst_nv_h264_encoder_create_class_data (GstObject * device, gpointer session,
format_str = "format = (string) { "; format_str = "format = (string) { ";
APPEND_STRING (format_str, formats, "NV12"); APPEND_STRING (format_str, formats, "NV12");
APPEND_STRING (format_str, formats, "Y444"); APPEND_STRING (format_str, formats, "Y444");
APPEND_STRING (format_str, formats, "VUYA");
APPEND_STRING (format_str, formats, "RGBA");
APPEND_STRING (format_str, formats, "RGBx");
APPEND_STRING (format_str, formats, "BGRA");
APPEND_STRING (format_str, formats, "BGRx");
format_str += " }"; format_str += " }";
} }
@ -2369,6 +2413,11 @@ gst_nv_h264_encoder_register_auto_select (GstPlugin * plugin,
format_str = "format = (string) { "; format_str = "format = (string) { ";
APPEND_STRING (format_str, formats, "NV12"); APPEND_STRING (format_str, formats, "NV12");
APPEND_STRING (format_str, formats, "Y444"); APPEND_STRING (format_str, formats, "Y444");
APPEND_STRING (format_str, formats, "VUYA");
APPEND_STRING (format_str, formats, "RGBA");
APPEND_STRING (format_str, formats, "RGBx");
APPEND_STRING (format_str, formats, "BGRA");
APPEND_STRING (format_str, formats, "BGRx");
format_str += " }"; format_str += " }";
} }

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

@ -1062,8 +1062,14 @@ gst_nv_h265_encoder_getcaps (GstVideoEncoder * encoder, GstCaps * filter)
for (const auto &iter: downstream_profiles) { for (const auto &iter: downstream_profiles) {
if (iter == "main") { if (iter == "main") {
allowed_formats.insert("NV12"); allowed_formats.insert("NV12");
allowed_formats.insert("VUYA");
allowed_formats.insert("RGBA");
allowed_formats.insert("RGBx");
allowed_formats.insert("BGRA");
allowed_formats.insert("BGRx");
} else if (iter == "main-10") { } else if (iter == "main-10") {
allowed_formats.insert("P010_10LE"); allowed_formats.insert("P010_10LE");
allowed_formats.insert("RGB10A2_LE");
} else if (iter == "main-444") { } else if (iter == "main-444") {
allowed_formats.insert("Y444"); allowed_formats.insert("Y444");
allowed_formats.insert("GBR"); allowed_formats.insert("GBR");
@ -1155,6 +1161,9 @@ gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
/* XXX: we may need to relax condition a little */ /* XXX: we may need to relax condition a little */
switch (GST_VIDEO_INFO_FORMAT (info)) { switch (GST_VIDEO_INFO_FORMAT (info)) {
case GST_VIDEO_FORMAT_NV12: case GST_VIDEO_FORMAT_NV12:
case GST_VIDEO_FORMAT_VUYA:
case GST_VIDEO_FORMAT_RGBA:
case GST_VIDEO_FORMAT_BGRA:
if (downstream_profiles.find ("main") == downstream_profiles.end ()) { if (downstream_profiles.find ("main") == downstream_profiles.end ()) {
GST_ERROR_OBJECT (self, "Downstream does not support main profile"); GST_ERROR_OBJECT (self, "Downstream does not support main profile");
return FALSE; return FALSE;
@ -1163,6 +1172,7 @@ gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
} }
break; break;
case GST_VIDEO_FORMAT_P010_10LE: case GST_VIDEO_FORMAT_P010_10LE:
case GST_VIDEO_FORMAT_RGB10A2_LE:
if (downstream_profiles.find ("main-10") == downstream_profiles.end ()) { if (downstream_profiles.find ("main-10") == downstream_profiles.end ()) {
GST_ERROR_OBJECT (self, "Downstream does not support main profile"); GST_ERROR_OBJECT (self, "Downstream does not support main profile");
return FALSE; return FALSE;
@ -1410,10 +1420,26 @@ gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
hevc_config->repeatSPSPPS = 0; hevc_config->repeatSPSPPS = 0;
} }
GstVideoColorimetry cinfo;
switch (GST_VIDEO_INFO_FORMAT (info)) {
case GST_VIDEO_FORMAT_NV12:
case GST_VIDEO_FORMAT_P010_10LE:
case GST_VIDEO_FORMAT_Y444:
case GST_VIDEO_FORMAT_GBR:
case GST_VIDEO_FORMAT_Y444_16LE:
case GST_VIDEO_FORMAT_GBR_16LE:
cinfo = info->colorimetry;
break;
default:
/* Other formats will be converted 4:2:0 YUV by runtime */
gst_video_colorimetry_from_string (&cinfo, GST_VIDEO_COLORIMETRY_BT709);
break;
}
vui->videoSignalTypePresentFlag = 1; vui->videoSignalTypePresentFlag = 1;
/* Unspecified */ /* Unspecified */
vui->videoFormat = 5; vui->videoFormat = 5;
if (info->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255) { if (cinfo.range == GST_VIDEO_COLOR_RANGE_0_255) {
vui->videoFullRangeFlag = 1; vui->videoFullRangeFlag = 1;
} else { } else {
vui->videoFullRangeFlag = 0; vui->videoFullRangeFlag = 0;
@ -1428,15 +1454,13 @@ gst_nv_h265_encoder_set_format (GstNvEncoder * encoder,
gst_video_color_matrix_to_iso (GST_VIDEO_COLOR_MATRIX_RGB); gst_video_color_matrix_to_iso (GST_VIDEO_COLOR_MATRIX_RGB);
break; break;
default: default:
vui->colourMatrix = vui->colourMatrix = gst_video_color_matrix_to_iso (cinfo.matrix);
gst_video_color_matrix_to_iso (info->colorimetry.matrix);
break; break;
} }
vui->colourPrimaries = vui->colourPrimaries = gst_video_color_primaries_to_iso (cinfo.primaries);
gst_video_color_primaries_to_iso (info->colorimetry.primaries);
vui->transferCharacteristics = vui->transferCharacteristics =
gst_video_transfer_function_to_iso (info->colorimetry.transfer); gst_video_transfer_function_to_iso (cinfo.transfer);
g_mutex_unlock (&self->prop_lock); g_mutex_unlock (&self->prop_lock);
@ -1734,6 +1758,23 @@ gst_nv_h265_encoder_set_output_state (GstNvEncoder * encoder,
output_state = gst_video_encoder_set_output_state (GST_VIDEO_ENCODER (self), output_state = gst_video_encoder_set_output_state (GST_VIDEO_ENCODER (self),
caps, state); caps, state);
switch (GST_VIDEO_INFO_FORMAT (&state->info)) {
case GST_VIDEO_FORMAT_NV12:
case GST_VIDEO_FORMAT_P010_10LE:
case GST_VIDEO_FORMAT_Y444:
case GST_VIDEO_FORMAT_GBR:
case GST_VIDEO_FORMAT_Y444_16LE:
case GST_VIDEO_FORMAT_GBR_16LE:
/* Native formats */
break;
default:
/* Format converted by runtime */
gst_video_colorimetry_from_string (&output_state->info.colorimetry,
GST_VIDEO_COLORIMETRY_BT709);
output_state->info.chroma_site = GST_VIDEO_CHROMA_SITE_H_COSITED;
break;
}
GST_INFO_OBJECT (self, "Output caps: %" GST_PTR_FORMAT, output_state->caps); GST_INFO_OBJECT (self, "Output caps: %" GST_PTR_FORMAT, output_state->caps);
gst_video_codec_state_unref (output_state); gst_video_codec_state_unref (output_state);
@ -2043,6 +2084,21 @@ gst_nv_h265_encoder_create_class_data (GstObject * device, gpointer session,
formats.insert ("GBR_16LE"); formats.insert ("GBR_16LE");
} }
break; break;
case NV_ENC_BUFFER_FORMAT_AYUV:
formats.insert ("VUYA");
break;
case NV_ENC_BUFFER_FORMAT_ABGR:
formats.insert ("RGBA");
formats.insert ("RGBx");
break;
case NV_ENC_BUFFER_FORMAT_ARGB:
formats.insert ("BGRA");
formats.insert ("BGRx");
break;
case NV_ENC_BUFFER_FORMAT_ABGR10:
if (dev_caps.supports_10bit_encode)
formats.insert ("RGB10A2_LE");
break;
default: default:
break; break;
} }
@ -2073,6 +2129,12 @@ gst_nv_h265_encoder_create_class_data (GstObject * device, gpointer session,
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");
APPEND_STRING (format_str, formats, "GBR_16LE"); APPEND_STRING (format_str, formats, "GBR_16LE");
APPEND_STRING (format_str, formats, "VUYA");
APPEND_STRING (format_str, formats, "RGBA");
APPEND_STRING (format_str, formats, "RGBx");
APPEND_STRING (format_str, formats, "BGRA");
APPEND_STRING (format_str, formats, "BGRx");
APPEND_STRING (format_str, formats, "RGB10A2_LE");
format_str += " }"; format_str += " }";
} }
@ -2411,6 +2473,12 @@ gst_nv_h265_encoder_register_auto_select (GstPlugin * plugin,
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");
APPEND_STRING (format_str, formats, "GBR_16LE"); APPEND_STRING (format_str, formats, "GBR_16LE");
APPEND_STRING (format_str, formats, "VUYA");
APPEND_STRING (format_str, formats, "RGBA");
APPEND_STRING (format_str, formats, "RGBx");
APPEND_STRING (format_str, formats, "BGRA");
APPEND_STRING (format_str, formats, "BGRx");
APPEND_STRING (format_str, formats, "RGB10A2_LE");
format_str += " }"; format_str += " }";
} }