From patchwork Fri Sep 23 02:44: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: 38190 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp157068pzh; Thu, 22 Sep 2022 19:48:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6yHAN41/ct7XoC6cyYee9obDqGEczn7oqzZ4VnX6DG3ULTGigM6BP8hOhyZtAuMcILElXS X-Received: by 2002:a17:907:3d94:b0:782:60bc:c896 with SMTP id he20-20020a1709073d9400b0078260bcc896mr4352652ejc.701.1663901302995; Thu, 22 Sep 2022 19:48:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663901302; cv=none; d=google.com; s=arc-20160816; b=KUwi5fEjJPHzup94X0X5Fa8SrX34dhXtWh6K+ni44nDAMgJzjeoW8lx20OGT6Vy0Yc pHjJJXwkDPvUVfX0tUqo18qDPl/c9HrU7JUQVdbUS2bjx+PRykQiYnl2aTaxlJbbfjHV j8J/iHNNC6A4JL2hxHV4uvZkLksjR0gPlW08p69TqGM1qn8vpln0yxXjaM3GAG5UJ4JP a7eAFFqZ8WTv7JhGwwlTcMFkiUfC5nyBiBq1IAZd22pMtv4osWN/lzzc7L7/De8DhcnO Qeb++7KccaMQUinQV2P2WcS2wzNeb4GvJckkxO4Z2LQH06uR00RWn0di8b00eSiM1zGk ZAUw== 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=Sb5YnJ8VSbJXIsiAQDy+HDi8uxSptBQAZRq46PNTaLY=; b=CC6+XogXCf05ACUNsg5i7ild1lrTIr+0kCnbTKqlLs0yLo9IkQpel7ncD2DeYNDRLG w/4PTc7WxJBRWBKJKKXo5fy8VpL4TMd4xtpWsf+R6QLXrxMDn7WiExlAY1XO402AowGB Hkl2f1FTUKvpoTsr7zYUXAn0YxK8Zvo+t0TD1/lVqcT3O4FWKSxYqpnCIk7e0M8DiFcq zfFSHy2q0syMZU6lsGzrzuiT+Z+FsRppnS2BWHHD56fbQ7wZgsMjfUN5QWXgefaGLh8Q lo4GEAULp4tqhdG43mm4F6WuPnMdFBLN2P08SLPcFileue2+UcfhXWxdaIoVUi5fbNX7 BySA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kkwmPd8Q; 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 dn19-20020a17090794d300b007419f6dfba2si6513098ejc.41.2022.09.22.19.48.21; Thu, 22 Sep 2022 19:48:22 -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=kkwmPd8Q; 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 5766268BAE2; Fri, 23 Sep 2022 05:48:07 +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 23C7368B373 for ; Fri, 23 Sep 2022 05:47:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663901285; x=1695437285; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=SEcVvWfa3LkIY3sVpcBNgjLYKMUFIdaiNqcKZ7F5fVM=; b=kkwmPd8QRJXKgpT910Ady86EjAIEGOX5YJH8dSCiuijy9DNXeD+9dRGB pKzMqkPdrnRaIWZnK0OK39/Gae1rFPX6E4WKY+HGBrNkWw22A16SDdNTf qIPNyffwQWq6fyRWVsjEpuWaE61oVrcf2uWIDnTrswa9lo72h2tZgGgSD pPW0sfNDGoSoUKVc2yBUQye1WBqUBwQYEqLOyaejnYfxql0hAoAGpRxYX A20qjic2BfM2EF9vsT0RLtU+DqoSkMVlrN/JgPhSwqk+zNAMPNj2I3WOA SMnYxPZifjhePMwWZFj2/iGFiwT5BZLWJAZ+lSD+nJpjdXV46qtqX9HGk A==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="386782559" X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="386782559" 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:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="948858452" 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:55 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Sep 2022 10:44:10 +0800 Message-Id: <20220923024412.5671-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] libavcodec/qsvenc: Add framerate 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: 0oe0+FbrLh/P Signed-off-by: Wenbin Chen --- doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 26 ++++++++++++++++++++++++++ libavcodec/qsvenc.h | 2 ++ 3 files changed, 31 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index ac71f50ad2..4ed7ce1bb0 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3360,6 +3360,9 @@ Change these value to reset qsv codec's max/min qp configuration. @item @var{low_delay_brc} Supported in h264_qsv and hevc_qsv. Change this value to reset qsv codec's low_delay_brc configuration. + +@item @var{framerate} +Change this value to reset qsv codec's framerate configuration. @end table @subsection H264 options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 84c6e292aa..ce00cd302b 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -705,6 +705,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.FrameInfo.FrameRateExtN = avctx->time_base.den; q->param.mfx.FrameInfo.FrameRateExtD = avctx->time_base.num; } + q->old_framerate = avctx->framerate; ret = select_rc_mode(avctx, q); if (ret < 0) @@ -1838,6 +1839,30 @@ static int update_low_delay_brc(AVCodecContext *avctx, QSVEncContext *q) return updated; } +static int update_frame_rate(AVCodecContext *avctx, QSVEncContext *q) +{ + int updated = 0; + + UPDATE_PARAM(q->old_framerate.num, avctx->framerate.num); + UPDATE_PARAM(q->old_framerate.den, avctx->framerate.den); + if (!updated) + return 0; + + if (avctx->framerate.den > 0 && avctx->framerate.num > 0) { + q->param.mfx.FrameInfo.FrameRateExtN = avctx->framerate.num; + q->param.mfx.FrameInfo.FrameRateExtD = avctx->framerate.den; + } else { + q->param.mfx.FrameInfo.FrameRateExtN = avctx->time_base.den; + q->param.mfx.FrameInfo.FrameRateExtD = avctx->time_base.num; + } + av_log(avctx, AV_LOG_DEBUG, "Reset framerate: %d/%d (%.2f fps).\n", + q->param.mfx.FrameInfo.FrameRateExtN, + q->param.mfx.FrameInfo.FrameRateExtD, + (double)q->param.mfx.FrameInfo.FrameRateExtN / q->param.mfx.FrameInfo.FrameRateExtD); + + return updated; +} + static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1851,6 +1876,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, needReset |= update_gop_size(avctx, q); needReset |= update_rir(avctx, q); needReset |= update_low_delay_brc(avctx, q); + needReset |= update_frame_rate(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 f2b7ee361f..960197f159 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -271,6 +271,8 @@ typedef struct QSVEncContext { int old_min_qp_b; // This is used for low_delay_brc reset int old_low_delay_brc; + // This is used for framerate reset + AVRational old_framerate; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);