According to Dave Airlie: > <airlied> but I think ignoring it should be fine, I can't see any > other way to get the imaeg extents correct for other usage > <Lynne> what width/height should be used for the images? > the final presentable dimensions, or the coded dimensions? > <airlied> if you don't want noise I think the presentable dims > <airlied> the driver should round up the allocations internally, > but if you are going to sample from the images then w/h have to be > the bounds of the image you want > <airlied> since otherwise there's no way to stop the sampler from > going outside the edges
>From ce6aa64eacfc9f7881571450a7bf8192c776f0ec Mon Sep 17 00:00:00 2001 From: Lynne <[email protected]> Date: Mon, 29 May 2023 03:50:25 +0200 Subject: [PATCH] vulkan_decode: do not align the image dimensions According to Dave Airlie: > <airlied> but I think ignoring it should be fine, I can't see any > other way to get the imaeg extents correct for other usage > <Lynne> what width/height should be used for the images? > the final presentable dimensions, or the coded dimensions? > <airlied> if you don't want noise I think the presentable dims > <airlied> the driver should round up the allocations internally, > but if you are going to sample from the images then w/h have to be > the bounds of the image you want > <airlied> since otherwise there's no way to stop the sampler from > going outside the edges --- libavcodec/vulkan_decode.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 6138106fef..0acfb93aa0 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -702,7 +702,6 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx, } static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ref, - int *width_align, int *height_align, enum AVPixelFormat *pix_fmt, VkFormat *vk_fmt, int *dpb_dedicate) { @@ -841,10 +840,10 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ " separate_references" : ""); /* Check if decoding is possible with the given parameters */ - if (avctx->coded_width < caps->minCodedExtent.width || - avctx->coded_height < caps->minCodedExtent.height || - avctx->coded_width > caps->maxCodedExtent.width || - avctx->coded_height > caps->maxCodedExtent.height) + if (avctx->width < caps->minCodedExtent.width || + avctx->height < caps->minCodedExtent.height || + avctx->width > caps->maxCodedExtent.width || + avctx->height > caps->maxCodedExtent.height) return AVERROR(EINVAL); if (!(avctx->hwaccel_flags & AV_HWACCEL_FLAG_IGNORE_LEVEL) && @@ -956,8 +955,6 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ *pix_fmt = best_format; *vk_fmt = best_vkfmt; - *width_align = caps->pictureAccessGranularity.width; - *height_align = caps->pictureAccessGranularity.height; *dpb_dedicate = dec->dedicated_dpb; return 0; @@ -966,7 +963,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ int ff_vk_frame_params(AVCodecContext *avctx, AVBufferRef *hw_frames_ctx) { VkFormat vkfmt; - int err, width_align, height_align, dedicated_dpb; + int err, dedicated_dpb; AVHWFramesContext *frames_ctx = (AVHWFramesContext*)hw_frames_ctx->data; AVVulkanFramesContext *hwfc = frames_ctx->hwctx; FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data; @@ -983,14 +980,13 @@ int ff_vk_frame_params(AVCodecContext *avctx, AVBufferRef *hw_frames_ctx) prof = &ctx->profile_data; err = vulkan_decode_get_profile(avctx, hw_frames_ctx, - &width_align, &height_align, &frames_ctx->sw_format, &vkfmt, &dedicated_dpb); if (err < 0) return err; - frames_ctx->width = FFALIGN(avctx->coded_width, width_align); - frames_ctx->height = FFALIGN(avctx->coded_height, height_align); + frames_ctx->width = avctx->width; + frames_ctx->height = avctx->height; frames_ctx->format = AV_PIX_FMT_VULKAN; hwfc->format[0] = vkfmt; -- 2.40.1
_______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
