From patchwork Fri Sep 23 02:44:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 38192 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp157140pzh; Thu, 22 Sep 2022 19:48:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4d5FYMhgcJlZ8cSW1WD2fp9kAB1vcqNlaK6fShxXUcqxrsuGH5x2omD+QXj1giPhE/8CY3 X-Received: by 2002:a17:907:7d8b:b0:781:cfa4:5058 with SMTP id oz11-20020a1709077d8b00b00781cfa45058mr5240103ejc.15.1663901314564; Thu, 22 Sep 2022 19:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663901314; cv=none; d=google.com; s=arc-20160816; b=rY2gNwa6sqbc8XoBSbrF2X7t3cQw5JwZng7KiN3xRQ11Co3R8ODl4VZFeMLJdQ0iAX PbnaveCz8KDzYZMNmab3WMxzh/IoGD2QfN15yLl74ZWNiGc9ua7L3RfnD4JuxyPuTTNq yKgVRW4eRf1tTA66RkMKobXtPsIBQH14RXIcFgCKzobIMedZiTNk3F1THrtA/fmf1RF5 EFRbvgbjc5hC4EphNZwBuOQ9PQF3QVY2slshVS4U21CJQ95gx8Uu31kwSmGP8N/2lSYR 50SITUETOvv7dfebNWGVQhBPapWwgB6DXc1F0WdyCP5jQKXrA1cJX4o7Du+9Brmq7dD2 hpMQ== 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=Z1Mxx6WZTVyO0UIjiAQvjFApc+qJOBXHhRilaEHRHVY=; b=T6NC+06dJDYIcM43oZ0LVH/sjEwIRzb+3b8AYQNXk5b7uvchkB0DLcCw8pV4NMDN9j L25VRio76xmk+ddXoAkKRvhW0EoY/xqtxtpZsVKCHwXerI68jAhUzjgtJej4BRsg+2/z 2DS/MNqe91RC6GsSp8Pn0mecWRXZpHkHIuWn3hGf94KQW5NwkiMtuOwBOqMyzXas+5i0 ahk68HD+osI9Oic4tYH3pqa6kq8z4eJ7PRcUKlt6GiGaBF0Ic+bwgFH9njTJ6Ug1ic4a ERnlx7bH/6ZUp+Fk7PheJSpkwtBX4wQ0oedOFlq9wBoI39VDxzX5F5dhwH5m/7+VYcu1 d8dQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Q+0ZUeRs; 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 ga10-20020a1709070c0a00b0078209ff9896si7039527ejc.509.2022.09.22.19.48.34; Thu, 22 Sep 2022 19:48:34 -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=Q+0ZUeRs; 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 8B7EA68B711; Fri, 23 Sep 2022 05:48:14 +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 4365D68BAA3 for ; Fri, 23 Sep 2022 05:48:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663901292; x=1695437292; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=tLzcM9NZDnMkjNcXKeLbpApZ1//2bExGGM3Mao2Qen4=; b=Q+0ZUeRsmuEfB13yjGwLJMgDxB/TDN0SI5g5urGEmy1PTjUnEO0mTYAQ UtzG3oV3vBLEB1ONuTaj7/+tavKFMw34GR4GEVVej9GpwHpgvk955XKIR qbcC/vxY52UnWLJv6jnhdoSigD2lrKYLTQT7hWs29uPV5t77WSB7auvsu rbWr3Y0qYCHG93QZd2hYGbgU0/vqDRu+d9SBOQHEJbcp7mmXCi6xTHdUi 9to8WOqoU2EcHjSGmGm/MjvrpbVK0nH9A4X6Q2n6Gq+1IQXjhYGy/KqlL KMnBy72XMYjmNXzLQYbdCsPZP82Yu31JajyWafi6WEizjCbL3sDWOFgCf g==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="386782567" X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="386782567" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2022 19:47:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="948858463" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga005.fm.intel.com with ESMTP; 22 Sep 2022 19:47:57 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Sep 2022 10:44:12 +0800 Message-Id: <20220923024412.5671-3-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220923024412.5671-1-wenbin.chen@intel.com> References: <20220923024412.5671-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] libavcodec/qsvenc: Add pic_timing_sei reset support to qsv 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: PgG79UWiblwG Signed-off-by: Wenbin Chen --- doc/encoders.texi | 4 ++++ libavcodec/qsvenc.c | 21 +++++++++++++++++++++ libavcodec/qsvenc.h | 2 ++ 3 files changed, 27 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 2b6412dbec..741d545ea1 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3369,6 +3369,10 @@ Change this value to reset qsv codec's framerate configuration. @item @var{rc_initial_buffer_occupancy} @item @var{rc_max_rate} Change these value to reset qsv codec's bitrate control configuration. + +@item @var{pic_timing_sei} +Supported in h264_qsv and hevc_qsv. +Change this value to reset qsv codec's pic_timing_sei configuration. @end table @subsection H264 options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3371711872..c1a601f0b3 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -784,6 +784,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco.PicTimingSEI = q->pic_timing_sei ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; + q->old_pic_timing_sei = q->pic_timing_sei; if (q->rdo >= 0) q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; @@ -1900,6 +1901,25 @@ static int update_bitrate(AVCodecContext *avctx, QSVEncContext *q) return updated; } +static int update_pic_timing_sei(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_pic_timing_sei, q->pic_timing_sei); + if (!updated) + return 0; + + q->extco.PicTimingSEI = q->pic_timing_sei ? + MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; + av_log(avctx, AV_LOG_DEBUG, "Reset PicTimingSEI: %s\n", + print_threestate(q->extco.PicTimingSEI)); + + return updated; +} + static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1915,6 +1935,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, needReset |= update_low_delay_brc(avctx, q); needReset |= update_frame_rate(avctx, q); needReset |= update_bitrate(avctx, q); + needReset |= update_pic_timing_sei(avctx, q); ret = update_min_max_qp(avctx, q); if (ret < 0) return ret; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 6e1132d2e3..486c996fc6 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -278,6 +278,8 @@ typedef struct QSVEncContext { int old_rc_buffer_size; int old_rc_initial_buffer_occupancy; int old_rc_max_rate; + // This is used for SEI Timing reset + int old_pic_timing_sei; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);