mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

nvenc: Specify colorimetry related VUI parameters

Browse source 
Set the colorimetry config for the information to be embedded in encodec bitstream.
This commit is contained in:
Seungha Yang 2019-07-17 09:35:35 +09:00
parent b42d98ca19
commit e01c68524f
2 changed files with 55 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sys/nvcodec/gstnvh264enc.c
View file

@ -447,6 +447,8 @@ gst_nv_h264_enc_set_encoder_config (GstNvBaseEnc * nvenc,
GUID selected_profile = NV_ENC_CODEC_PROFILE_AUTOSELECT_GUID; GUID selected_profile = NV_ENC_CODEC_PROFILE_AUTOSELECT_GUID;
int level_idc = NV_ENC_LEVEL_AUTOSELECT; int level_idc = NV_ENC_LEVEL_AUTOSELECT;
GstVideoInfo *info = &state->info; GstVideoInfo *info = &state->info;
NV_ENC_CONFIG_H264 *h264_config = &config->encodeCodecConfig.h264Config;
NV_ENC_CONFIG_H264_VUI_PARAMETERS *vui = &h264_config->h264VUIParameters;
template_caps = gst_static_pad_template_get_caps (&src_factory); template_caps = gst_static_pad_template_get_caps (&src_factory);
allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (h264enc)); allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (h264enc));
@ -499,18 +501,39 @@ gst_nv_h264_enc_set_encoder_config (GstNvBaseEnc * nvenc,
/* override some defaults */ /* override some defaults */
GST_LOG_OBJECT (h264enc, "setting parameters"); GST_LOG_OBJECT (h264enc, "setting parameters");
config->profileGUID = selected_profile; config->profileGUID = selected_profile;
config->encodeCodecConfig.h264Config.level = level_idc; h264_config->level = level_idc;
config->encodeCodecConfig.h264Config.chromaFormatIDC = 1; h264_config->chromaFormatIDC = 1;
if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_Y444) { if (GST_VIDEO_INFO_FORMAT (info) == GST_VIDEO_FORMAT_Y444) {
GST_DEBUG_OBJECT (h264enc, "have Y444 input, setting config accordingly"); GST_DEBUG_OBJECT (h264enc, "have Y444 input, setting config accordingly");
config->profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID; config->profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID;
config->encodeCodecConfig.h264Config.chromaFormatIDC = 3; h264_config->chromaFormatIDC = 3;
} }
config->encodeCodecConfig.h264Config.idrPeriod = config->gopLength; h264_config->idrPeriod = config->gopLength;
/* FIXME: make property */ /* FIXME: make property */
config->encodeCodecConfig.h264Config.outputAUD = 1; h264_config->outputAUD = 1;
vui->videoSignalTypePresentFlag = 1;
/* NOTE: vui::video_format represents the video format before
* being encoded such as PAL, NTSC, SECAM, and MAC. That's not much informal
* and can be inferred with resolution and framerate by any application.
*/
/* Unspecified video format (5) */
vui->videoFormat = 5;
if (info->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255) {
vui->videoFullRangeFlag = 1;
} else {
vui->videoFullRangeFlag = 0;
}
vui->colourDescriptionPresentFlag = 1;
vui->colourMatrix = gst_video_color_matrix_to_iso (info->colorimetry.matrix);
vui->colourPrimaries =
gst_video_color_primaries_to_iso (info->colorimetry.primaries);
vui->transferCharacteristics =
gst_video_color_transfer_to_iso (info->colorimetry.transfer);
return TRUE; return TRUE;
} }

30
sys/nvcodec/gstnvh265enc.c
View file

@ -349,6 +349,9 @@ gst_nv_h265_enc_set_encoder_config (GstNvBaseEnc * nvenc,
GstCaps *allowed_caps, *template_caps; GstCaps *allowed_caps, *template_caps;
GUID selected_profile = NV_ENC_CODEC_PROFILE_AUTOSELECT_GUID; GUID selected_profile = NV_ENC_CODEC_PROFILE_AUTOSELECT_GUID;
int level_idc = NV_ENC_LEVEL_AUTOSELECT; int level_idc = NV_ENC_LEVEL_AUTOSELECT;
GstVideoInfo *info = &state->info;
NV_ENC_CONFIG_HEVC *hevc_config = &config->encodeCodecConfig.hevcConfig;
NV_ENC_CONFIG_HEVC_VUI_PARAMETERS *vui = &hevc_config->hevcVUIParameters;
template_caps = gst_static_pad_template_get_caps (&src_factory); template_caps = gst_static_pad_template_get_caps (&src_factory);
allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (h265enc)); allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (h265enc));
@ -392,11 +395,32 @@ gst_nv_h265_enc_set_encoder_config (GstNvBaseEnc * nvenc,
/* override some defaults */ /* override some defaults */
GST_LOG_OBJECT (h265enc, "setting parameters"); GST_LOG_OBJECT (h265enc, "setting parameters");
config->profileGUID = selected_profile; config->profileGUID = selected_profile;
config->encodeCodecConfig.hevcConfig.level = level_idc; hevc_config->level = level_idc;
config->encodeCodecConfig.hevcConfig.idrPeriod = config->gopLength; hevc_config->idrPeriod = config->gopLength;
/* FIXME: make property */ /* FIXME: make property */
config->encodeCodecConfig.hevcConfig.outputAUD = 1; hevc_config->outputAUD = 1;
vui->videoSignalTypePresentFlag = 1;
/* NOTE: vui::video_format represents the video format before
* being encoded such as PAL, NTSC, SECAM, and MAC. That's not much informal
* and can be inferred with resolution and framerate by any application.
*/
/* Unspecified video format (5) */
vui->videoFormat = 5;
if (info->colorimetry.range == GST_VIDEO_COLOR_RANGE_0_255) {
vui->videoFullRangeFlag = 1;
} else {
vui->videoFullRangeFlag = 0;
}
vui->colourDescriptionPresentFlag = 1;
vui->colourMatrix = gst_video_color_matrix_to_iso (info->colorimetry.matrix);
vui->colourPrimaries =
gst_video_color_primaries_to_iso (info->colorimetry.primaries);
vui->transferCharacteristics =
gst_video_color_transfer_to_iso (info->colorimetry.transfer);
return TRUE; return TRUE;
} }