From patchwork Tue Oct 18 04:59:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 38767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1932630pzb; Mon, 17 Oct 2022 22:02:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ix/Tivt5ZA2tzNBZlv+NOYCNwlzlu7lG9sjL34ITGNR4OqMY6PZNNX8EkQ+C+rrqea9nt X-Received: by 2002:a05:6402:2b85:b0:457:6216:d251 with SMTP id fj5-20020a0564022b8500b004576216d251mr1009508edb.56.1666069363464; Mon, 17 Oct 2022 22:02:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666069363; cv=none; d=google.com; s=arc-20160816; b=oGLiPur4ItbKSdyNjCIJkr+x2UBq4i97vq67yyw9/MJadUm7PNoPYEpeoDs96/ovDZ PEy0qnh68MGwR+Jz61DKOjZPDbo7ihfr77Np7ofZ1UskfZkIBToEv5YTMrBgGH11lDdE uzmygAaZpN7JPDZRY2AZftZ1Cwi610Mxp4opHnIS7328VsbyC3xECb4ukYtI6Sd58S83 gF/wOkS3+eoUBd//LTYxX+qibIDsti/Za2Wqf1umOGfDhcGLSL+PIuWKdOpx0nxAnnew flECtDnlhumok7TZTJzU+19a7rCQTvVfQezHyvMCwshaq7hjB3fNe1+MnbqrgJ0jx0QE KSMQ== 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=OG4Q/ovEph+c00NyvFPNyAM65Ql2UoBGeQspEl8FWm4=; b=Z6pSmH8mZim4lw2bxn3fOQhsMB0SSH7FYoitBqxWk/tTMn0gY22X0xwcynpkEj7n0f mt3a+fsDsVr8R+rAA8iTOg7oo1gAraZv5HY4dmPo4wLVxLO603jHNMQcBPFisimEbnni fIrLqgsDGeTqXmCYElgfs3Prrvu/VayMMM6f1wBnvI1y+/76oWKImgslwx1vuMywnx5z 8KNiHtEvZQAFxaDmIcSUqOPtQVnhHm3jhoSUmCdVyo9sm6Z9fGyPtIUZcuGyQQiU62lU jEQpmQNDPzUjAQAKWJcqBuF1sTu3y9RdoAjwFnb+14A4GH5ZFa1QxFyFLYzIji/l99sE XEng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="b29tpDI/"; 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 g5-20020a056402090500b00457e6752422si9696933edz.189.2022.10.17.22.02.42; Mon, 17 Oct 2022 22:02:43 -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="b29tpDI/"; 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 A27F668BBBF; Tue, 18 Oct 2022 08:02:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6B7168B32D for ; Tue, 18 Oct 2022 08:02: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=1666069353; x=1697605353; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ckahf7s/1+0gLAPv5RA81luK4xXK9Qr0KOXVNNEJKz0=; b=b29tpDI/OunjA1NGzK4SEnwCwoYgaunW73w6wdpZRQz7Y4QX528JSbHv pocazGxtzeRk7C3uU7Z7Vag0VrobU+jr5tg4pIMJfP4MaCLWpVzagS2a3 Qzb/zf0e53Co6CWOXpfHAaIBkYb2Z0P6OprdxaIxiDGv0ap7SoqrWcDRy x/P5P+PT0T+/gDq5+ZKH+2jK0L3RG4hjQDBymWey7GyhxY3aiT8UKYlPc w+JLxmNsFNZP10oOJGweuHcP4584GLMPQ98ftCUYxMVMy9AI1ohIZ3dJ0 FTY3J9sBty3WfRsUIANSJVHpahyEdycCXNLL8YtvNvKwmo7/rxhbGnXkc Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="286388465" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="286388465" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:19 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="803598095" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="803598095" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:18 -0700 From: haihao.xiang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 12:59:24 +0800 Message-Id: <20221018045925.258081-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018045925.258081-1-haihao.xiang@intel.com> References: <20221018045925.258081-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/qsvenc: enlarge the maximum number of ExtParam buffers on mfxEncodeCtrl 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: 9Id8IlyHpyOk From: Haihao Xiang The next commit and other commits in future will use more ExtParam buffers. And combine 2 free functions into single one Signed-off-by: Haihao Xiang --- libavcodec/qsv_internal.h | 2 +- libavcodec/qsvenc.c | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 768f707ffa..5119ef4dff 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -51,7 +51,7 @@ #define ASYNC_DEPTH_DEFAULT 4 // internal parallelism #define QSV_MAX_ENC_PAYLOAD 2 // # of mfxEncodeCtrl payloads supported -#define QSV_MAX_ENC_EXTPARAM 2 +#define QSV_MAX_ENC_EXTPARAM 8 // # of mfxEncodeCtrl extparam supported #define QSV_MAX_ROI_NUM 256 diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 19fe6e59a2..690a076016 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1434,25 +1434,16 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) return 0; } -static void free_encoder_ctrl_payloads(mfxEncodeCtrl* enc_ctrl) +static void free_encoder_ctrl(mfxEncodeCtrl* enc_ctrl) { if (enc_ctrl) { - int i; - for (i = 0; i < enc_ctrl->NumPayload && i < QSV_MAX_ENC_PAYLOAD; i++) { + for (int i = 0; i < enc_ctrl->NumPayload && i < QSV_MAX_ENC_PAYLOAD; i++) av_freep(&enc_ctrl->Payload[i]); - } - enc_ctrl->NumPayload = 0; - } -} -static void free_encoder_ctrl_extparam(mfxEncodeCtrl* enc_ctrl) -{ - if (enc_ctrl) { - int i; - for (i = 0; i < enc_ctrl->NumExtParam && i < QSV_MAX_ENC_EXTPARAM; i++) { - if (enc_ctrl->ExtParam[i]) - av_freep(&(enc_ctrl->ExtParam[i])); - } + for (int i = 0; i < enc_ctrl->NumExtParam && i < QSV_MAX_ENC_EXTPARAM; i++) + av_freep(&enc_ctrl->ExtParam[i]); + + enc_ctrl->NumPayload = 0; enc_ctrl->NumExtParam = 0; } } @@ -1462,8 +1453,7 @@ static void clear_unused_frames(QSVEncContext *q) QSVFrame *cur = q->work_frames; while (cur) { if (cur->used && !cur->surface.Data.Locked) { - free_encoder_ctrl_payloads(&cur->enc_ctrl); - free_encoder_ctrl_extparam(&cur->enc_ctrl); + free_encoder_ctrl(&cur->enc_ctrl); //do not reuse enc_ctrl from previous frame memset(&cur->enc_ctrl, 0, sizeof(cur->enc_ctrl)); cur->enc_ctrl.Payload = cur->payloads; @@ -2231,8 +2221,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) while (cur) { q->work_frames = cur->next; av_frame_free(&cur->frame); - free_encoder_ctrl_extparam(&cur->enc_ctrl); - free_encoder_ctrl_payloads(&cur->enc_ctrl); + free_encoder_ctrl(&cur->enc_ctrl); av_freep(&cur); cur = q->work_frames; }