From patchwork Tue Sep 6 09:22:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 37693 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3135793pzh; Tue, 6 Sep 2022 02:25:52 -0700 (PDT) X-Google-Smtp-Source: AA6agR5xh6JsgF4zIxY6D5swMuIB3O2ZT4v+dNB+FiKvUQw7BYZB7PT2qZWFcdQPEDFTh985CJ/2 X-Received: by 2002:a05:6402:516f:b0:44e:9151:d54b with SMTP id d15-20020a056402516f00b0044e9151d54bmr6371423ede.241.1662456352110; Tue, 06 Sep 2022 02:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662456352; cv=none; d=google.com; s=arc-20160816; b=r7bbiDegM1zbjrAnfIvUmSX8Hill94zrTRYkYwqwH56XcVZX7ZhcvRn5HpVvkHk+B2 gm5lbQlSS5IEx+P8NpaXnL+cwWenI+8Xp3JLntglbnEIlYuJHIF3zZuepI3qe+G/Houk R+AgvT6MZr0PXXBCXBBjMEAroKhItR0GCLDwXzhlHOOkE9OfCcUGeSOc/LnFxSy0q2aB DTiD9zdZo3tQsnWvVxPFaY/ewb0kRREbqQ9Xk6m5iZ4nwD8aqJ4VNjAlb464NT45fbIQ +U4Y0ZVH5BRfYP3LextR2Fdy7F794O02cDNrSf9eCygGb3hcfhHHN9sXghrO2xthk1ZY Mdnw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=mzN+M1ALt0vPUTCpMfZRS/CGFveiUPTass+2ggbEPB0=; b=tS9VAykVBLEaDupxwQNWx9Skj6EIUkjWND669paz20pjxqCccYzKeiee5YZre3prZ7 3QEyBWWayWfGdL5UC+A5JhFu+DZwkhxorV2WJhYg2DVu102yslLnccTX8Eixb+0VWgKG QhqUuxdoTbkuZ6AHbqckbX1yNlHU+Y8jzNB4J4LjQGiQh+GDzfYgQOkR6Upcu34yutaz /03aw2RhU3xYwvcLrsNUSsKh9m9mz8WRhh9EwFPazUyHX9RXJ5Exd5ouTRht1Lc/cgsg ARC84MCIw7kpVW821G0gGfxhz0O5VE8slcfhCivOk1+J+SgBADnXwx1igdYrnmsCuGJk a2qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bRbpOx41; 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 z8-20020a1709060f0800b0073d74bcac8dsi8437795eji.513.2022.09.06.02.25.50; Tue, 06 Sep 2022 02:25:52 -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=bRbpOx41; 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 386BB68BAD5; Tue, 6 Sep 2022 12:25:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C8FC68BABA for ; Tue, 6 Sep 2022 12:25:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662456311; x=1693992311; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Dm6iyAbMXlogXiO6kvVaILWG04BIVyKPE/GXfloc6Yc=; b=bRbpOx418S07Q8bPhN4TsklCkum905H9JG2Gjvm6m4NG+Gus7VxyRyTR t5MXXbj0Jngeh8rGrmOE+e4eyax9To5BvWuOP4u6fmQqsNa5oK0yyTLdB GKn3ePzEH2ROk06KpseOPGB2CekoY3qa0J+EaGG8n+y9vpkt7QXMkX+ke SU8lGOLjpR7lyRb/UrRcKS5rN8I/LOtgxzj5upzsSYdTVSrXFYtK0UO2z +wWT2m6M7K70m6/EvSdp6XgSvrFdp7+tMKM3RMdQIyea7pSA0MLx13Pc4 uEB8kjnUoPKvp0AEGXsvpHpqlfIyEYXkxEYMHs/hHSdnUzImRD0Pk30uj w==; X-IronPort-AV: E=McAfee;i="6500,9779,10461"; a="322720557" X-IronPort-AV: E=Sophos;i="5.93,293,1654585200"; d="scan'208";a="322720557" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 02:24:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,293,1654585200"; d="scan'208";a="565028246" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga003.jf.intel.com with ESMTP; 06 Sep 2022 02:24:59 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2022 17:22:56 +0800 Message-Id: <20220906092258.994742-5-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220906092258.994742-1-wenbin.chen@intel.com> References: <20220906092258.994742-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/7] libavcodec/qsvenc: Add intra refresh reset support to qsvenc 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: DXy5Bw9AOhct Signed-off-by: Wenbin Chen --- doc/encoders.texi | 7 +++++++ libavcodec/qsvenc.c | 33 +++++++++++++++++++++++++++++++++ libavcodec/qsvenc.h | 5 +++++ 3 files changed, 45 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index d5d695d39c..da56159858 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3351,6 +3351,13 @@ Change this value to reset qsv codec's MaxFrameSize configuration. @item @var{gop_size} Change this value to reset qsv codec's gop configuration. + +@item @var{int_ref_type} +@item @var{int_ref_cycle_size} +@item @var{int_ref_qp_delta} +@item @var{int_ref_cycle_dist} +Supported in h264_qsv and hevc_qsv. +Change these value to reset qsv codec's Intra Refresh configuration. @end table @subsection H264 options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 9a0431630a..cd0549b249 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -828,10 +828,13 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->old_max_frame_size = q->max_frame_size; if (q->int_ref_type >= 0) q->extco2.IntRefType = q->int_ref_type; + q->old_int_ref_type = q->int_ref_type; if (q->int_ref_cycle_size >= 0) q->extco2.IntRefCycleSize = q->int_ref_cycle_size; + q->old_int_ref_cycle_size = q->int_ref_cycle_size; if (q->int_ref_qp_delta != INT16_MIN) q->extco2.IntRefQPDelta = q->int_ref_qp_delta; + q->old_int_ref_qp_delta = q->int_ref_qp_delta; if (q->max_slice_size >= 0) q->extco2.MaxSliceSize = q->max_slice_size; q->extco2.DisableDeblockingIdc = q->dblk_idc; @@ -920,6 +923,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) } if (q->int_ref_cycle_dist >= 0) q->extco3.IntRefCycleDist = q->int_ref_cycle_dist; + q->old_int_ref_cycle_dist = q->int_ref_cycle_dist; if (q->low_delay_brc >= 0) q->extco3.LowDelayBRC = q->low_delay_brc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (q->max_frame_size_i >= 0) @@ -1709,6 +1713,34 @@ static int update_gop_size(AVCodecContext *avctx, QSVEncContext *q) return updated; } +static int update_rir(AVCodecContext *avctx, QSVEncContext *q) +{ + int updated = 0; + + if (avctx->codec_id != AV_CODEC_ID_H264 && avctx->codec_id != AV_CODEC_ID_HEVC) + return 0; + + UPDATE_PARAM(q->old_int_ref_type, q->int_ref_type); + UPDATE_PARAM(q->old_int_ref_cycle_size, q->int_ref_cycle_size); + UPDATE_PARAM(q->old_int_ref_qp_delta, q->int_ref_qp_delta); + UPDATE_PARAM(q->old_int_ref_cycle_dist, q->int_ref_cycle_dist); + if (!updated) + return 0; + + q->extco2.IntRefType = FFMAX(0, q->int_ref_type); + q->extco2.IntRefCycleSize = FFMAX(0, q->int_ref_cycle_size); + q->extco2.IntRefQPDelta = + q->int_ref_qp_delta != INT16_MIN ? q->int_ref_qp_delta : 0; + q->extco3.IntRefCycleDist = FFMAX(0, q->int_ref_cycle_dist); + av_log(avctx, AV_LOG_DEBUG, + "Reset IntRefType: %d; IntRefCycleSize: %d; " + "IntRefQPDelta: %d; IntRefCycleDist: %d\n", + q->extco2.IntRefType, q->extco2.IntRefCycleSize, + q->extco2.IntRefQPDelta, q->extco3.IntRefCycleDist); + + return updated; +} + static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1720,6 +1752,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, needReset = update_qp(avctx, q); needReset |= update_max_frame_size(avctx, q); needReset |= update_gop_size(avctx, q); + needReset |= update_rir(avctx, q); if (!needReset) return 0; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 5f6955a3a7..2eada6ab26 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -253,6 +253,11 @@ typedef struct QSVEncContext { int old_max_frame_size; // This is used for gop reset int old_gop_size; + // These are used for intra refresh reset + int old_int_ref_type; + int old_int_ref_cycle_size; + int old_int_ref_qp_delta; + int old_int_ref_cycle_dist; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);