From patchwork Thu Jul 14 08:43:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 36791 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp227532pzb; Thu, 14 Jul 2022 01:49:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tkgp+TRKNrfpNuytbf0oGGWTOOAr1WmF/VmA576Z4ZjQJeIY79bRux40VmTCpgl4sR3xr7 X-Received: by 2002:a05:6402:510a:b0:43a:91ff:3f4b with SMTP id m10-20020a056402510a00b0043a91ff3f4bmr10748141edd.187.1657788542118; Thu, 14 Jul 2022 01:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657788542; cv=none; d=google.com; s=arc-20160816; b=HuAgRrN7tcQjQpOUBuEc7+p3YuXx4ulsfL4cIqny39+40DpexqJWisL8zt1IdAey2r NrDVTF7zRm+aCEUEl1Pkxzd8tAdrk8lCPgcRCCUTYX7Nh/i0o4laftxhD6tVmrUBMOHs 2Yiloi4S8EIHEijbziY+UosbLE8p296kbjqsmMx/CZ4HifqfT70zKQ8F8sFY8Gx7gJuq 9XgSro5Ak2S0CrpU+MBz4gbktA5QsFHMnujp7uogGQTXA46KiG9BwJWsoEwTmvF1fG+O icwUna6zqTQnOr25MnGaBWgrE37ti4LiRnEHWL7fd5AVtiKpQ+TVh0zFs+ZPnVr5vjM3 Kfag== 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=sgDLdlZ8rcYp41rHWObHxQue8keRV+ZZzxaM5oQGnPA=; b=U8J+lFh4xnnMVbJ697flvkktsYu3yc2Qi5YhNVb2lf2krw1fe15KGT5byaZr4YU024 cOk2XTRqYA68uLIUDMyPRY2GHZeMit3SejIzXKNHqM6z4OHW4yklEquNY8vqSNGbmgDQ FUsXOEdkE0u/9DQlOCOilPBH2TE5ijWsn0pkkbVZLIDWvE0ScA29aTK69JZsOvR09CKz rqvs6nEphGi10LGV03Kps+00kkqmEjIzBKJB8TRWXM4BJv2w2ND8Ve1lnoKgki7++ck3 7CDW1rlFgnoQDu2ulbOm3AGB9XUvG3gROsIrqcAOboTWKuVAEeaJvtsOs43Hvl6/YADP MKNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Q2Ez8EhQ; 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 jo25-20020a170906f6d900b0072ed0d06c0csi1278314ejb.411.2022.07.14.01.49.01; Thu, 14 Jul 2022 01:49:02 -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=Q2Ez8EhQ; 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 D19F468BA15; Thu, 14 Jul 2022 11:48:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF32668B76A for ; Thu, 14 Jul 2022 11:48:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657788537; x=1689324537; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=VcURFoJUP5o5Pftwj0OCVHJfyRuUnHvcF76uoI0Qf70=; b=Q2Ez8EhQYtHBB1jOYqR7r0gmtcgpADMki0NOt5Unu+B67LNtM2yePLic s4BIzuQwlSnhtgvOaJ75do4RM9U0NDKV4gezwHhdFBrIn128OyO/dXbgF JIf22YVFTV9wRk3ea7mv6A0Pq7O+dKNvq+JhFYVrdpfL0OSor8fXBxx39 JUlX9i9ukd3N1pkjqjWXqKAtrzcTYxl+bn/zZMRO+G9ErnGAX0VzNqx1R DG307InDs4T6Hno6648h2zIZg0x4NFrJHSgZhKm+Lo87MhD71vM0JtP6R sH9BF+5W5XFAPdG6mdBoJy0DS4XXNtPK9AxF3u3Mn0K0prvVV6BF1BPLN w==; X-IronPort-AV: E=McAfee;i="6400,9594,10407"; a="371768204" X-IronPort-AV: E=Sophos;i="5.92,269,1650956400"; d="scan'208";a="371768204" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 01:48:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,269,1650956400"; d="scan'208";a="842072001" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga006.fm.intel.com with ESMTP; 14 Jul 2022 01:48:45 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Jul 2022 16:43:25 +0800 Message-Id: <20220714084325.362855-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: VcZUET7CRi1x 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. Because q->param is passed to both "in" and "out" parameters when call MFXVideoENCODE_Query(), the value in q->param may be changed. New variables are added to store old configuration, so that we can detect real parameter change. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 9 +++++--- libavcodec/qsvenc.c | 50 ++++++++++++++++++++++----------------------- libavcodec/qsvenc.h | 6 ++++++ 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 02a91ffe96..6d73f74196 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3337,10 +3337,13 @@ 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} +@item @var{i_quant_factor} +@item @var{i_quant_offset} +@item @var{b_quant_factor} +@item @var{b_quant_offset} 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 these 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..c817577c23 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -738,6 +738,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.QPI = av_clip(quant * fabs(avctx->i_quant_factor) + avctx->i_quant_offset, 0, 51); q->param.mfx.QPP = av_clip(quant, 0, 51); q->param.mfx.QPB = av_clip(quant * fabs(avctx->b_quant_factor) + avctx->b_quant_offset, 0, 51); + q->old_global_quality = avctx->global_quality; + q->old_i_quant_factor = avctx->i_quant_factor; + q->old_i_quant_offset = avctx->i_quant_offset; + q->old_b_quant_factor = avctx->b_quant_factor; + q->old_b_quant_offset = avctx->b_quant_offset; break; #if QSV_HAVE_AVBR @@ -1621,38 +1626,31 @@ static int set_roi_encode_ctrl(AVCodecContext *avctx, const AVFrame *frame, return 0; } -static int update_qp(AVCodecContext *avctx, QSVEncContext *q, - const AVFrame *frame) +static int update_qp(AVCodecContext *avctx, QSVEncContext *q) { - int updated = 0, qp = 0, new_qp; - char *tail; - AVDictionaryEntry *entry = NULL; + int updated = 0, new_qp = 0; 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"); + if (q->param.mfx.RateControlMethod == MFX_RATECONTROL_CQP) { + UPDATE_PARAM(q->old_global_quality, avctx->global_quality); + UPDATE_PARAM(q->old_i_quant_factor, avctx->i_quant_factor); + UPDATE_PARAM(q->old_i_quant_offset, avctx->i_quant_offset); + UPDATE_PARAM(q->old_b_quant_factor, avctx->b_quant_factor); + UPDATE_PARAM(q->old_b_quant_offset, avctx->b_quant_offset); + if (!updated) 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); - 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); + + new_qp = avctx->global_quality / FF_QP2LAMBDA; + q->param.mfx.QPI = av_clip(new_qp * fabs(avctx->i_quant_factor) + + avctx->i_quant_offset, 0, 51); + q->param.mfx.QPP = av_clip(new_qp, 0, 51); + q->param.mfx.QPB = av_clip(new_qp * fabs(avctx->b_quant_factor) + + avctx->b_quant_offset, 0, 51); 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); + "Reset qp = %d/%d/%d for idr/p/b frames\n", + q->param.mfx.QPI, q->param.mfx.QPP, q->param.mfx.QPB); } return updated; } @@ -1665,7 +1663,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, if (!frame) return 0; - needReset = update_qp(avctx, q, frame); + needReset = update_qp(avctx, q); if (!needReset) return 0; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index b754ac4b56..bffe957526 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -224,6 +224,12 @@ typedef struct QSVEncContext { int min_qp_p; int max_qp_b; int min_qp_b; + // These are used for qp reset + int old_global_quality; + float old_i_quant_factor; + float old_i_quant_offset; + float old_b_quant_factor; + float old_b_quant_offset; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);