mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaencoder: remove display reference in decode picture

Browse source 
Since it's possible to grab the VA display from the GstBuffer and
GstMemory, there's no need to keep a reference to it in
GstVaEncodePicture.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3066>
This commit is contained in:
Víctor Manuel Jáquez Leal 2023-03-24 12:46:55 +01:00 committed by GStreamer Marge Bot
parent 494169aad4
commit 292d6cdbed
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-bad/sys/va/gstvaencoder.c
View file

@ -1045,15 +1045,18 @@ gst_va_encoder_get_srcpad_caps (GstVaEncoder * self)
static gboolean static gboolean
_destroy_all_buffers (GstVaEncodePicture * pic) _destroy_all_buffers (GstVaEncodePicture * pic)
{ {
GstVaDisplay *display;
VABufferID buffer; VABufferID buffer;
guint i; guint i;
gboolean ret = TRUE; gboolean ret = TRUE;
g_return_val_if_fail (GST_IS_VA_DISPLAY (pic->display), FALSE); display = gst_va_buffer_peek_display (pic->raw_buffer);
if (!display)
return FALSE;
for (i = 0; i < pic->params->len; i++) { for (i = 0; i < pic->params->len; i++) {
buffer = g_array_index (pic->params, VABufferID, i); buffer = g_array_index (pic->params, VABufferID, i);
ret &= _destroy_buffer (pic->display, buffer); ret &= _destroy_buffer (display, buffer);
} }
pic->params = g_array_set_size (pic->params, 0); pic->params = g_array_set_size (pic->params, 0);
@ -1204,7 +1207,6 @@ gst_va_encode_picture_new (GstVaEncoder * self, GstBuffer * raw_buffer)
pic = g_new (GstVaEncodePicture, 1); pic = g_new (GstVaEncodePicture, 1);
pic->raw_buffer = gst_buffer_ref (raw_buffer); pic->raw_buffer = gst_buffer_ref (raw_buffer);
pic->reconstruct_buffer = reconstruct_buffer; pic->reconstruct_buffer = reconstruct_buffer;
pic->display = gst_object_ref (self->display);
pic->coded_buffer = coded_buffer; pic->coded_buffer = coded_buffer;
pic->params = g_array_sized_new (FALSE, FALSE, sizeof (VABufferID), 8); pic->params = g_array_sized_new (FALSE, FALSE, sizeof (VABufferID), 8);
@ -1215,18 +1217,23 @@ gst_va_encode_picture_new (GstVaEncoder * self, GstBuffer * raw_buffer)
void void
gst_va_encode_picture_free (GstVaEncodePicture * pic) gst_va_encode_picture_free (GstVaEncodePicture * pic)
{ {
GstVaDisplay *display;
g_return_if_fail (pic); g_return_if_fail (pic);
_destroy_all_buffers (pic); _destroy_all_buffers (pic);
display = gst_va_buffer_peek_display (pic->raw_buffer);
if (!display)
return;
if (pic->coded_buffer != VA_INVALID_ID) if (pic->coded_buffer != VA_INVALID_ID)
_destroy_buffer (pic->display, pic->coded_buffer); _destroy_buffer (display, pic->coded_buffer);
gst_buffer_unref (pic->raw_buffer); gst_buffer_unref (pic->raw_buffer);
gst_buffer_unref (pic->reconstruct_buffer); gst_buffer_unref (pic->reconstruct_buffer);
g_clear_pointer (&pic->params, g_array_unref); g_clear_pointer (&pic->params, g_array_unref);
gst_clear_object (&pic->display);
g_free (pic); g_free (pic);
} }

2
subprojects/gst-plugins-bad/sys/va/gstvaencoder.h
View file

@ -33,8 +33,6 @@ G_DECLARE_FINAL_TYPE (GstVaEncoder, gst_va_encoder, GST, VA_ENCODER, GstObject);
typedef struct _GstVaEncodePicture GstVaEncodePicture; typedef struct _GstVaEncodePicture GstVaEncodePicture;
struct _GstVaEncodePicture struct _GstVaEncodePicture
{ {
GstVaDisplay *display;
/* picture parameters */ /* picture parameters */
GArray *params; GArray *params;