mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:46:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

nvh264enc: Fix broken Y444 format encoding with system memory Y444 support

Browse source 
separateColourPlaneFlag is mapped to separate_colour_plane_flag which
means Y, U and V planes are separately processed as monochrome sampled pictures.
So encoder shouldn't set that flag for normal 4:4:4 encoding.

Also for 4:4:4 encoding, NV_ENC_H264_PROFILE_HIGH_444_GUID profile must be
explicitly set.
This commit is contained in:
Seungha Yang 2019-05-04 20:56:38 +09:00
parent 22c6a4085f
commit cae6b7112d
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sys/nvenc/gstnvbaseenc.c
View file

@ -1862,6 +1862,29 @@ gst_nv_base_enc_handle_frame (GstVideoEncoder * enc, GstVideoCodecFrame * frame)
dest += dest_stride; dest += dest_stride;
src += src_stride; src += src_stride;
} }
} else if (GST_VIDEO_FRAME_FORMAT (&vframe) == GST_VIDEO_FORMAT_Y444) {
src = GST_VIDEO_FRAME_PLANE_DATA (&vframe, 1);
src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&vframe, 1);
dest = (guint8 *) in_buf_lock.bufferDataPtr +
GST_ROUND_UP_32 (height) * in_buf_lock.pitch;
dest_stride = in_buf_lock.pitch;
for (y = 0; y < height; ++y) {
memcpy (dest, src, width);
dest += dest_stride;
src += src_stride;
}
src = GST_VIDEO_FRAME_PLANE_DATA (&vframe, 2);
src_stride = GST_VIDEO_FRAME_PLANE_STRIDE (&vframe, 2);
dest = (guint8 *) in_buf_lock.bufferDataPtr +
2 * GST_ROUND_UP_32 (height) * in_buf_lock.pitch;
for (y = 0; y < height; ++y) {
memcpy (dest, src, width);
dest += dest_stride;
src += src_stride;
}
} else { } else {
// FIXME: this only works for NV12 and I420 // FIXME: this only works for NV12 and I420
g_assert_not_reached (); g_assert_not_reached ();

4
sys/nvenc/gstnvh264enc.c
View file

@ -56,7 +56,7 @@ G_DEFINE_TYPE (GstNvH264Enc, gst_nv_h264_enc, GST_TYPE_NV_BASE_ENC);
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-raw, " "format = (string) { NV12, I420 }, " // TODO: YV12, Y444 support GST_STATIC_CAPS ("video/x-raw, " "format = (string) { NV12, I420, Y444 }, "
"width = (int) [ 16, 4096 ], height = (int) [ 16, 4096 ], " "width = (int) [ 16, 4096 ], height = (int) [ 16, 4096 ], "
"framerate = (fraction) [0, MAX]," "framerate = (fraction) [0, MAX],"
"interlace-mode = { progressive, mixed, interleaved } " "interlace-mode = { progressive, mixed, interleaved } "
@ -510,7 +510,7 @@ gst_nv_h264_enc_set_encoder_config (GstNvBaseEnc * nvenc,
config->encodeCodecConfig.h264Config.chromaFormatIDC = 1; config->encodeCodecConfig.h264Config.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->encodeCodecConfig.h264Config.separateColourPlaneFlag = 1; config->profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID;
config->encodeCodecConfig.h264Config.chromaFormatIDC = 3; config->encodeCodecConfig.h264Config.chromaFormatIDC = 3;
} }