From patchwork Fri May 6 05:57:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35611 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1491141pzb; Thu, 5 May 2022 22:57:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgG2Oqe0o8OOIzfKnEc2Ufm9uPlGqw2ehA5rGFT4w4IXnF9wf7/W9+AwapH9aWTlak9HtD X-Received: by 2002:a17:906:4795:b0:6f3:d1cc:7127 with SMTP id cw21-20020a170906479500b006f3d1cc7127mr1487996ejc.461.1651816652640; Thu, 05 May 2022 22:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651816652; cv=none; d=google.com; s=arc-20160816; b=fR1pJfBx1FUe4pMF2J60KBivMPqIRTWSpWn9UJF4d2OfQ791Pn8cTgyV6o83/f8GwE y4zhSmo31NuVVDEtYlIyKDtj3SUSmr2Ecpnr/eR+cmYqreEfd6zJHPf/VLfrt6be8Jz6 C4wOJ7KIwp4Szl14hrMloGN8fjJFZiT/gFAaJkSXHA41khxuwYWhr7GHoXT2MJ4tYKsm g5EjJtdXqtZQ2kuqvXK0G58DZcOyQ8MTBbJdNUopoUyvys/z3kW/5xCcM1npR/uNIfvU gFnUcZj64BTTrM8eybhevbWu2ZD0CrAU3fEJegoMbTg9+dJpJJu2ARig031iMvjo1F+N s8gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=zWYpWnE84FoBE3qJyOFkSLW8zAm4Ic+9hn7AoQsDtBM=; b=AVgscs74bDAnOIiQCMTOgP9Q6aKhEkRl9/uCOgevnVR+yWcH/6Ju2GJxa3sRXxmX8J G7VrvxmFvOGntMaoFn+QdOE3RZycQJ9ewJMV/bZ6WivoLzWzPv7yHKH0SGxHov6ed65s AHiX/3yeoINPM2fVwq1+w/aokppyitcOysC9WzfFl/41iqRanFW9FIuHUZQxmLI+saRH 7w6YQ0rtRDU0TGbUI5+1bLsE0ZAsnLRNqkDH8RjhswU1GfF18FNtPzoVmyHoQU/LPmCj /3ZQq1z8Cf1ENaaLVw98wU1xqv9qmNUVL6axWTJVZ5aIXdqsQiQ9fJzr0TUhXx9AqZQV XVzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=AsA+tn5q; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i13-20020a056402054d00b004280d0066a4si3498581edx.453.2022.05.05.22.57.32; Thu, 05 May 2022 22:57:32 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=AsA+tn5q; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5DA5368B192; Fri, 6 May 2022 08:57:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75C8D68B196 for ; Fri, 6 May 2022 08:57:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651816646; x=1683352646; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=X4mzjwv5wArcIV8CV1EUknS8NmVepAWEVhZJiKNt2wc=; b=AsA+tn5qCEb3h4SkK02oJme7TLn7Y9Kz9xD3/PHLtu/Dr8/6nPNxy7Q7 F4PSunPCN7W0V/IB3Cn1nVTokFzQxlb3ROrs1NHPdwqKPFM5ncatRHoWS +NCzps1FE/dm895S4Wy0DZAefOXAZEtIeXe+w8wXnnJ25XOjC9eG/dic8 8j4nwpIt9/N70uZZNxqjJo1ptRqhJTIrgeTWb3EzZG7ZEZi/61hsCspjw 27T03gnyxsbl8Icv9meyAq01rF1XgUqU02kW5OUBgIGoXwO9q5g9WA11G 7uIoas9o1KBrOuZywnmMUWu2z4CVdNFphhJuomHK5i/wOtrDLXeiM1SK0 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10338"; a="267201055" X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="267201055" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 22:57:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="568953766" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.234.85]) by fmsmga007.fm.intel.com with ESMTP; 05 May 2022 22:57:18 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 05:57:09 +0000 Message-Id: <20220506055711.1671-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/3] avutil/hwcontext_qsv: derive QSV frames to D3D11VA frames 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gSDF52LN67qu Fixes: $ ffmpeg.exe -y -hwaccel qsv -init_hw_device d3d11va=d3d11 \ -init_hw_device qsv=qsv@d3d11 -c:v h264_qsv -i input.h264 \ -vf "hwmap=derive_device=d3d11va,format=d3d11" -f null - Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index b28dcffe2a..bf150c8553 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1281,12 +1281,22 @@ static int qsv_frames_derive_from(AVHWFramesContext *dst_ctx, #if CONFIG_D3D11VA case AV_HWDEVICE_TYPE_D3D11VA: { + D3D11_TEXTURE2D_DESC texDesc; + dst_ctx->initial_pool_size = src_ctx->initial_pool_size; AVD3D11VAFramesContext *dst_hwctx = dst_ctx->hwctx; - mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfaces[i].Data.MemId; - dst_hwctx->texture = (ID3D11Texture2D*)pair->first; + dst_hwctx->texture_infos = av_calloc(src_hwctx->nb_surfaces, + sizeof(*dst_hwctx->texture_infos)); if (src_hwctx->frame_type & MFX_MEMTYPE_SHARED_RESOURCE) dst_hwctx->MiscFlags = D3D11_RESOURCE_MISC_SHARED; - dst_hwctx->BindFlags = qsv_get_d3d11va_bind_flags(src_hwctx->frame_type); + for (i = 0; i < src_hwctx->nb_surfaces; i++) { + mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfaces[i].Data.MemId; + dst_hwctx->texture_infos[i].texture = (ID3D11Texture2D*)pair->first; + dst_hwctx->texture_infos[i].index = pair->second == (mfxMemId)MFX_INFINITE ? (intptr_t)0 : (intptr_t)pair->second; + if (i == 0) { + ID3D11Texture2D_GetDesc(dst_hwctx->texture_infos[i].texture, &texDesc); + } + } + dst_hwctx->BindFlags = texDesc.BindFlags; } break; #endif From patchwork Fri May 6 05:57:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35612 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1491175pzb; Thu, 5 May 2022 22:57:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmi9U1ybipZ6KMSa0A99L+BD6w0kthELdiJ2tjRqvhjYMCobyh/Fi0HJhMDL9jnNu+2Xc4 X-Received: by 2002:a17:906:c115:b0:6f3:c010:61a6 with SMTP id do21-20020a170906c11500b006f3c01061a6mr1477722ejc.231.1651816660828; Thu, 05 May 2022 22:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651816660; cv=none; d=google.com; s=arc-20160816; b=0eg3hcIzrvgv1kx2QrCNRWVHnGvFpu2XRCZ15ipsd/MVJDG2tf3lYwN6x/U2RfRmPD MCxBqyXy665dlI1QFdZBUyhS3FA2CRP/t9Zmw5kWW8e1IBEi1ws+PFu3Tlu43g/ZOsDF vAuk2R+ufVOwMjeDjBGzJ+oxwMPDNochLH4EmSOIu1njvsDGxRQqoYX6gZ44qaATY1na cfaTPNRmi4Wh+zHaGjeTuDbLcT6CVGMHok27/CUjE8nZC3rl0pQujiMzrsqpjkN+C6FZ X9PTqpJp15ui1PQ4mvwgqP0vXf7tptdyuBDCqm4487yGfnbgoYJpPd4IP+wD0GmClXUd go3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:dkim-signature:delivered-to; bh=Nv0Wo2n06Rt1KaVAbnsbrVKbWnrklswBCLYUpcwhWmM=; b=bglZGSObrXc+n1GFQS5ZAqh4qkyZKAKaF1182Y1ILB/h3W+MCOWkTjhNWjOiLctHnu icO+52YvUjD6P0T7AloaEMmBkbUeyPjws2N5c9IXaSkXU5a/vq0DCwCqTrr6+0M5XQcf EaZlzB2PeeEdXzizSyKE2OuiQPo56UOkRVwuEIUZPx+dNHYOp7zKp1579EeKPdLRcpw8 7cUQ7TxL/BUn5mCMrPc0dL03i5Rv8HnQDCDmQO9Qy++17EbKtR5APog7MGRjv7opZTSZ KE2ojHs+YQiJMreKS0fe7N0dlDn6qqsoLYuL+IZ9dFxrnqRj6wpeSd+UvsYlwPmC5tnT 64dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="TIf/Oofm"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z8-20020a1709063ac800b006e74fd3551asi4043659ejd.525.2022.05.05.22.57.40; Thu, 05 May 2022 22:57:40 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="TIf/Oofm"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6190968B2F7; Fri, 6 May 2022 08:57:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87C9A68B192 for ; Fri, 6 May 2022 08:57:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651816648; x=1683352648; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fvpof9+HfrCqRgzsbIqhU0SdoG0zrYEEwBILZu8iV3E=; b=TIf/OofmxjXWiL5jPXeARxZl5k62exmWKQdZzV1cClqvXV6sILmVCKPF tHj9OhcNawuu7Jx9yv0TG/qhE3ZKdbJC/lAZYVw7ISd2wP5WbqPPfM+V7 9Ra+h+doBF2t8b/f44x7AN/BOTqX7s5Ccp5htrhkfw/p6FTt2BC58Li/8 Mzg3IrZxuGulD9YWU3M+gSJBUu9w3ULBN73piqHtHVqy5Nk5Pbu/FNxiU RKyFMHXWTg0O9AqZSLrpBFnPuXlyUm8+EmkMSnVUuk6vSrECJeqemCRq7 EDQuidL+tYdttpiVDaKt/jzack/Flnp4YGF+aQ6UHUUpuEn5XDsXGpIqX Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10338"; a="267201059" X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="267201059" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 22:57:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="568953776" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.234.85]) by fmsmga007.fm.intel.com with ESMTP; 05 May 2022 22:57:19 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 05:57:10 +0000 Message-Id: <20220506055711.1671-2-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220506055711.1671-1-tong1.wu@intel.com> References: <20220506055711.1671-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/3] avutil/hwcontext_d3d11va: pass the format value from outside for staging texture 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dwm+Jgn0eo/i In d3d11va_create_staging_texture(), during the hwmap process, the ctx->internal->priv is not initialized, resulting in the texDesc.Format not initialized. Now pass the format value from d3d11va_transfer_data() to fix it. $ ffmpeg.exe -y -hwaccel qsv -init_hw_device d3d11va=d3d11 \ -init_hw_device qsv=qsv@d3d11 -c:v h264_qsv \ -i input.h264 -vf "hwmap=derive_device=d3d11va,format=d3d11,hwdownload,format=nv12" \ -f null - Signed-off-by: Tong Wu --- libavutil/hwcontext_d3d11va.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c index 2b4e24bb56..bb4e9d6965 100644 --- a/libavutil/hwcontext_d3d11va.c +++ b/libavutil/hwcontext_d3d11va.c @@ -346,7 +346,7 @@ static int d3d11va_transfer_get_formats(AVHWFramesContext *ctx, return 0; } -static int d3d11va_create_staging_texture(AVHWFramesContext *ctx) +static int d3d11va_create_staging_texture(AVHWFramesContext *ctx, DXGI_FORMAT format) { AVD3D11VADeviceContext *device_hwctx = ctx->device_ctx->hwctx; D3D11VAFramesContext *s = ctx->internal->priv; @@ -355,7 +355,7 @@ static int d3d11va_create_staging_texture(AVHWFramesContext *ctx) .Width = ctx->width, .Height = ctx->height, .MipLevels = 1, - .Format = s->format, + .Format = format, .SampleDesc = { .Count = 1 }, .ArraySize = 1, .Usage = D3D11_USAGE_STAGING, @@ -411,7 +411,8 @@ static int d3d11va_transfer_data(AVHWFramesContext *ctx, AVFrame *dst, device_hwctx->lock(device_hwctx->lock_ctx); if (!s->staging_texture) { - int res = d3d11va_create_staging_texture(ctx); + ID3D11Texture2D_GetDesc((ID3D11Texture2D *)texture, &desc); + int res = d3d11va_create_staging_texture(ctx, desc.Format); if (res < 0) return res; } From patchwork Fri May 6 05:57:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 35613 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1491224pzb; Thu, 5 May 2022 22:57:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwU7a+i4zYC96MB3ZVIb2CY/64yLVLAsur8BZr6rc5zdOJhM9ePQu6Li7SVAV72fcqI60Yk X-Received: by 2002:a17:907:a0c9:b0:6f4:c0e2:6a8b with SMTP id hw9-20020a170907a0c900b006f4c0e26a8bmr1433827ejc.263.1651816671242; Thu, 05 May 2022 22:57:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651816671; cv=none; d=google.com; s=arc-20160816; b=a5QlhirV3U0kkRV7sJFbzuPyZy4igBi/I6TnnqXc3XiyWznqLIlq6qs5DFk/8o2XYS l2IEN1qbchsnc/BntqwEEwPwD0K8orAy1K2TrSwGSRtDfoG4tmDWBdWO3S6/qi4D/4mE KBxaGGHXp7ANXWif+gaVgZooKihl+tVtOJaLkJKXjW15Y2ZQIXo+Sn93fh/p2fiaewFC G228xNJS1WPex+NuuzetWkTmOUm+eECOdPPKhlLAiEaCpCSmIOCBUGp9vBGnHEzsuEUh 9lGX5gL2to202KZtswjHdR0Z44HWvplK92ZBeQ5Qu+jagLtMk7kOMrrpmGOr90lhSATk UXrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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:dkim-signature:delivered-to; bh=w06Vp/15rtKMAtlllomumaQDax9HQ8QJq3O3UNgHBd8=; b=HQAO5YbWXIt6nsk/KuS7ogRlkYmJwOv0nXkpB9SU4YRUJVmyKFyD2pLlcBH9Rh09kV voqiPyKNol9KknbZLRQmgW6E0fdsJ2YexFIrZUHQtsj9uD7EnAkAMQpHw4G6Aw5tJnwI EIxDjhPHcKpBwNsoHq/RjWHxH3kFvWRCrOB3dtcUl4DXXDSqrWAkLcuMuCFMPlQp20NH WTRbgnp+9w+tBUp/hq5vaLjcIw5rWvRRp2m5u13KsAylDMyST53rJHUdV7gahIWgQGT1 8id6miKnrd7fEGQ9ygUpUn5Pd0J+kK1KX8DzqpBw3uJVdBomn4Dtbr7yHY61LVe8YSus +DMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=IZyYrUIv; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n10-20020a170906688a00b006f3a3c6b04asi3790811ejr.295.2022.05.05.22.57.49; Thu, 05 May 2022 22:57:51 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=IZyYrUIv; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CD2B68B373; Fri, 6 May 2022 08:57:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 874F068B2C7 for ; Fri, 6 May 2022 08:57: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=1651816652; x=1683352652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sfhbmiF/wSMTpsfhhslyMov7B0k8aVFY/omlPmBxAOA=; b=IZyYrUIvalJR4pClIVOEVRYgjtXvulBSbUEQfp3rBj8yX74gz0/YGUEr CO58SACgbIJOR0Zq4Z5hDsOg5vVG3u8ffecvWtz4ebTopJhfeOVr/6+s1 NVIctX29JNZGnmSTSzDU3WTtxvZtSj4SgXVFxOrvaNmIqdSQRJ7D6kXHD LSHwpkns7Onxsir5jRn4IvbhZg03cpESSMsNEZh3r746uthyzlEDMu8eH 89jZUzyFZ+FyxAfWtgvuE9YXLvUwFHRetNsg1RfEzDWNF0PzHOppSXCZO RvzluEHspJQ6D6hjxhccod56jcsOMV0fzhElzaxY7833aR6aiCkaYThsK g==; X-IronPort-AV: E=McAfee;i="6400,9594,10338"; a="267201063" X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="267201063" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 22:57:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="568953784" Received: from gtapc.iind.intel.com (HELO localhost.localdomain) ([10.190.234.85]) by fmsmga007.fm.intel.com with ESMTP; 05 May 2022 22:57:20 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 05:57:11 +0000 Message-Id: <20220506055711.1671-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220506055711.1671-1-tong1.wu@intel.com> References: <20220506055711.1671-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/3] avutil/hwcontext_qsv: fix mapping issue between QSV frames and D3D11VA frames 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w4jhNWIzVKVk Fixes: $ ffmpeg.exe -init_hw_device d3d11va=d3d11 -init_hw_device \ qsv=qsv@d3d11 -s:v WxH -pix_fmt nv12 -i input.yuv -vf \ "hwupload=extra_hw_frames=16,hwmap=derive_device=d3d11va,format=d3d11,\ hwmap=derive_device=qsv,format=qsv" -f null - Signed-off-by: Tong Wu --- libavutil/hwcontext_qsv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index bf150c8553..5bff2dbcf2 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1387,7 +1387,7 @@ static int qsv_map_from(AVHWFramesContext *ctx, if (child_frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId; dst->data[0] = pair->first; - dst->data[1] = pair->second; + dst->data[1] = pair->second == (mfxMemId)MFX_INFINITE ? (uint8_t *)0 : pair->second; } else { dst->data[3] = child_data; } @@ -1417,7 +1417,7 @@ static int qsv_map_from(AVHWFramesContext *ctx, if (child_frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) { mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId; dummy->data[0] = pair->first; - dummy->data[1] = pair->second; + dummy->data[1] = pair->second == (mfxMemId)MFX_INFINITE ? (uint8_t *)0 : pair->second; } else { dummy->data[3] = child_data; } @@ -1884,7 +1884,8 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx, { mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfaces[i].Data.MemId; if (pair->first == src->data[0] - && pair->second == src->data[1]) { + && (pair->second == src->data[1] + || (pair->second == (mfxMemId)MFX_INFINITE && src->data[1] == (uint8_t *)0))) { index = i; break; }