From patchwork Wed Dec 20 07:10:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 45257 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5184:b0:194:e134:edd4 with SMTP id j4csp44158pzf; Tue, 19 Dec 2023 23:13:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IENYGK24i/SRNKjQgI0tzB/uFh/zbepLhSIZPItBXTyxVOx5W+dPgb+dzX1XPCQY6fdoGv3 X-Received: by 2002:a05:651c:504:b0:2cc:76c4:e7ce with SMTP id o4-20020a05651c050400b002cc76c4e7cemr2206855ljp.67.1703056382476; Tue, 19 Dec 2023 23:13:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703056382; cv=none; d=google.com; s=arc-20160816; b=CSZub4NtRROPY4t5ErxB5c2jlab5cd6uNPxDjN4YEcB413AqfAE/jDUdv04pcEHYLi 1l5L5VDr4E5Iuawlte7xz00JjxZaKnEBqwjid1i8wUYDOfQ1ZH5sbhjFSrV9nyrB4LYo jVJeWgqWipBSrlqzc0czvGZrRf7Yan9C7jBMUUr4A1aoi5YvoWWfHgGNWVl4EFD0mHNm h3uUvptr3v70VCoR5BngECXdY23D6UK+4SUJB1RDoZg21IayjnzFGS2e+hEnuPnU+DyA bBzM8o/+uNOp2lpqwBs93ehj1ip0tjJzsG562IwITeAvbbOOKRbyTg/yyX78WzV6vqHe mj6Q== 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=GePHf14e/T9F9WQxHvVPhWlPeY+4g6mlhy6/BR6fHEs=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=PW7ly5Aenuwu+aZNxEZCrXaWh+/q5AMzw6e/S1YCwnkKScYfIAqNhmqHrckA/kX6HN IaSpiZjCwNdCXyClJ3peCJFe5a+7K/9SMtwDVgpXixmnldoI/K/McIiJ7xuPPCwz2hQq +4ZcTnkd6L7Dz1qZD2RWU14HIEZxNuCilNW8s0ntQTsB+gIvuP0C5LG9ppP5VlLQbkdy FTTJPXfdFVykIXC859rydq+z1+UbYoMK/3i2QUEppiq3O/jS+Yyf8YkzMep1pfU05qTC +Mqf/IQEiJwcwKfDE/phA6lrRxVNDYyM8Ej7A4/YCqO8KNfS1dMXpY5h8UEExMQhFYbd L1yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LMyD5iII; 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 cq8-20020a056402220800b00553add301f5si804178edb.145.2023.12.19.23.13.01; Tue, 19 Dec 2023 23:13:02 -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=LMyD5iII; 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 6E91E68D1EB; Wed, 20 Dec 2023 09:11:34 +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 2F84368D1A8 for ; Wed, 20 Dec 2023 09:11:22 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703056288; x=1734592288; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5cQjLBAlSvLI9IyT6Iof7dgntDZXl8uWjbasQDB4RaQ=; b=LMyD5iII0BZPAPXScElHUShcUQYrjnNneu6C7iPojl6XA9+56YrpsAtZ O1UhVD7ZH17a7QV141ZoxHFnKgNBFFEuDyuUSwUw0XPFj8CB+yQOgWhIk QjELVOszqc5tlOgDAry7nLIeVIYDltzrW/gX3oho8vv5T/IqrCDFSDXUc OXzRaBSkvoBGtOhXVHrgsX/pgFrCG44RKMdWqiZIMiZNPBAxI44nnnxRq JlTssNT0PUCNQVclAgRlHhTuKYyNc6arM8feMFc3n+Bs1UtDAwsVAq+AL NmkgcKSVW3QPBNGyKh+8WiCZrpa1Tc2ySOdFVTG/xFQeWUrSVNJq3xO/L g==; X-IronPort-AV: E=McAfee;i="6600,9927,10929"; a="426921044" X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="426921044" 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:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="18191830" 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:14 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Dec 2023 15:10:45 +0800 Message-Id: <20231220071050.3175819-7-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 07/12] lavc/qsvdec: require a dynamic frame pool 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: SuOOHYqndyJY From: Haihao Xiang This allows a downstream element stores more frames from qsv decoders and fixes error in get_buffer() $ ffmpeg -hwaccel qsv -hwaccel_output_format qsv -i input.mp4 -vf reverse -f null - [vist#0:0/h264 @ 0x562248f12c50] Decoding error: Cannot allocate memory [h264_qsv @ 0x562248f66b10] get_buffer() failed Signed-off-by: Haihao Xiang --- libavcodec/qsvdec.c | 57 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 559f63698a..3895b3a168 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -42,6 +42,7 @@ #include "libavutil/imgutils.h" #include "libavutil/film_grain_params.h" #include "libavutil/mastering_display_metadata.h" +#include "libavutil/avassert.h" #include "avcodec.h" #include "codec_internal.h" @@ -67,6 +68,8 @@ static const AVRational mfx_tb = { 1, 90000 }; AV_NOPTS_VALUE : pts_tb.num ? \ av_rescale_q(mfx_pts, mfx_tb, pts_tb) : mfx_pts) +#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) + typedef struct QSVAsyncFrame { mfxSyncPoint *sync; QSVFrame *frame; @@ -76,6 +79,7 @@ typedef struct QSVContext { // the session used for decoding mfxSession session; mfxVersion ver; + mfxHandleType handle_type; // the session we allocated internally, in case the caller did not provide // one @@ -182,6 +186,7 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses AVBufferRef *hw_frames_ref, AVBufferRef *hw_device_ref) { int ret; + mfxIMPL impl; if (q->gpu_copy == MFX_GPUCOPY_ON && !(q->iopattern & MFX_IOPATTERN_OUT_SYSTEM_MEMORY)) { @@ -239,27 +244,52 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses q->session = q->internal_qs.session; } - if (MFXQueryVersion(q->session, &q->ver) != MFX_ERR_NONE) { - av_log(avctx, AV_LOG_ERROR, "Error querying the session version. \n"); - q->session = NULL; + if (MFXQueryIMPL(q->session, &impl) == MFX_ERR_NONE) { + switch (MFX_IMPL_VIA_MASK(impl)) { + case MFX_IMPL_VIA_VAAPI: + q->handle_type = MFX_HANDLE_VA_DISPLAY; + break; - if (q->internal_qs.session) { - MFXClose(q->internal_qs.session); - q->internal_qs.session = NULL; - } + case MFX_IMPL_VIA_D3D11: + q->handle_type = MFX_HANDLE_D3D11_DEVICE; + break; + + case MFX_IMPL_VIA_D3D9: + q->handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER; + break; - if (q->internal_qs.loader) { - MFXUnload(q->internal_qs.loader); - q->internal_qs.loader = NULL; + default: + av_assert0(!"should not reach here"); } + } else { + av_log(avctx, AV_LOG_ERROR, "Error querying the implementation. \n"); + goto fail; + } - return AVERROR_EXTERNAL; + if (MFXQueryVersion(q->session, &q->ver) != MFX_ERR_NONE) { + av_log(avctx, AV_LOG_ERROR, "Error querying the session version. \n"); + goto fail; } /* make sure the decoder is uninitialized */ MFXVideoDECODE_Close(q->session); return 0; + +fail: + q->session = NULL; + + if (q->internal_qs.session) { + MFXClose(q->internal_qs.session); + q->internal_qs.session = NULL; + } + + if (q->internal_qs.loader) { + MFXUnload(q->internal_qs.loader); + q->internal_qs.loader = NULL; + } + + return AVERROR_EXTERNAL; } static int qsv_decode_preinit(AVCodecContext *avctx, QSVContext *q, enum AVPixelFormat pix_fmt, mfxVideoParam *param) @@ -309,7 +339,10 @@ static int qsv_decode_preinit(AVCodecContext *avctx, QSVContext *q, enum AVPixel hwframes_ctx->height = FFALIGN(avctx->coded_height, 32); hwframes_ctx->format = AV_PIX_FMT_QSV; hwframes_ctx->sw_format = avctx->sw_pix_fmt; - hwframes_ctx->initial_pool_size = q->suggest_pool_size + 16 + avctx->extra_hw_frames; + if (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 2, 9) && q->handle_type != MFX_HANDLE_D3D9_DEVICE_MANAGER) + hwframes_ctx->initial_pool_size = 0; + else + hwframes_ctx->initial_pool_size = q->suggest_pool_size + 16 + avctx->extra_hw_frames; frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET; ret = av_hwframe_ctx_init(avctx->hw_frames_ctx);