Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

vulkan_encode: do not align DPB buffer size

Browse Source 
Per subsection B stroke 165 of Chapter 56,
drivers are required to do the aligning, not users.
pull/153/merge
Lynne 3 months ago
parent 893f3fde4c
commit 4a557baaa1
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 5 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      libavcodec/vulkan_encode.c

11
libavcodec/vulkan_encode.c
Unescape View File

@ -220,8 +220,7 @@ static int vulkan_encode_issue(AVCodecContext *avctx,
.sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR, .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
.pNext = NULL, .pNext = NULL,
.codedOffset = { 0 }, .codedOffset = { 0 },
.codedExtent = (VkExtent2D){ ctx->base.surface_width, .codedExtent = (VkExtent2D){ avctx->width, avctx->height },
ctx->base.surface_height },
.baseArrayLayer = ctx->common.layered_dpb ? slot_index : 0, .baseArrayLayer = ctx->common.layered_dpb ? slot_index : 0,
.imageViewBinding = vp->dpb.view, .imageViewBinding = vp->dpb.view,
}; };
@ -565,8 +564,8 @@ static int vulkan_encode_create_dpb(AVCodecContext *avctx, FFVulkanEncodeContext
base_ctx->recon_frames->format = AV_PIX_FMT_VULKAN; base_ctx->recon_frames->format = AV_PIX_FMT_VULKAN;
base_ctx->recon_frames->sw_format = dpb_format; base_ctx->recon_frames->sw_format = dpb_format;
base_ctx->recon_frames->width = base_ctx->surface_width; base_ctx->recon_frames->width = avctx->width;
base_ctx->recon_frames->height = base_ctx->surface_height; base_ctx->recon_frames->height = avctx->height;
hwfc->format[0] = ctx->pic_format; hwfc->format[0] = ctx->pic_format;
hwfc->create_pnext = &ctx->profile_list; hwfc->create_pnext = &ctx->profile_list;
@ -915,9 +914,9 @@ av_cold int ff_vulkan_encode_init(AVCodecContext *avctx, FFVulkanEncodeContext *
/* Setup width/height alignment */ /* Setup width/height alignment */
base_ctx->surface_width = avctx->coded_width = base_ctx->surface_width = avctx->coded_width =
FFALIGN(avctx->width, ctx->caps.pictureAccessGranularity.width); FFALIGN(avctx->width, ctx->enc_caps.encodeInputPictureGranularity.width);
base_ctx->surface_height = avctx->coded_height = base_ctx->surface_height = avctx->coded_height =
FFALIGN(avctx->height, ctx->caps.pictureAccessGranularity.height); FFALIGN(avctx->height, ctx->enc_caps.encodeInputPictureGranularity.height);
/* Setup slice width/height */ /* Setup slice width/height */
base_ctx->slice_block_width = ctx->enc_caps.encodeInputPictureGranularity.width; base_ctx->slice_block_width = ctx->enc_caps.encodeInputPictureGranularity.width;

Write Preview
Loading…
Cancel
Save