From patchwork Mon Jan 24 08:24:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 33759 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp130399ioh; Mon, 24 Jan 2022 00:26:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9lgKtPTm2QiRLZ1eHrhxM96HTtg5WAW3LAUk11AdHjCuzwNZdbMGbZH6T/+nJ2sGio0hc X-Received: by 2002:a17:906:5048:: with SMTP id e8mr11487487ejk.651.1643012780014; Mon, 24 Jan 2022 00:26:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643012780; cv=none; d=google.com; s=arc-20160816; b=iVL5kt8FIOkMnoRL/FlLCcWzP/+O2LOauD1c7tf69uhSXPlryGqw2Ef8KOEoHH0qbT w309+YJbMEaEvh33IRWTTNMi4lmY8IbWGtfGDnLI/1curOTsWC/WMyR91oop0WVu71R5 1WcFkwVCJGohWp4hWYB8MN9jkeA3SK0J74OOOJuhjsnFv6MldIz+WOD2nhnCrvT5rWxE Eu8LfpGeaMHqp9od+5+uWLwuxn+e91nkFQ3+fhl/6WuL+Ib5oX3UPCE2xM4Ae2tNCzld zODqBPYLywb69c6JucokZAhAWivJTYDKoKfufI7WzgCKlldJ/eOfeCtT1hppHi1Z4Als RMMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=0PJq6M9snmXi3rDWTuEcTgh9gG8Lvf4/YuXLSOOob+Y=; b=BebMv+iKdz2KdMFMJeE8gPtl96jXwECVdWd1KyKYMYN4JvwrxM3DDQGRE2337EYNR1 k9JGgdlHEVElKOivZPxlMrgkqqNH3/trm29NR0xcPPSFQJFQkiA4GR53ShEVWEbZdvlq gIBLUBTEz/LPeqZMbFMH2/CRxbLC+PCPBH4DUJ2DQqOmy1Z0d+IUS1TranZTsiHx6K+I W0K2nqJSM5zw09R7QgOw9Yc+yhkGboYSnX/4c1V3bkNChrnSpvd19/0MtpHldihYXj6i EBsWhidSonCPLnv0J4BTnNcYuB4Zq2XB88/0BlzlRbhwy5GCCteT6Q+F1kK1s7a51sQg 6l/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=gb+0s9E2; 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 z67si3958271ede.475.2022.01.24.00.26.19; Mon, 24 Jan 2022 00:26:20 -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=gb+0s9E2; 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 9B7A168B04D; Mon, 24 Jan 2022 10:26:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E90468AECE for ; Mon, 24 Jan 2022 10:26:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643012772; x=1674548772; h=from:to:cc:subject:date:message-id; bh=MWLUrpIIU92u23IDqGU+CkZ48FMWQwzutAJJH0H/vNk=; b=gb+0s9E2y3AnuKDf9FsWRB1ZqLYwPvkrPXj5efOMIkk+G7n1PgDnYGKy Ag2UGnAbMaE8KLGVddf3SM1uHkBcFDs7QkpAWS2l0XT6adlKzT7pJoXJ1 DzR+So/x/fPAoxgkq63OB/25Q+IA8+FacMTcwpMsEZIbUG/br+ctcCmkF 3dtfUFXlQiBGEevf/HmUd5CbrvJMS5vKgkc3uIIVPXUlmTkvSGgzB31nL ZVsQOZiwq+c1uFQH+8VnKDFUkhj5CXpFtAoSFbCgG194HtLFeKJ0uToXM otGgi0Nr+P2QVYJTt1k2nYMhVsX3F9BDvNNYqWK40N38lMkeTud7lYitf Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10236"; a="245940002" X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="245940002" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2022 00:26:04 -0800 X-IronPort-AV: E=Sophos;i="5.88,311,1635231600"; d="scan'208";a="534128360" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2022 00:26:03 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 16:24:53 +0800 Message-Id: <20220124082455.30931-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/3] lavc/qsv: allow to add more parameter buffers to QSV frame 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZFM0xxoarsYk From: Haihao Xiang Signed-off-by: Haihao Xiang --- v2: rebased the patchset against the latest FFmpeg and added code to make sure the corresponding extra parameter buffer is added for AV1 only. libavcodec/qsv.c | 27 +++++++++++++++++++++++++++ libavcodec/qsv_internal.h | 8 +++++++- libavcodec/qsvdec.c | 8 +++++--- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 9d08485c92..1a432dbd82 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -828,3 +828,30 @@ int ff_qsv_close_internal_session(QSVSession *qs) #endif return 0; } + +void ff_qsv_frame_add_ext_param (AVCodecContext *avctx, QSVFrame *frame, + mfxExtBuffer * param) +{ + int i; + + for (i = 0; i < frame->num_ext_params; i++) { + mfxExtBuffer *ext_buffer = frame->ext_param[i]; + + if (ext_buffer->BufferId == param->BufferId) { + av_log(avctx, AV_LOG_WARNING, "A buffer with the same type has been " + "added\n"); + return; + } + } + + if (frame->num_ext_params < QSV_MAX_FRAME_EXT_PARAMS) { + frame->ext_param[frame->num_ext_params] = param; + frame->num_ext_params++; + frame->surface.Data.NumExtParam = frame->num_ext_params; + } else { + av_log(avctx, AV_LOG_WARNING, "Ignore this extra buffer because do not " + "have enough space\n"); + } + + +} diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index fe9d5319c4..6a38e87d23 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -52,6 +52,8 @@ #define QSV_MAX_ENC_PAYLOAD 2 // # of mfxEncodeCtrl payloads supported +#define QSV_MAX_FRAME_EXT_PARAMS 4 + #define QSV_VERSION_ATLEAST(MAJOR, MINOR) \ (MFX_VERSION_MAJOR > (MAJOR) || \ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR)) @@ -74,7 +76,8 @@ typedef struct QSVFrame { mfxFrameSurface1 surface; mfxEncodeCtrl enc_ctrl; mfxExtDecodedFrameInfo dec_info; - mfxExtBuffer *ext_param; + mfxExtBuffer *ext_param[QSV_MAX_FRAME_EXT_PARAMS]; + int num_ext_params; mfxPayload *payloads[QSV_MAX_ENC_PAYLOAD]; ///< used for enc_ctrl.Payload @@ -138,4 +141,7 @@ int ff_qsv_init_session_frames(AVCodecContext *avctx, mfxSession *session, int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame); +void ff_qsv_frame_add_ext_param(AVCodecContext *avctx, QSVFrame *frame, + mfxExtBuffer *param); + #endif /* AVCODEC_QSV_INTERNAL_H */ diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index d9e0fef1f1..783d252002 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -423,11 +423,13 @@ static int alloc_frame(AVCodecContext *avctx, QSVContext *q, QSVFrame *frame) frame->surface.Data.MemId = &q->frames_ctx.mids[ret]; } - frame->surface.Data.ExtParam = &frame->ext_param; - frame->surface.Data.NumExtParam = 1; - frame->ext_param = (mfxExtBuffer*)&frame->dec_info; + + frame->surface.Data.ExtParam = frame->ext_param; + frame->surface.Data.NumExtParam = 0; + frame->num_ext_params = 0; frame->dec_info.Header.BufferId = MFX_EXTBUFF_DECODED_FRAME_INFO; frame->dec_info.Header.BufferSz = sizeof(frame->dec_info); + ff_qsv_frame_add_ext_param(avctx, frame, (mfxExtBuffer *)&frame->dec_info); frame->used = 1;