vulkanupload: actually loop over possible uploaders

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

View file

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