From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EEDA5492ED for ; Wed, 8 May 2024 06:05:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C32768D559; Wed, 8 May 2024 09:04:34 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B464168D530 for ; Wed, 8 May 2024 09:04:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715148273; x=1746684273; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JAbUPVhVvNnDS2VE18VPBZCQd42K1q9Tn48yU98U36Y=; b=QEBHT5RyQzebnH3dKTaJOTMAZAYPU48T0yDgAzk19DsVqhASHW+hkpw8 EVbJGbeRuecwsiicmGv40ZuI5LH5iqf/iokwu8/Ovn/MqUd70DTSNEYLh OhZcIMuNIwIllAsoDmJ0bHo0vR5wBL444IdvM5niuCeNK/12cI3dP0EkC LhMHEWlppm/UFFLWUMM1/rmQbSvjo1lJ8IbL5HPpknvOfl5pDHEta/8Fd Rh71eCyBhUC6JtIP+5joJxqk/T7m8BkDzGdtHH8jSx+I1LNv9W9Y9Yd7r L/xR4vONRYaAqOo6i+yPVfSiV6JAjM5p6KyLQrKag0CbRj6CKmuR0tAP5 g==; X-CSE-ConnectionGUID: dTFLPJheS/S3U0vC/hdZow== X-CSE-MsgGUID: iwQ4zXVeSYK0elL+iDl6/Q== X-IronPort-AV: E=McAfee;i="6600,9927,11066"; a="10855351" X-IronPort-AV: E=Sophos;i="6.08,144,1712646000"; d="scan'208";a="10855351" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2024 23:04:23 -0700 X-CSE-ConnectionGUID: 2CZUUhlaTmCDejn5xIfbiw== X-CSE-MsgGUID: TbISEzuMSqume6LYvLVAWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,144,1712646000"; d="scan'208";a="28828786" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 May 2024 23:04:21 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 May 2024 14:03:11 +0800 Message-Id: <20240508060316.681114-4-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240508060316.681114-1-haihao.xiang@intel.com> References: <20240508060316.681114-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/9] lavu/hwcontext_qsv: add support for dynamic frame pool in qsv_map_to X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Haihao Xiang Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang Make it work with the source which has a dynamic frame pool. Signed-off-by: Haihao Xiang --- libavutil/hwcontext_qsv.c | 131 +++++++++++++++++++++++++++++++++++++- 1 file changed, 129 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 1d3091e6f8..8b7b4dc501 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -2122,8 +2122,8 @@ static int qsv_frames_derive_to(AVHWFramesContext *dst_ctx, } } -static int qsv_map_to(AVHWFramesContext *dst_ctx, - AVFrame *dst, const AVFrame *src, int flags) +static int qsv_fixed_pool_map_to(AVHWFramesContext *dst_ctx, + AVFrame *dst, const AVFrame *src, int flags) { AVQSVFramesContext *hwctx = dst_ctx->hwctx; int i, err, index = -1; @@ -2182,6 +2182,133 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx, return 0; } +static void qsv_dynamic_pool_unmap(AVHWFramesContext *ctx, HWMapDescriptor *hwmap) +{ + mfxFrameSurface1 *surfaces_internal = (mfxFrameSurface1 *)hwmap->priv; + mfxHDLPair *handle_pairs_internal = (mfxHDLPair *)surfaces_internal->Data.MemId; + AVHWFramesContext *src_ctx = (AVHWFramesContext *)ffhwframesctx(ctx)->source_frames->data; + + switch (src_ctx->format) { +#if CONFIG_VAAPI + case AV_PIX_FMT_VAAPI: + { + av_freep(&handle_pairs_internal->first); + + break; + } +#endif + +#if CONFIG_D3D11VA + case AV_PIX_FMT_D3D11: + { + /* Do nothing */ + break; + } +#endif + default: + av_log(ctx, AV_LOG_ERROR, "Should not reach here. \n"); + break; + } + + av_freep(&handle_pairs_internal); + av_freep(&surfaces_internal); +} + +static int qsv_dynamic_pool_map_to(AVHWFramesContext *dst_ctx, + AVFrame *dst, const AVFrame *src, int flags) +{ + mfxFrameSurface1 *surfaces_internal = NULL; + mfxHDLPair *handle_pairs_internal = NULL; + int ret = 0; + + surfaces_internal = av_calloc(1, sizeof(*surfaces_internal)); + if (!surfaces_internal) { + ret = AVERROR(ENOMEM); + goto fail; + } + + handle_pairs_internal = av_calloc(1, sizeof(*handle_pairs_internal)); + if (!handle_pairs_internal) { + ret = AVERROR(ENOMEM); + goto fail; + } + + ret = qsv_init_surface(dst_ctx, surfaces_internal); + if (ret < 0) + goto fail; + + switch (src->format) { +#if CONFIG_VAAPI + case AV_PIX_FMT_VAAPI: + { + VASurfaceID *surface_id_internal; + + surface_id_internal = av_calloc(1, sizeof(*surface_id_internal)); + if (!surface_id_internal) { + ret =AVERROR(ENOMEM); + goto fail; + } + + *surface_id_internal = (VASurfaceID)(uintptr_t)src->data[3]; + handle_pairs_internal->first = (mfxHDL)surface_id_internal; + handle_pairs_internal->second = (mfxMemId)MFX_INFINITE; + + break; + } +#endif + +#if CONFIG_D3D11VA + case AV_PIX_FMT_D3D11: + { + AVHWFramesContext *src_ctx = (AVHWFramesContext*)src->hw_frames_ctx->data; + AVD3D11VAFramesContext *src_hwctx = src_ctx->hwctx; + + handle_pairs_internal->first = (mfxMemId)src->data[0]; + + if (src_hwctx->BindFlags & D3D11_BIND_RENDER_TARGET) { + handle_pairs_internal->second = (mfxMemId)MFX_INFINITE; + } else { + handle_pairs_internal->second = (mfxMemId)src->data[1]; + } + + break; + } +#endif + default: + ret = AVERROR(ENOSYS); + goto fail; + } + + surfaces_internal->Data.MemId = (mfxMemId)handle_pairs_internal; + + ret = ff_hwframe_map_create(dst->hw_frames_ctx, + dst, src, qsv_dynamic_pool_unmap, surfaces_internal); + if (ret) + goto fail; + + dst->width = src->width; + dst->height = src->height; + dst->data[3] = (uint8_t*)surfaces_internal; + + return 0; + +fail: + av_freep(&handle_pairs_internal); + av_freep(&surfaces_internal); + return ret; +} + +static int qsv_map_to(AVHWFramesContext *dst_ctx, + AVFrame *dst, const AVFrame *src, int flags) +{ + AVQSVFramesContext *hwctx = dst_ctx->hwctx; + + if (hwctx->nb_surfaces) + return qsv_fixed_pool_map_to(dst_ctx, dst, src, flags); + else + return qsv_dynamic_pool_map_to(dst_ctx, dst, src, flags); +} + static int qsv_frames_get_constraints(AVHWDeviceContext *ctx, const void *hwconfig, AVHWFramesConstraints *constraints) -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".