From patchwork Thu Aug 18 06:59:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 37343 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp148504pzh; Thu, 18 Aug 2022 00:02:25 -0700 (PDT) X-Google-Smtp-Source: AA6agR52EDXwQRminBTQFRVAp06HEb0jJa3Gvs1l1iHkqKnha56MeTBK11MvZfSymde4JiQhzKoC X-Received: by 2002:a05:6402:2684:b0:43d:9964:d2a0 with SMTP id w4-20020a056402268400b0043d9964d2a0mr1184982edd.250.1660806145709; Thu, 18 Aug 2022 00:02:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660806145; cv=none; d=google.com; s=arc-20160816; b=0yV5Fbp3upggoHinqLsKj77yjHTX59YN4MIftd00F8tWu7daA9XuQMa8VH2FQ64mbS vIk4AlQB/xsoOhhZjHaOaFHAz/GT2gJ+p9dK2b/kCu7Zk2UI/TyYhxml8CMzRbFLergu hJGr3hPha3UBaiR4dND8emOtpdnMYwelZydwiNytgH/XYnr5v+aFQit1mLe2YB54KXv9 fXTtcccG2S+PYu38mPQhjZhph7niJzJwMLePAWJ4qRlzGdEfuPGE4tkfNdnKinwapG92 rPgMNJVkMGjwef+8/RxEgHfZNTIgpeRimPoX5JNsQEjZSr8HfSzS48HeJiYIWLn+HQxH 5Big== 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=KYrsCL2XUNGcIxB2xnb/Z+jGT9BzTJF6ttQ2cpHwfsU=; b=0j/dqfBMbOeuj+6I6/RigEALecrYNDYCqvs9knVUIeKDIiGuNc+cAW1VwSWgW/NjtF UQKJtImE8y2d/h3uEzLphv3FeG7a+XYhh6HkH2MmxfSDN3je0FuWiyF2zmiSTxkY8L04 0KlaKWS2LOEjBTIph46mfaa2rfM+V3Vk/B2Pwa73WST+2lqWwEy8OFHS2Orss9ND6DwQ BCwl9rj98meI4ErahLkk1P0XNUQCsevLCLxo50ksKVYuIuuvs5k93fysrQ06cSRvChsM NeygepHyZ76PRb2y1kGnvz8NPbXvtll2DJ8UfS8RoFORHqGwE/qtyIdENB8REXR0O9uf cHXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=N8HEhEnc; 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 c1-20020a50d641000000b0043dfb97250esi679408edj.456.2022.08.18.00.02.25; Thu, 18 Aug 2022 00:02:25 -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=N8HEhEnc; 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 4B96968B9AC; Thu, 18 Aug 2022 10:01:44 +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 D1A3568B9A3 for ; Thu, 18 Aug 2022 10:01:34 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660806101; x=1692342101; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=U4F2Clh3EpycbFn1AWgzRhnxKoHtUzYVsQeE8GViALg=; b=N8HEhEncPBBtSn+F5wDib4A7cUhXUQZZkW+LK1ezEMAepxLorSAvdoRs 0bdXnT4Y5GIvCBXBeFTo6541IBy8JISRtgKyBamcGcS9rqrVtdlMI+k2n VJ7xDNVUROJyRpLlb9JZ9AR6I0w3OY+4FSW0on1xelYwHwm7iy4fZx+LG BH9MUwLYDjn/vQ7mVhHNUS1jel+5X3ik/vlWHjWIBBnachAryD0Bb9kGJ UFwrNVwi6gqXnbmytDdEsw6lzWY+fZG3u79EikZqoT2uOY2l3D5NMDQg5 TTgjGTORGHIywQJhLgbAWvDmobgdwdqO8hiMNK+fz82kA7E7zG2DjyjzY g==; X-IronPort-AV: E=McAfee;i="6500,9779,10442"; a="378975925" X-IronPort-AV: E=Sophos;i="5.93,245,1654585200"; d="scan'208";a="378975925" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2022 00:01:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,245,1654585200"; d="scan'208";a="604155655" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga007.jf.intel.com with ESMTP; 18 Aug 2022 00:01:13 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Aug 2022 14:59:10 +0800 Message-Id: <20220818065912.158693-4-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220818065912.158693-1-wenbin.chen@intel.com> References: <20220818065912.158693-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] 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: 9G0BsS+AGrEc 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 48fe73fd33..b28b1f7f0b 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 b3820e4fe0..dbb1f49101 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -832,10 +832,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) @@ -1707,6 +1711,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) { @@ -1718,6 +1750,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 fdedae28dd..5a395d422e 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -239,6 +239,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);