From patchwork Tue Nov 30 08:44:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31833 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7352175iob; Tue, 30 Nov 2021 00:48:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVpmkYGfRBUpqXB8Q7vpjp+k6Xm7YdFCSLStmf93iH0IZcxjNVaK7z9vHSPzOI4aZNDVPq X-Received: by 2002:a17:906:c7c9:: with SMTP id dc9mr66080927ejb.34.1638262101012; Tue, 30 Nov 2021 00:48:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638262101; cv=none; d=google.com; s=arc-20160816; b=V2L3JfwCFMTCnYNGPG0WJyL7GLQQKFHPTc03+h23otqjKv/s/Lc6sWsYeHUL7JD5ni L08AG3FmLDYShtDjKmCdv/lHLjIbHVfKkUVl+2rdHasw4BkcG2ao69fBJ+0XXx9s2Svd qt90/Ztq/LavT0QRlxcvWM+J8Zd8jVDLxJs7AjLM3TzWT7osY0APWeGncn6CQBiZtoXX DrQiLy8km4KykuzJ9VyCOLYqph3/0wEWssl4Ns2nsJdDV3eJLaLmTE/n8CXPPA9gpaL5 8yFBsYM4Dc72qQaXpYm+QozjfeqqSJEZJHybe2jVpLEtTJnMmKoIlmxRDW2pfkelF3Tf iFJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=LRXGlpjjHvBrX/DWO8HYzt8WvMi9GMXIuVSD8VgmwHE=; b=0zr1ewSFxw6DeJH2yOqjQITJOugoZYkbNrIQhk5+XTU93Zsqbt3EkbV2TMR8CaBPk5 QwX9sLjCpfSaZItJ+qWwqUbmSUkZADIAO26MhlgFXLcVSfVl2j1qwygHhYdYL1DOM6SF 3NnQXvraLJH1EtXQjn3CCWQBcN8rqUV0qmLvMwFQlTswjxKdwMY/5UFzTTrs2dMv8q3+ oyy+UaTBwGp0nQrJh5L8omdsK+xJL0UwEgNiJemepBdv8rXiwuu+yltbYMo+mnTBBl85 Ehv0gGX4ED1tiQ+Mcg3X4RrpSHr8tmrivCUNuDVlnjkfd+ldp0CnZc7LUW9cdT3WbL/b qqPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q7si34238459edd.487.2021.11.30.00.48.19; Tue, 30 Nov 2021 00:48:21 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12FCA68078A; Tue, 30 Nov 2021 10:48:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26501689BC6 for ; Tue, 30 Nov 2021 10:48:08 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10183"; a="299567448" X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="299567448" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2021 00:48:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="676745633" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga005.jf.intel.com with ESMTP; 30 Nov 2021 00:48:05 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 16:44:04 +0800 Message-Id: <20211130084406.758250-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 1/3] libavcodec/vaapi_decode: fix the problem that init_pool_size < nb_surface 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pORn1loonbYd For vaapi if the init_pool_size is not zero, the pool size is fixed. This means max surfaces is init_pool_size, but when mapping vaapi frame to qsv frame, the init_pool_size < nb_surface. The cause is that vaapi_decode_make_config() config the init_pool_size and it is called twice. The first time is to init frame_context and the second time is to init codec. On the second time the init_pool_size is changed to original value so the init_pool_size is lower than the reall size because pool_size used to initialize frame_context need to plus thread_count and 3 (guarantee 4 base work surfaces). Now add code to make sure init_pool_size is only set once. Now the following commandline works: ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 \ -hwaccel_output_format vaapi -i input.264 \ -vf "hwmap=derive_device=qsv,format=qsv" \ -c:v h264_qsv output.264 Signed-off-by: Wenbin Chen --- libavcodec/vaapi_decode.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 665af370ed..aab8162989 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -572,22 +572,24 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, if (err < 0) goto fail; - frames->initial_pool_size = 1; - // Add per-codec number of surfaces used for storing reference frames. - switch (avctx->codec_id) { - case AV_CODEC_ID_H264: - case AV_CODEC_ID_HEVC: - case AV_CODEC_ID_AV1: - frames->initial_pool_size += 16; - break; - case AV_CODEC_ID_VP9: - frames->initial_pool_size += 8; - break; - case AV_CODEC_ID_VP8: - frames->initial_pool_size += 3; - break; - default: - frames->initial_pool_size += 2; + if (!frames->initial_pool_size) { + frames->initial_pool_size = 1; + // Add per-codec number of surfaces used for storing reference frames. + switch (avctx->codec_id) { + case AV_CODEC_ID_H264: + case AV_CODEC_ID_HEVC: + case AV_CODEC_ID_AV1: + frames->initial_pool_size += 16; + break; + case AV_CODEC_ID_VP9: + frames->initial_pool_size += 8; + break; + case AV_CODEC_ID_VP8: + frames->initial_pool_size += 3; + break; + default: + frames->initial_pool_size += 2; + } } } From patchwork Tue Nov 30 08:44:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31832 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7352272iob; Tue, 30 Nov 2021 00:48:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxXg8F5/zlt5U6jttlq0lA/+HuNNKQaq/CW4anRYg2/DqdazX+vIGonxU0fR5seXHzlX2n X-Received: by 2002:a17:906:f856:: with SMTP id ks22mr63892924ejb.367.1638262109494; Tue, 30 Nov 2021 00:48:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638262109; cv=none; d=google.com; s=arc-20160816; b=PxYPyKY7o3uoYz6OCMM1R0KqWIshG3Bf0Y0Gi8pcfUR2Db0JF30mTbTBLBheNr+Kf1 Tz8nynYn8sghefqZ53QDDdho7H0iFHdklvY1enktnxWI6KueMi0Hb9rM1CMB8rJ6oEph e/j/CKKVoYThDX9pjf5KQA1B6bLZUVD/TWmUCqWglCazq5dKjIzZNJYcksNPFIqs/PxC xiJkPWThvS1Km4/9PZ9CuUTvpdvUm5YXxL5V6k4BXED9KvCyYH2zi8M2lyv55yyj4QQ1 eZBqL1Mqab8JUQb9TAliGw0HfsiL3dkkIAAK8Qe/mDPfoHWswHjILRhkSqv3IJRfEHtY bieg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=aasyRZVDK1ExXiC52rWOasjH1pZ3hkrCp04d0ad0c+A=; b=b47hmdV7f9ZFJrhD+af1s4SgJXOArzIfeKSwJfpzDj4QgvqtLY9HQfr6NwNZge1rpU RWv1VON2LC2bigNUJXp45lviasT6KS5H8J09YuX4FH53ZyK9UQAzAhMn9Q5bPYs3xVl3 da0VTzBp9KjRBpsjZnZuXfY6+f+4AOD1oOnsjpmfpNi2sIY2nBfrTvwkcJvO/9ozqB64 nJ9RxnPBQ4A4paRCjpBr2qRvoCkU2aRwkLaMjhiKz1ijEnnKMGhb7BBWtl3tpWZUQS/L DqArxYl1Rq3jEgMAirpzoQe1bU40C5jwUHOuTG8zAJtOz1EWfbSgppwibNsGJ7ljqi3l 6pGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cb17si22899936edb.493.2021.11.30.00.48.29; Tue, 30 Nov 2021 00:48:29 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AB7068AE97; Tue, 30 Nov 2021 10:48:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15E9868AE0F for ; Tue, 30 Nov 2021 10:48:14 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10183"; a="299567449" X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="299567449" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2021 00:48:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="676745644" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga005.jf.intel.com with ESMTP; 30 Nov 2021 00:48:06 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 16:44:05 +0800 Message-Id: <20211130084406.758250-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130084406.758250-1-wenbin.chen@intel.com> References: <20211130084406.758250-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 2/3] libavutil/hwcontext_qsv: fix a bug for mapping vaapi frame to qsv 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 32O+SlQYONCE From: nyanmisaka The data stored in data[3] in VAAPI AVFrame is VASurfaceID while the data stored in pair->first is the pointer of VASurfaceID, so we need to do cast to make following commandline works: ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 \ -hwaccel_output_format vaapi -i input.264 \ -vf "hwmap=derive_device=qsv,format=qsv" -c:v h264_qsv output.264 Signed-off-by: nyanmisaka Signed-off-by: Wenbin Chen --- libavutil/hwcontext_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 268be9f8a1..a5d154a24d 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1218,7 +1218,7 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx, case AV_PIX_FMT_VAAPI: { mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfaces[i].Data.MemId; - if (pair->first == src->data[3]) { + if (*(VASurfaceID*)pair->first == (VASurfaceID)src->data[3]) { index = i; break; } From patchwork Tue Nov 30 08:44:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 31834 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7352403iob; Tue, 30 Nov 2021 00:48:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdq9fLV7xtW/4l46Q/wYWAIHJrEq7j+jQeM8xnWwnJfVJr1waXeu2YvjgBX4QZBEaYMX73 X-Received: by 2002:a17:907:9487:: with SMTP id dm7mr67331899ejc.2.1638262119587; Tue, 30 Nov 2021 00:48:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638262119; cv=none; d=google.com; s=arc-20160816; b=g+nrd/1ROHXlnbm7CaO2N5DDuXdK9DPzGhrpcutzt71TDrTy+ga1GoxUq/7a7NF0+D FOeXPSXKGZbTCS7UY9gO27a0hH/XT/XsfOk3tgLrNg1jown+RF8OtBkbdDm/raM8M4VP S4+PXcz1ftGgbILbdXMbmlns3ois8ixZ/8WYcbXzwsbjrKpBbxXiuKhBKGploPznaz2f DiVSFUsihmTZcJ4lKOOheAMJ5Iev69rd8/vSOOL4gaOGqRwoM5nQ0XXA1YtxsmTH63Dt J7LmBGA3tFQFUCIOtqpydTeT41ZBIfyrXNX9tGIbZZvoAT3bwLxsXJLS6/AaCXyPxtZX dKdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=YUZRkNS219edC1ivq1QQH8F3hEA2jYTTsW9TsDA9OTY=; b=KG2/4FqyVRxKa0O0VLgG4LjTm3SShU6NkqlUSOdRqiSNLNAApVWGFgadK6PpGy8qqT 94u7ZRh3bn9eeU6SwWxqrvzzFTtLpa/OYuJC70jpw1T61ij7RFcBQQXvc0W1ndlaQMeI 3RdgE8fSrIgg7HQRNrt5nJ4RemSdmmkpjZAZvypKQOtfyaou+h0Ljbqb7WUL1sChDQ2R zU0yzUEGkROH9lv+jOHqJYDxComnnobUyoBikF5tqIP/TIS1TDbXgiI1qwHjSVogwqdd ugVSI1ZxIsOXr/4QkKusc9wuTGU/DOFp2vpw/Dh/3AmZRHfmZNSwiT7sDZomoikknJ0/ Mhtw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id go42si26044312ejc.556.2021.11.30.00.48.39; Tue, 30 Nov 2021 00:48:39 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 34A4F68AE68; Tue, 30 Nov 2021 10:48:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67BDC68AE42 for ; Tue, 30 Nov 2021 10:48:16 +0200 (EET) X-IronPort-AV: E=McAfee;i="6200,9189,10183"; a="299567450" X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="299567450" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2021 00:48:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="676745654" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga005.jf.intel.com with ESMTP; 30 Nov 2021 00:48:07 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 16:44:06 +0800 Message-Id: <20211130084406.758250-3-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130084406.758250-1-wenbin.chen@intel.com> References: <20211130084406.758250-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 3/3] libavutil/hwcontext_opencl: fix a bug for mapping qsv frame to opencl 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fxqaiMH3RZnb From: nyanmisaka mfxHDLPair was added to qsv, so modify qsv->opencl map function as well. Now the following commandline works: ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128 \ -init_hw_device qsv=qs@va -init_hw_device opencl=ocl@va -filter_hw_device ocl \ -hwaccel qsv -hwaccel_output_format qsv -hwaccel_device qs -c:v h264_qsv \ -i input.264 -vf "hwmap=derive_device=opencl,format=opencl,avgblur_opencl, \ hwmap=derive_device=qsv:reverse=1:extra_hw_frames=32,format=qsv" \ -c:v h264_qsv output.264 Signed-off-by: nyanmisaka Signed-off-by: Wenbin Chen --- libavutil/hwcontext_opencl.c | 3 ++- libavutil/hwcontext_qsv.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c index 26a3a24593..ab812999cd 100644 --- a/libavutil/hwcontext_opencl.c +++ b/libavutil/hwcontext_opencl.c @@ -48,6 +48,7 @@ #if HAVE_OPENCL_VAAPI_INTEL_MEDIA #if CONFIG_LIBMFX #include +#include "hwcontext_qsv.h" #endif #include #include @@ -2249,7 +2250,7 @@ static int opencl_map_from_qsv(AVHWFramesContext *dst_fc, AVFrame *dst, #if CONFIG_LIBMFX if (src->format == AV_PIX_FMT_QSV) { mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3]; - va_surface = *(VASurfaceID*)mfx_surface->Data.MemId; + va_surface = *MFXSURFACEP_TO_VASURFACEP(mfx_surface); } else #endif if (src->format == AV_PIX_FMT_VAAPI) { diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h index b98d611cfc..957df01ef1 100644 --- a/libavutil/hwcontext_qsv.h +++ b/libavutil/hwcontext_qsv.h @@ -29,6 +29,11 @@ * contain AVBufferRefs whose data pointer points to an mfxFrameSurface1 struct. */ +#if CONFIG_VAAPI +#define MFXSURFACEP_TO_VASURFACEP(surf) \ + (VASurfaceID*)(((mfxHDLPair*)surf->Data.MemId)->first) +#endif + /** * This struct is allocated as AVHWDeviceContext.hwctx */