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

onnxinference: Fix leak of the output tensors

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5884>
This commit is contained in:
Olivier Crête 2024-01-04 14:07:05 -05:00 committed by GStreamer Marge Bot
parent 06d477a89d
commit 6482514737
1 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
subprojects/gst-plugins-bad/ext/onnx/gstonnxclient.cpp
View file

@ -312,55 +312,38 @@ GstOnnxClient::GstOnnxClient ():session (nullptr),
GstTensor *tensor = &tmeta->tensor[i]; GstTensor *tensor = &tmeta->tensor[i];
if (hasIds) if (hasIds)
tensor->id = outputIds[i]; tensor->id = outputIds[i];
tensor->data = gst_buffer_new (); else
tensor->id = 0;
auto tensorShape = outputTensor.GetTensorTypeAndShapeInfo ().GetShape (); auto tensorShape = outputTensor.GetTensorTypeAndShapeInfo ().GetShape ();
tensor->num_dims = tensorShape.size (); tensor->num_dims = tensorShape.size ();
tensor->dims = g_new (int64_t, tensor->num_dims); tensor->dims = g_new (int64_t, tensor->num_dims);
for (size_t j = 0; j < tensorShape.size (); ++j) { for (size_t j = 0; j < tensorShape.size (); ++j)
tensor->dims[j] = tensorShape[j]; tensor->dims[j] = tensorShape[j];
}
size_t numElements = size_t numElements =
outputTensor.GetTensorTypeAndShapeInfo ().GetElementCount (); outputTensor.GetTensorTypeAndShapeInfo ().GetElementCount ();
size_t buffer_size = 0;
guint8 *buffer_data = NULL;
if (tensorType == ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT) { if (tensorType == ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT) {
buffer_size = numElements * sizeof (float); size_t buffer_size = 0;
// Allocate memory for the buffer data buffer_size = numElements * sizeof (float);
buffer_data = (guint8 *) malloc (buffer_size); tensor->data = gst_buffer_new_allocate (NULL, buffer_size, NULL);
if (buffer_data == NULL) { gst_buffer_fill (tensor->data, 0, outputTensor.GetTensorData < float >(),
GST_ERROR ("Failed to allocate memory");
return NULL;
}
// Copy the data from the source buffer to the allocated memory
memcpy (buffer_data, outputTensor.GetTensorData < float >(),
buffer_size); buffer_size);
tensor->type = GST_TENSOR_TYPE_FLOAT32; tensor->type = GST_TENSOR_TYPE_FLOAT32;
} else if (tensorType == ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32) { } else if (tensorType == ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32) {
buffer_size = numElements * sizeof (int); size_t buffer_size = 0;
// Allocate memory for the buffer data buffer_size = numElements * sizeof (int);
guint8 *buffer_data = (guint8 *) malloc (buffer_size); tensor->data = gst_buffer_new_allocate (NULL, buffer_size, NULL);
if (buffer_data == NULL) { gst_buffer_fill (tensor->data, 0, outputTensor.GetTensorData < float >(),
GST_ERROR ("Failed to allocate memory");
return NULL;
}
// Copy the data from the source buffer to the allocated memory
memcpy (buffer_data, outputTensor.GetTensorData < int >(),
buffer_size); buffer_size);
tensor->type = GST_TENSOR_TYPE_INT32; tensor->type = GST_TENSOR_TYPE_INT32;
} } else {
if (buffer_data) { GST_ERROR ("Output tensor is not FLOAT32 or INT32, not supported");
gst_buffer_remove_meta (buffer, (GstMeta*) tmeta);
// Create a GstMemory object from the allocated memory return NULL;
GstMemory *memory = gst_memory_new_wrapped ((GstMemoryFlags) 0,
buffer_data, buffer_size, 0, buffer_size, NULL, NULL);
// Append the GstMemory object to the GstBuffer
gst_buffer_append_memory (tmeta->tensor[i].data, memory);
} }
} }