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); From patchwork Fri Sep 23 02:44:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 38191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp157075pzh; Thu, 22 Sep 2022 19:48:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5RKMKhgxkYFs6U9CS+9Y0zeEBJnKoUSQszaMH0TV1rYQVE3gHmr/d9TFiMcWf3bZ8MfQ5x X-Received: by 2002:a05:6402:2709:b0:451:d665:e787 with SMTP id y9-20020a056402270900b00451d665e787mr6155180edd.317.1663901303611; Thu, 22 Sep 2022 19:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663901303; cv=none; d=google.com; s=arc-20160816; b=mAI5+BM2+r9MAWQfoDgmW9DN7xshBBOSdALENQxxbQt2GDJ1tFg2yZ7C9DwzsOmHWS 9w3t5rhCcgSjCLo2K0I6n4orwnwxQY2uZ1qg3nh1o6gyr3jfscGdRK5m7s2ksf0WD2Hl 0MuvmenFLl3CrvKQfQhHaIB558sPmmr5QsI81br5reyQdlD/b1nop0W+FqUihon64SxU FsxVCoVPexowWmMT9ABPU/w89z+73i8MFi2dRIh+tO4y3+z8yK1YGLrg60U5/t6AqOsA D3B5xLeKqM0BYgOsBj3VNoQrz6M9AHJquF0gOigSzim6gvPRNCVCQJGdwaR3f2kGJ2Kv Xotw== 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=LfxQ2yq5Fr/h+UcTYoSsSNFyErsloqn2x7DDq6bhJuU=; b=wr6+WceHkDOy6x4nvVzs+KO6XAanywcjDFQgVUqHd72Dvm12QWBsV83FazyWMbxNtO SuLMpR+qvWi9MlkyGzkI2u0n7WiYmBXCn8VOlZObx8rpWFWR+z9ezoty7Jf4sy56CgDd DO9XBC/KvGZ5rLoVVEGWR61BiJqSh5XJknp2YEc6lLOZuFboKRrM7myyPbNWThixv5d/ /UO+s7ZPGK8EOY1SfStkKiYen75HrqSzjf5/u8S5/6KtzRlJW3emawgdxAeJrpHnxNqk jKVyOUfVSz/jmOXy3Bq2A2WnHh49iGfWJrjGv9tgNR/yi8wq6uFxaMm2cQR7o2puG8TC LbUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=c0qMPLB8; 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 nd16-20020a170907629000b0077eaaac9b30si4866789ejc.713.2022.09.22.19.48.23; Thu, 22 Sep 2022 19:48:23 -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=c0qMPLB8; 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 6FA5268BB16; Fri, 23 Sep 2022 05:48:13 +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 085D768BB15 for ; Fri, 23 Sep 2022 05:48:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663901291; x=1695437291; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=8LzMoh4q5PzwYimirTRx84zb0Tr+aiDengY4Cmimnbc=; b=c0qMPLB8/7XYrL7G5WE1cr+GkBTs66m/moLj2Kp9DRChHIOVI71XGf39 Ppb4Ac2GdJBCWs4oh7adLEbp+412T6EDpDVlT0HI7WMhIJrbyqvGFAhY9 qls3Z7DFa2cDqnyjDJWA5UxfzsYCxRDef5XilCnqfHi8v5X3kjA5+sdGK vVlIc0WayUgtaA5RPyXsBZ7AnFxT4nI6jqAm6MXNr7wrWyUoADrPK4GOM q6FlTWgZ8j2zQnXJwtDbEPpn34NVtGxttgSxkoUFlOmH8ELLCwS+1DpIE 2qn6W29vgpPOe7SgXcVteXE++fSqwXDh6nr9NPP2VxXNNc9z20vCqprpr w==; X-IronPort-AV: E=McAfee;i="6500,9779,10478"; a="386782565" X-IronPort-AV: E=Sophos;i="5.93,337,1654585200"; d="scan'208";a="386782565" 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="948858458" 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:56 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Sep 2022 10:44:11 +0800 Message-Id: <20220923024412.5671-2-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 2/3] libavcodec/qsvenc: Add bitrate 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: 3lpgGGm3E9XA Signed-off-by: Wenbin Chen --- doc/encoders.texi | 6 ++++++ libavcodec/qsvenc.c | 38 ++++++++++++++++++++++++++++++++++++++ libavcodec/qsvenc.h | 5 +++++ 3 files changed, 49 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 4ed7ce1bb0..2b6412dbec 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3363,6 +3363,12 @@ 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. + +@item @var{bit_rate} +@item @var{rc_buffer_size} +@item @var{rc_initial_buffer_occupancy} +@item @var{rc_max_rate} +Change these value to reset qsv codec's bitrate control configuration. @end table @subsection H264 options diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index ce00cd302b..3371711872 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -718,6 +718,10 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) max_bitrate_kbps = avctx->rc_max_rate / 1000; brc_param_multiplier = (FFMAX(FFMAX3(target_bitrate_kbps, max_bitrate_kbps, buffer_size_in_kilobytes), initial_delay_in_kilobytes) + 0x10000) / 0x10000; + q->old_rc_buffer_size = avctx->rc_buffer_size; + q->old_rc_initial_buffer_occupancy = avctx->rc_initial_buffer_occupancy; + q->old_bit_rate = avctx->bit_rate; + q->old_rc_max_rate = avctx->rc_max_rate; switch (q->param.mfx.RateControlMethod) { case MFX_RATECONTROL_CBR: @@ -1863,6 +1867,39 @@ static int update_frame_rate(AVCodecContext *avctx, QSVEncContext *q) return updated; } +static int update_bitrate(AVCodecContext *avctx, QSVEncContext *q) +{ + int updated = 0; + int target_bitrate_kbps, max_bitrate_kbps, brc_param_multiplier; + int buffer_size_in_kilobytes, initial_delay_in_kilobytes; + + UPDATE_PARAM(q->old_rc_buffer_size, avctx->rc_buffer_size); + UPDATE_PARAM(q->old_rc_initial_buffer_occupancy, avctx->rc_initial_buffer_occupancy); + UPDATE_PARAM(q->old_bit_rate, avctx->bit_rate); + UPDATE_PARAM(q->old_rc_max_rate, avctx->rc_max_rate); + if (!updated) + return 0; + + buffer_size_in_kilobytes = avctx->rc_buffer_size / 8000; + initial_delay_in_kilobytes = avctx->rc_initial_buffer_occupancy / 8000; + target_bitrate_kbps = avctx->bit_rate / 1000; + max_bitrate_kbps = avctx->rc_max_rate / 1000; + brc_param_multiplier = (FFMAX(FFMAX3(target_bitrate_kbps, max_bitrate_kbps, buffer_size_in_kilobytes), + initial_delay_in_kilobytes) + 0x10000) / 0x10000; + + q->param.mfx.BufferSizeInKB = buffer_size_in_kilobytes / brc_param_multiplier; + q->param.mfx.InitialDelayInKB = initial_delay_in_kilobytes / brc_param_multiplier; + q->param.mfx.TargetKbps = target_bitrate_kbps / brc_param_multiplier; + q->param.mfx.MaxKbps = max_bitrate_kbps / brc_param_multiplier; + q->param.mfx.BRCParamMultiplier = brc_param_multiplier; + av_log(avctx, AV_LOG_VERBOSE, + "Reset BufferSizeInKB: %d; InitialDelayInKB: %d; " + "TargetKbps: %d; MaxKbps: %d; BRCParamMultiplier: %d\n", + q->param.mfx.BufferSizeInKB, q->param.mfx.InitialDelayInKB, + q->param.mfx.TargetKbps, q->param.mfx.MaxKbps, q->param.mfx.BRCParamMultiplier); + return updated; +} + static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1877,6 +1914,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, needReset |= update_rir(avctx, q); needReset |= update_low_delay_brc(avctx, q); needReset |= update_frame_rate(avctx, q); + needReset |= update_bitrate(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 960197f159..6e1132d2e3 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -273,6 +273,11 @@ typedef struct QSVEncContext { int old_low_delay_brc; // This is used for framerate reset AVRational old_framerate; + // These are used for bitrate control reset + int old_bit_rate; + int old_rc_buffer_size; + int old_rc_initial_buffer_occupancy; + int old_rc_max_rate; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); 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);