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

nvencoder: Fix min buffers parameter of allocation query in auto GPU mode

Browse source 
At the time when propose_allocation() get called, encoder session
would not be initialized yet.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3891>
This commit is contained in:
Seungha Yang 2023-02-03 22:10:12 +09:00 committed by Tim-Philipp Müller
parent f7fc9fd76e
commit 04910ac6c1
4 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subprojects/gst-plugins-bad/sys/nvcodec/gstnvencoder.cpp
View file

@ -578,6 +578,11 @@ gst_nv_encoder_propose_allocation (GstVideoEncoder * encoder, GstQuery * query)
features = gst_caps_get_features (caps, 0); features = gst_caps_get_features (caps, 0);
min_buffers = gst_nv_encoder_get_task_size (self); min_buffers = gst_nv_encoder_get_task_size (self);
if (min_buffers == 0) {
GstNvEncoderClass *klass = GST_NV_ENCODER_GET_CLASS (self);
min_buffers = klass->calculate_min_buffers (self);
}
switch (priv->subclass_device_mode) { switch (priv->subclass_device_mode) {
case GST_NV_ENCODER_DEVICE_AUTO_SELECT: case GST_NV_ENCODER_DEVICE_AUTO_SELECT:

2
subprojects/gst-plugins-bad/sys/nvcodec/gstnvencoder.h
View file

@ -222,6 +222,8 @@ struct _GstNvEncoderClass
const GstVideoInfo * info, const GstVideoInfo * info,
GstBuffer * buffer, GstBuffer * buffer,
GstNvEncoderDeviceData * data); GstNvEncoderDeviceData * data);
guint (*calculate_min_buffers) (GstNvEncoder * encoder);
}; };
GType gst_nv_encoder_get_type (void); GType gst_nv_encoder_get_type (void);

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

@ -227,6 +227,7 @@ gst_nv_h264_encoder_check_reconfigure (GstNvEncoder * encoder,
static gboolean gst_nv_h264_encoder_select_device (GstNvEncoder * encoder, static gboolean gst_nv_h264_encoder_select_device (GstNvEncoder * encoder,
const GstVideoInfo * info, GstBuffer * buffer, const GstVideoInfo * info, GstBuffer * buffer,
GstNvEncoderDeviceData * data); GstNvEncoderDeviceData * data);
static guint gst_nv_h264_encoder_calculate_min_buffers (GstNvEncoder * encoder);
static void static void
gst_nv_h264_encoder_class_init (GstNvH264EncoderClass * klass, gpointer data) gst_nv_h264_encoder_class_init (GstNvH264EncoderClass * klass, gpointer data)
@ -467,6 +468,8 @@ gst_nv_h264_encoder_class_init (GstNvH264EncoderClass * klass, gpointer data)
GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_check_reconfigure); GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_check_reconfigure);
nvenc_class->select_device = nvenc_class->select_device =
GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_select_device); GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_select_device);
nvenc_class->calculate_min_buffers =
GST_DEBUG_FUNCPTR (gst_nv_h264_encoder_calculate_min_buffers);
klass->device_caps = cdata->device_caps; klass->device_caps = cdata->device_caps;
klass->cuda_device_id = cdata->cuda_device_id; klass->cuda_device_id = cdata->cuda_device_id;
@ -1738,6 +1741,24 @@ gst_nv_h264_encoder_select_device (GstNvEncoder * encoder,
return TRUE; return TRUE;
} }
static guint
gst_nv_h264_encoder_calculate_min_buffers (GstNvEncoder * encoder)
{
GstNvH264Encoder *self = GST_NV_H264_ENCODER (encoder);
guint num_buffers;
/* At least 4 surfaces are required as documented by Nvidia Encoder guide */
num_buffers = 4;
/* lookahead depth */
num_buffers += self->rc_lookahead;
/* B frames + 1 */
num_buffers += self->bframes + 1;
return num_buffers;
}
static GstNvEncoderClassData * static GstNvEncoderClassData *
gst_nv_h264_encoder_create_class_data (GstObject * device, gpointer session, gst_nv_h264_encoder_create_class_data (GstObject * device, gpointer session,
GstNvEncoderDeviceMode device_mode) GstNvEncoderDeviceMode device_mode)

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

@ -232,6 +232,7 @@ gst_nv_h265_encoder_check_reconfigure (GstNvEncoder * encoder,
static gboolean gst_nv_h265_encoder_select_device (GstNvEncoder * encoder, static gboolean gst_nv_h265_encoder_select_device (GstNvEncoder * encoder,
const GstVideoInfo * info, GstBuffer * buffer, const GstVideoInfo * info, GstBuffer * buffer,
GstNvEncoderDeviceData * data); GstNvEncoderDeviceData * data);
static guint gst_nv_h265_encoder_calculate_min_buffers (GstNvEncoder * encoder);
static void static void
gst_nv_h265_encoder_class_init (GstNvH265EncoderClass * klass, gpointer data) gst_nv_h265_encoder_class_init (GstNvH265EncoderClass * klass, gpointer data)
@ -468,6 +469,8 @@ gst_nv_h265_encoder_class_init (GstNvH265EncoderClass * klass, gpointer data)
GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_check_reconfigure); GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_check_reconfigure);
nvenc_class->select_device = nvenc_class->select_device =
GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_select_device); GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_select_device);
nvenc_class->calculate_min_buffers =
GST_DEBUG_FUNCPTR (gst_nv_h265_encoder_calculate_min_buffers);
klass->device_caps = cdata->device_caps; klass->device_caps = cdata->device_caps;
klass->cuda_device_id = cdata->cuda_device_id; klass->cuda_device_id = cdata->cuda_device_id;
@ -1750,6 +1753,24 @@ gst_nv_h265_encoder_select_device (GstNvEncoder * encoder,
return TRUE; return TRUE;
} }
static guint
gst_nv_h265_encoder_calculate_min_buffers (GstNvEncoder * encoder)
{
GstNvH265Encoder *self = GST_NV_H265_ENCODER (encoder);
guint num_buffers;
/* At least 4 surfaces are required as documented by Nvidia Encoder guide */
num_buffers = 4;
/* lookahead depth */
num_buffers += self->rc_lookahead;
/* B frames + 1 */
num_buffers += self->bframes + 1;
return num_buffers;
}
static GstNvEncoderClassData * static GstNvEncoderClassData *
gst_nv_h265_encoder_create_class_data (GstObject * device, gpointer session, gst_nv_h265_encoder_create_class_data (GstObject * device, gpointer session,
GstNvEncoderDeviceMode device_mode) GstNvEncoderDeviceMode device_mode)