From patchwork Wed Jul 6 09:14:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 36692 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp4048148pzh; Wed, 6 Jul 2022 02:20:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1snNJWmHWv1WK+6BoAvMuupqwBsw93VeBQLYeBiw9QteoRZNDuVLl+eXMXiIgBbdZTL7DS/ X-Received: by 2002:a17:906:70c8:b0:726:2b17:7b24 with SMTP id g8-20020a17090670c800b007262b177b24mr37622430ejk.333.1657099217407; Wed, 06 Jul 2022 02:20:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657099217; cv=none; d=google.com; s=arc-20160816; b=WM81jtJP/wYj1/Qieosow5MkoW9f3PSpmteT5yIYQIJ2Cm9oqiAExv9HLE8oMCg2Fu AS7ErKK5f4id6aYaiKtVP9L93+xIBjGugo2XBYCX8LHaJrJ1G5lJpF7ispiJqEFve/Gh 7cQnjJ3JnDssdux7Q5yGXdDJgvwHQtkPr2wtETc6B0bft/lReT9seAFZ3A9AJtIi4jKZ +aEwrRm6qtqed/4P0pKJvp6c7IAZH9ATWn7forq29PxRxUUOCs+eyczIB/YP62MSUUzR k1B0Fo9UzpQWbYCpiXJnfSqAhYtwsHPHwEa5aHrkzmvFpXVelFvDnfGWazlwHvIgbtFP fIbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=vTL83HLoRfoNq90uiWlL8sdQoBsFKMM5OQoHwOasnWQ=; b=VaS1mt3W/RqDprcBwjOsbCM5ySYPJVwEAFjo10DrjO6UgPMAxgY45sGOmgbix2TRBa LJ24I09wE/XZyGlic7tmnwJiQVq6T+gN6Qb+6fbpikL1jrVXvjA011TEefTIZCxSsjyb eoCLfuC85MHn0i5OEgx43+SebESanMdgV7+0s/PKUzGlrCBYKWxBO6CjJXHgx8r1m55a u3ls9xkdz7y4aLjIF3/llPMvcp+crxLSJSOAqspbixYc3R4wb206GZ3pME8Z/BrU/KUD 0XIYnFLL66jGTvE/Cf87JHb7zlb/kyMUF+5HKtITsrq8pEy7nsh7nZuGD0jaqpX+ORRN 16Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=OOo4VazA; 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 u23-20020a1709060b1700b00702d7a823casi26361874ejg.317.2022.07.06.02.20.16; Wed, 06 Jul 2022 02:20:17 -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=OOo4VazA; 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 5E72F68BA6A; Wed, 6 Jul 2022 12:20:12 +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 F0DFD68B704 for ; Wed, 6 Jul 2022 12:20:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657099210; x=1688635210; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=CCZZwz48b3m0tDuiyPtboyV3r4/3+wUc3ELRxvyukmU=; b=OOo4VazAIpL/MXGCkQVTcbdfWVk/cLd9zMigAft7TRIMZ4CAq8aKMylB BSLMzVnamWuA72qJ14VV3rgKdXveIU2SYHVmPl0iPkwpC3t53CllU+nBo W47gzLHHge6Mn9XC7Bk0DpyJwwOx+XVp1cBN/gwuGg2j/u2Ps0VAJJHhd QBXAcFgX0k1Aa4dY8wVdDOlJWTdmMrDWwPZ0DzC6UwNUbKF+nEOyXYfCK 84OjSQiXtUkY84/xdO/Tw65sU6/ci4Yr2f969l3FBXoR1DhWuE0Yr+5ya 6rZlJl4ns0LSajwxPkuCbagJjErO/Ah3O+piBdH3aX6KaVNiS+AlborXu A==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="264111127" X-IronPort-AV: E=Sophos;i="5.92,249,1650956400"; d="scan'208";a="264111127" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2022 02:20:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,249,1650956400"; d="scan'208";a="920087697" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga005.fm.intel.com with ESMTP; 06 Jul 2022 02:20:01 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jul 2022 17:14:40 +0800 Message-Id: <20220706091440.57627-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/qsvenc: Use parameter from AVCodecContext to reset qsv codec 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OfuD3FCmeYCK Using parameter from AVCodecContext to reset qsv codec is more suitable for MFXVideoENCODE_Reset()'s usage. Per-frame metadata is more suitable for the usage of mfxEncodeCtrl being passed to MFXVideoENCODE_EncodeFrameAsync(). Now change it to use the value from AVCodecContext. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 5 ++--- libavcodec/qsvenc.c | 26 ++++++++------------------ 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 02a91ffe96..bf5fafd3fe 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3337,10 +3337,9 @@ For encoders set this flag to ON to reduce power consumption and GPU usage. Following options can be used durning qsv encoding. @table @option -@item @var{qsv_config_qp} +@item @var{global_quality} Supported in h264_qsv and hevc_qsv. -This option can be set in per-frame metadata. QP parameter can be dynamically -changed when encoding in CQP mode. +Change this value to reset qsv codec's qp configuration. @end table @subsection H264 options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2382c2f5f7..82cb5a4865 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1625,34 +1625,24 @@ static int update_qp(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { int updated = 0, qp = 0, new_qp; - char *tail; - AVDictionaryEntry *entry = NULL; if (avctx->codec_id != AV_CODEC_ID_H264 && avctx->codec_id != AV_CODEC_ID_HEVC) return 0; - entry = av_dict_get(frame->metadata, "qsv_config_qp", NULL, 0); - if (entry && q->param.mfx.RateControlMethod == MFX_RATECONTROL_CQP) { - qp = strtol(entry->value, &tail, 10); - if (*tail) { - av_log(avctx, AV_LOG_WARNING, "Invalid qsv_config_qp string. Ignore this metadata\n"); - return 0; - } - if (qp < 0 || qp > 51) { - av_log(avctx, AV_LOG_WARNING, "Invalid qp, clip to 0 ~ 51\n"); - qp = av_clip(qp, 0, 51); - } - av_log(avctx, AV_LOG_DEBUG, "Configure qp: %d\n",qp); - UPDATE_PARAM(q->param.mfx.QPP, qp); + if (q->param.mfx.RateControlMethod == MFX_RATECONTROL_CQP) { + qp = avctx->global_quality / FF_QP2LAMBDA; + new_qp = av_clip(qp, 0, 51); + UPDATE_PARAM(q->param.mfx.QPP, new_qp); new_qp = av_clip(qp * fabs(avctx->i_quant_factor) + avctx->i_quant_offset, 0, 51); UPDATE_PARAM(q->param.mfx.QPI, new_qp); new_qp = av_clip(qp * fabs(avctx->b_quant_factor) + avctx->b_quant_offset, 0, 51); UPDATE_PARAM(q->param.mfx.QPB, new_qp); - av_log(avctx, AV_LOG_DEBUG, - "using fixed qp = %d/%d/%d for idr/p/b frames\n", - q->param.mfx.QPI, q->param.mfx.QPP, q->param.mfx.QPB); + if (updated) + av_log(avctx, AV_LOG_DEBUG, + "using fixed qp = %d/%d/%d for idr/p/b frames\n", + q->param.mfx.QPI, q->param.mfx.QPP, q->param.mfx.QPB); } return updated; }