From patchwork Wed Dec 20 07:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 45253 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5184:b0:194:e134:edd4 with SMTP id j4csp43949pzf; Tue, 19 Dec 2023 23:12:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGL6pDHONMIpi+sZd3FgZs8s/zmtq09SP43MhHLc2xvGgvh4gZfsGfpBSxvcxZ9qZ4NV7Fo X-Received: by 2002:a17:907:9518:b0:a23:5814:4b76 with SMTP id ew24-20020a170907951800b00a2358144b76mr2145510ejc.35.1703056348664; Tue, 19 Dec 2023 23:12:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703056348; cv=none; d=google.com; s=arc-20160816; b=n7kLHTwOzMi1gS2/QEm/t8GEmYDVnnfkgDSg1ghrvkxXqryaO4LNvALnwtlYmjNmge JDNR+uWYqRawvBxkBAjff1bh4xFUy2tG/OAuRZnJt9RhVCKt4bBh+jutonmz94zkAHLP qIc1ExkRw+a4So/SwKGsVntlAD8QQqNpU8fdMJ3zvny6VMrz1z5c9oLTjoE80aJ+mT05 3+xN++inEOvKNeO5uZpmwfHgaNTH02cHHYR9BOHJac/O74TF52hWzgfN8JOyPuHOVrbs OQFvpKccEsSAmEN6U/egCFgAP3DsY9mYfX9VbeUfihDfXioyDDij2JyDAPOfJWAqOqPr hc6Q== 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=WBybTZRFqoLQcv9bLk7lLcjwdmfTcAkhG1AqUnMbOh4=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=GqQkD/4Ug/P4MbGqDUH/Yeam2Ou45GjVJRIXrYC6OovCBYTr1Mw9k2ynvYKQrMaCDp Ke+SUnWJuyWDIIP8KN4qRNQ+x2TQOg5VThuQVgg6gouQuZdvo1QTiOb9CFEE1cj5NZ0P 8IvCJPSRQHeimkoei9t5ZuhiZYIJWK8TLZ9L1e06Rs6bUYES61VVplCN5A/jKRizGBGg 3QLY9gci598cvvTL/tWIsF5JHUgLAt2Vbnz4oIqzmjSSU6ztSqzIZEV75b9YFtmyZ0RK NNQd79s8vyjGMZartfYsm5Oo7xdCEVd/mZq3KETjCiJ2WplLHLd1+jquSLyeGzYe/kf4 9kDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ah2VWfMS; 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 p27-20020a1709060e9b00b00a26968ceee5si208721ejf.328.2023.12.19.23.12.28; Tue, 19 Dec 2023 23:12:28 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ah2VWfMS; 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 6C2C068D1D1; Wed, 20 Dec 2023 09:11:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75C9B68D0C3 for ; Wed, 20 Dec 2023 09:11:25 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703056285; x=1734592285; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2g24ZbPUjpNpUIM43E6+1/ShO9eJe8ljY2VhpL17F+E=; b=ah2VWfMSKxqEV5nUity3KVbzt/lfje5Y/BfoO/jVsOatTGUvBKKEIMue oTHfWtZqi8YExDHJGNk/QmxrDi5sHhiFyqjvHZBu4IM4qCyUhlo0lJitc 97H8kRAmckHBg9qNgKsdKYEhvhDNvKkGHunZInRhTceKNgX5iXSKcjVJH WwLrxm/ISEXpL1JnWyr9YbTCOeaJ5JQ0VkXP+JvXhJwWKSvkQ+CgF0IVy SPCDv5ODui6CC6s546h8qiA7J1r/7gm/IE1mvOBivttPNQPr1s3UBLXFq M24arjY4/BQg9XslvJPjpqFp2ICK9uXg1+jupOPnCmvMPGn/QEzMOum54 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10929"; a="426921053" X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="426921053" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2023 23:11:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="18191882" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2023 23:11:17 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Dec 2023 15:10:47 +0800 Message-Id: <20231220071050.3175819-9-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231220071050.3175819-1-haihao.xiang@intel.com> References: <20231220071050.3175819-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 09/12] lavfi/qsvvpp: require a dynamic frame pool for output if possible 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bni07MFo3D6j From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavfilter/qsvvpp.c | 52 ++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index d09140d89b..2c8e73e87d 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -603,6 +603,26 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) device_ctx = (AVHWDeviceContext *)device_ref->data; device_hwctx = device_ctx->hwctx; + /* extract the properties of the "master" session given to us */ + ret = MFXQueryIMPL(device_hwctx->session, &impl); + if (ret == MFX_ERR_NONE) + ret = MFXQueryVersion(device_hwctx->session, &ver); + if (ret != MFX_ERR_NONE) { + av_log(avctx, AV_LOG_ERROR, "Error querying the session attributes\n"); + return AVERROR_UNKNOWN; + } + + if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_VA_DISPLAY; + } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_D3D11_DEVICE; + } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) { + handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER; + } else { + av_log(avctx, AV_LOG_ERROR, "Error unsupported handle type\n"); + return AVERROR_UNKNOWN; + } + if (outlink->format == AV_PIX_FMT_QSV) { AVHWFramesContext *out_frames_ctx; AVBufferRef *out_frames_ref = av_hwframe_ctx_alloc(device_ref); @@ -624,9 +644,15 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) out_frames_ctx->width = FFALIGN(outlink->w, 32); out_frames_ctx->height = FFALIGN(outlink->h, 32); out_frames_ctx->sw_format = s->out_sw_format; - out_frames_ctx->initial_pool_size = 64; - if (avctx->extra_hw_frames > 0) - out_frames_ctx->initial_pool_size += avctx->extra_hw_frames; + + if (QSV_RUNTIME_VERSION_ATLEAST(ver, 2, 9) && handle_type != MFX_HANDLE_D3D9_DEVICE_MANAGER) + out_frames_ctx->initial_pool_size = 0; + else { + out_frames_ctx->initial_pool_size = 64; + if (avctx->extra_hw_frames > 0) + out_frames_ctx->initial_pool_size += avctx->extra_hw_frames; + } + out_frames_hwctx->frame_type = s->out_mem_mode; ret = av_hwframe_ctx_init(out_frames_ref); @@ -652,26 +678,6 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) } else s->out_mem_mode = MFX_MEMTYPE_SYSTEM_MEMORY; - /* extract the properties of the "master" session given to us */ - ret = MFXQueryIMPL(device_hwctx->session, &impl); - if (ret == MFX_ERR_NONE) - ret = MFXQueryVersion(device_hwctx->session, &ver); - if (ret != MFX_ERR_NONE) { - av_log(avctx, AV_LOG_ERROR, "Error querying the session attributes\n"); - return AVERROR_UNKNOWN; - } - - if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) { - handle_type = MFX_HANDLE_VA_DISPLAY; - } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) { - handle_type = MFX_HANDLE_D3D11_DEVICE; - } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) { - handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER; - } else { - av_log(avctx, AV_LOG_ERROR, "Error unsupported handle type\n"); - return AVERROR_UNKNOWN; - } - ret = MFXVideoCORE_GetHandle(device_hwctx->session, handle_type, &handle); if (ret < 0) return ff_qsvvpp_print_error(avctx, ret, "Error getting the session handle");