mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

vulkanupload: actually loop over possible uploaders

Browse source 
Fix some funky control that wasn't working

CID #1417219
This commit is contained in:
Matthew Waters 2018-02-08 16:55:43 +11:00
parent 6f50d35246
commit e5c4135e81
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ext/vulkan/vkupload.c
View file

@ -794,7 +794,8 @@ gst_vulkan_upload_prepare_output_buffer (GstBaseTransform * bt,
GstVulkanUpload *vk_upload = GST_VULKAN_UPLOAD (bt); GstVulkanUpload *vk_upload = GST_VULKAN_UPLOAD (bt);
GstFlowReturn ret; GstFlowReturn ret;
do { restart:
{
gpointer method_impl; gpointer method_impl;
const struct UploadMethod *method; const struct UploadMethod *method;
@ -803,24 +804,24 @@ gst_vulkan_upload_prepare_output_buffer (GstBaseTransform * bt,
ret = method->perform (method_impl, inbuf, outbuf); ret = method->perform (method_impl, inbuf, outbuf);
if (ret != GST_FLOW_OK) { if (ret != GST_FLOW_OK) {
do { next_method:
if (!_upload_find_method (vk_upload)) { if (!_upload_find_method (vk_upload)) {
GST_ELEMENT_ERROR (bt, RESOURCE, NOT_FOUND, GST_ELEMENT_ERROR (bt, RESOURCE, NOT_FOUND,
("Could not find suitable uploader"), (NULL)); ("Could not find suitable uploader"), (NULL));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
method = upload_methods[vk_upload->current_impl];
method_impl = vk_upload->upload_impls[vk_upload->current_impl];
if (!method->set_caps (method_impl, vk_upload->in_caps,
vk_upload->out_caps))
/* try the next method */
goto next_method;
method = upload_methods[vk_upload->current_impl];
method_impl = vk_upload->upload_impls[vk_upload->current_impl];
if (!method->set_caps (method_impl, vk_upload->in_caps,
vk_upload->out_caps))
/* try the next method */
continue;
} while (FALSE);
/* try the uploading with the next method */ /* try the uploading with the next method */
continue; goto restart;
} }
} while (FALSE); }
if (ret == GST_FLOW_OK) { if (ret == GST_FLOW_OK) {
/* basetransform doesn't unref if they're the same */ /* basetransform doesn't unref if they're the same */