mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 01:45:33 +00:00
cuda: Fix typo in gst_cuda_buffery_copy_type_to_string
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1472>
This commit is contained in:
parent
86dcfc29dc
commit
dcd2ccad59
3 changed files with 15 additions and 15 deletions
|
@ -692,7 +692,7 @@ gst_cuda_graphics_resource_free (GstCudaGraphicsResource * resource)
|
||||||
}
|
}
|
||||||
|
|
||||||
const gchar *
|
const gchar *
|
||||||
gst_cuda_buffery_copy_type_to_string (GstCudaBufferCopyType type)
|
gst_cuda_buffer_copy_type_to_string (GstCudaBufferCopyType type)
|
||||||
{
|
{
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case GST_CUDA_BUFFER_COPY_SYSTEM:
|
case GST_CUDA_BUFFER_COPY_SYSTEM:
|
||||||
|
@ -1528,7 +1528,7 @@ gst_cuda_buffer_copy (GstBuffer * dst, GstCudaBufferCopyType dst_type,
|
||||||
cuda_context = GST_CUDA_MEMORY_CAST (dst_mem)->context;
|
cuda_context = GST_CUDA_MEMORY_CAST (dst_mem)->context;
|
||||||
|
|
||||||
GST_TRACE_OBJECT (context, "GL -> %s",
|
GST_TRACE_OBJECT (context, "GL -> %s",
|
||||||
gst_cuda_buffery_copy_type_to_string (dst_type));
|
gst_cuda_buffer_copy_type_to_string (dst_type));
|
||||||
|
|
||||||
return cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
|
return cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
|
||||||
cuda_context, stream, TRUE, dst_type);
|
cuda_context, stream, TRUE, dst_type);
|
||||||
|
@ -1543,7 +1543,7 @@ gst_cuda_buffer_copy (GstBuffer * dst, GstCudaBufferCopyType dst_type,
|
||||||
cuda_context = GST_CUDA_MEMORY_CAST (src_mem)->context;
|
cuda_context = GST_CUDA_MEMORY_CAST (src_mem)->context;
|
||||||
|
|
||||||
GST_TRACE_OBJECT (context, "%s -> GL",
|
GST_TRACE_OBJECT (context, "%s -> GL",
|
||||||
gst_cuda_buffery_copy_type_to_string (src_type));
|
gst_cuda_buffer_copy_type_to_string (src_type));
|
||||||
|
|
||||||
return cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
|
return cuda_copy_gl_interop (dst, dst_info, src, src_info, gl_context,
|
||||||
cuda_context, stream, FALSE, src_type);
|
cuda_context, stream, FALSE, src_type);
|
||||||
|
@ -1597,8 +1597,8 @@ gst_cuda_buffer_copy (GstBuffer * dst, GstCudaBufferCopyType dst_type,
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_TRACE_OBJECT (context, "%s -> %s",
|
GST_TRACE_OBJECT (context, "%s -> %s",
|
||||||
gst_cuda_buffery_copy_type_to_string (src_type),
|
gst_cuda_buffer_copy_type_to_string (src_type),
|
||||||
gst_cuda_buffery_copy_type_to_string (dst_type));
|
gst_cuda_buffer_copy_type_to_string (dst_type));
|
||||||
|
|
||||||
return gst_cuda_buffer_copy_internal (dst, dst_type, dst_info,
|
return gst_cuda_buffer_copy_internal (dst, dst_type, dst_info,
|
||||||
src, src_type, src_info, cuda_context, stream);
|
src, src_type, src_info, cuda_context, stream);
|
||||||
|
|
|
@ -204,7 +204,7 @@ typedef enum
|
||||||
} GstCudaBufferCopyType;
|
} GstCudaBufferCopyType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gst_cuda_buffery_copy_type_to_string:
|
* gst_cuda_buffer_copy_type_to_string:
|
||||||
* @type: The #GstCudaBufferCopyType to get name from
|
* @type: The #GstCudaBufferCopyType to get name from
|
||||||
*
|
*
|
||||||
* Returns: The human readable name of @type
|
* Returns: The human readable name of @type
|
||||||
|
@ -212,7 +212,7 @@ typedef enum
|
||||||
* Since: 1.22
|
* Since: 1.22
|
||||||
*/
|
*/
|
||||||
GST_CUDA_API
|
GST_CUDA_API
|
||||||
const gchar * gst_cuda_buffery_copy_type_to_string (GstCudaBufferCopyType type);
|
const gchar * gst_cuda_buffer_copy_type_to_string (GstCudaBufferCopyType type);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gst_cuda_buffer_copy:
|
* gst_cuda_buffer_copy:
|
||||||
|
|
|
@ -867,8 +867,8 @@ gst_cuda_memory_copy_transform (GstBaseTransform * trans, GstBuffer * inbuf,
|
||||||
|
|
||||||
GST_LOG_OBJECT (self,
|
GST_LOG_OBJECT (self,
|
||||||
"Copy %s -> %s failed, checking whether fallback is possible",
|
"Copy %s -> %s failed, checking whether fallback is possible",
|
||||||
gst_cuda_buffery_copy_type_to_string (in_type),
|
gst_cuda_buffer_copy_type_to_string (in_type),
|
||||||
gst_cuda_buffery_copy_type_to_string (out_type));
|
gst_cuda_buffer_copy_type_to_string (out_type));
|
||||||
|
|
||||||
switch (in_type) {
|
switch (in_type) {
|
||||||
case GST_CUDA_BUFFER_COPY_GL:
|
case GST_CUDA_BUFFER_COPY_GL:
|
||||||
|
@ -890,15 +890,15 @@ gst_cuda_memory_copy_transform (GstBaseTransform * trans, GstBuffer * inbuf,
|
||||||
|
|
||||||
if (in_type == fallback_in_type && out_type == fallback_out_type) {
|
if (in_type == fallback_in_type && out_type == fallback_out_type) {
|
||||||
GST_ERROR_OBJECT (self, "Failed to copy %s -> %s",
|
GST_ERROR_OBJECT (self, "Failed to copy %s -> %s",
|
||||||
gst_cuda_buffery_copy_type_to_string (in_type),
|
gst_cuda_buffer_copy_type_to_string (in_type),
|
||||||
gst_cuda_buffery_copy_type_to_string (out_type));
|
gst_cuda_buffer_copy_type_to_string (out_type));
|
||||||
|
|
||||||
return GST_FLOW_ERROR;
|
return GST_FLOW_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_LOG_OBJECT (self, "Trying %s -> %s fallback",
|
GST_LOG_OBJECT (self, "Trying %s -> %s fallback",
|
||||||
gst_cuda_buffery_copy_type_to_string (fallback_in_type),
|
gst_cuda_buffer_copy_type_to_string (fallback_in_type),
|
||||||
gst_cuda_buffery_copy_type_to_string (fallback_out_type));
|
gst_cuda_buffer_copy_type_to_string (fallback_out_type));
|
||||||
|
|
||||||
ret = gst_cuda_buffer_copy (outbuf, fallback_out_type, out_info, inbuf,
|
ret = gst_cuda_buffer_copy (outbuf, fallback_out_type, out_info, inbuf,
|
||||||
fallback_in_type, in_info, ctrans->context, ctrans->cuda_stream);
|
fallback_in_type, in_info, ctrans->context, ctrans->cuda_stream);
|
||||||
|
@ -922,8 +922,8 @@ gst_cuda_memory_copy_transform (GstBaseTransform * trans, GstBuffer * inbuf,
|
||||||
return GST_FLOW_OK;
|
return GST_FLOW_OK;
|
||||||
|
|
||||||
GST_ERROR_OBJECT (self, "Failed to copy %s -> %s",
|
GST_ERROR_OBJECT (self, "Failed to copy %s -> %s",
|
||||||
gst_cuda_buffery_copy_type_to_string (in_type),
|
gst_cuda_buffer_copy_type_to_string (in_type),
|
||||||
gst_cuda_buffery_copy_type_to_string (out_type));
|
gst_cuda_buffer_copy_type_to_string (out_type));
|
||||||
|
|
||||||
return GST_FLOW_ERROR;
|
return GST_FLOW_ERROR;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue