virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

vulkan_ffv1: fallback to upload if mapping packet fails, fix fallback

Browse Source 
The commit which added support for host mapping accidentally broke the
original, upload route.
For drivers without host-mapping (very few), fix it.
This commit is contained in:
Lynne
2025-04-05 05:13:02 +00:00
parent 45d7abf6d9
commit b72ada0a96
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/vulkan_ffv1.c
View File

@@ -182,14 +182,11 @@ static int vk_ffv1_start_frame(AVCodecContext *avctx,
fp->crc_checked = f->ec && (avctx->err_recognition & AV_EF_CRCCHECK); fp->crc_checked = f->ec && (avctx->err_recognition & AV_EF_CRCCHECK);
/* Host map the input slices data if supported */ /* Host map the input slices data if supported */
if (ctx->s.extensions & FF_VK_EXT_EXTERNAL_HOST_MEMORY) { if (ctx->s.extensions & FF_VK_EXT_EXTERNAL_HOST_MEMORY)
err = ff_vk_host_map_buffer(&ctx->s, &vp->slices_buf, buffer_ref->data, ff_vk_host_map_buffer(&ctx->s, &vp->slices_buf, buffer_ref->data,
buffer_ref, buffer_ref,
VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT |
VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT); VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT);
if (err < 0)
return err;
}
/* Allocate slice state data */ /* Allocate slice state data */
if (f->picture.f->flags & AV_FRAME_FLAG_KEY) { if (f->picture.f->flags & AV_FRAME_FLAG_KEY) {
@@ -266,16 +263,14 @@ static int vk_ffv1_decode_slice(AVCodecContext *avctx,
uint32_t size) uint32_t size)
{ {
FFV1Context *f = avctx->priv_data; FFV1Context *f = avctx->priv_data;
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
FFVulkanDecodeShared *ctx = dec->shared_ctx;
FFv1VulkanDecodePicture *fp = f->hwaccel_picture_private; FFv1VulkanDecodePicture *fp = f->hwaccel_picture_private;
FFVulkanDecodePicture *vp = &fp->vp; FFVulkanDecodePicture *vp = &fp->vp;
FFVkBuffer *slice_offset = (FFVkBuffer *)fp->slice_offset_buf->data; FFVkBuffer *slice_offset = (FFVkBuffer *)fp->slice_offset_buf->data;
FFVkBuffer *slices_buf = vp->slices_buf ? (FFVkBuffer *)vp->slices_buf->data : NULL;
if (ctx->s.extensions & FF_VK_EXT_EXTERNAL_HOST_MEMORY) { if (slices_buf && slices_buf->host_ref) {
FFVkBuffer *slices_buf = (FFVkBuffer *)vp->slices_buf->data;
AV_WN32(slice_offset->mapped_mem + (2*fp->slice_num + 0)*sizeof(uint32_t), AV_WN32(slice_offset->mapped_mem + (2*fp->slice_num + 0)*sizeof(uint32_t),
data - slices_buf->mapped_mem); data - slices_buf->mapped_mem);
AV_WN32(slice_offset->mapped_mem + (2*fp->slice_num + 1)*sizeof(uint32_t), AV_WN32(slice_offset->mapped_mem + (2*fp->slice_num + 1)*sizeof(uint32_t),