From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 40CF642D43 for ; Tue, 6 Sep 2022 01:53:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D97E68BA0A; Tue, 6 Sep 2022 04:53:29 +0300 (EEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F0AF68B8FF for ; Tue, 6 Sep 2022 04:53:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662429207; x=1693965207; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=qVvlN61NZ3pFKQqgN3mvFyYp5JQckWgbFqSQ43gJEzA=; b=NyTBi7fKEXOsilgHVt9wKHoMxXoSiSGokiSFGUmi0O7y5DtHziUT36SK uStb6C0wJAz/XNvdRogE3Mr2c5wR474aNTQKg3EN99bLNYvjPzHIsAAak 8jwOeUF6MDgt+oUPOmhUA4RErGpsAHMfh8biAK00GSVCO5GJcugAXsYiT uR802Xc7ssr266hENYB0ZhzXPJh49w4wbsPaLNSSQPSGw0HKV8JilRsfz wyBn+8USmBJVPFvG0Bp+t1tXmqwu3IBZj+VVZdQ9uUcmjjwPdpUXOSJxY UEZ6HB/oKhxCW1OoroaePbkHABYF5ZBP+xtV5bfgkWnTzOHu6XiGN6CXL w==; X-IronPort-AV: E=McAfee;i="6500,9779,10461"; a="296479793" X-IronPort-AV: E=Sophos;i="5.93,292,1654585200"; d="scan'208";a="296479793" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2022 18:53:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,292,1654585200"; d="scan'208";a="717516802" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga002.fm.intel.com with ESMTP; 05 Sep 2022 18:53:19 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Sep 2022 18:53:18 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Sep 2022 18:53:18 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 5 Sep 2022 18:53:18 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.43) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 5 Sep 2022 18:53:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iIwB7nTwy+FVCc+vHMR89pJLNYfQLyQeKM2zkPP4xlqiinwP98vSxw0KoZOf0mChyYZHopywKlW8f2gbQetIBmdJgWNVskFYO8Q6G0wDfII8mCNg2oL9PRVzH2PIfkMCmHUpnS4nSrZ4SxU9MXZleh2t5TyaspE1dMY5v71XNNyeZdv+/+TaZe7iGIkKzswXtyGAmnF+QTh/MleWaEhdvCEcx2KxsFe8pd9ZyW4EupSb8zEmBaXPRmTQaOvFUZ9IEx0yyT4JJEyEglQd9HtZ4itDjKKvUXannAQ93rdsYvDuRu1UHLxcJNNUlihEBY+1CJAH79F1KO2ElchpsvGLnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qVvlN61NZ3pFKQqgN3mvFyYp5JQckWgbFqSQ43gJEzA=; b=XWTVlvwogeQY5p/0m37nSBbnjzJmkb0mCSNYe2DtGIHIYisG6mJe9MltitqN+h4qOTlcjL8bpjxQol+ZmuDzw41p208vw7ugHeZMuqqsP4BwQBNZIqMNqi0apsfiZXEJ+UjsxQ4GOZVUtxrNwpOCEskidNDel+GFSzpm+t5/DrsHnLAzmKKH3Ng6mOtD2peYlElVIH8YsU2TNfQlBON6AhvA9ckGAx5OEbT8r8S+bl144fAHJ5sH1YAPA8yn49TZVzt2Mm7T25v69UenaARHdVj0R298BXuItySPK+1iJE12783oNXoOeZ0EFUDmqbb9sdA/dhd4jlvtGzvj6wd5TA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by DM5PR11MB1929.namprd11.prod.outlook.com (2603:10b6:3:10a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Tue, 6 Sep 2022 01:53:16 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::8444:e015:794f:441b]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::8444:e015:794f:441b%2]) with mapi id 15.20.5588.012; Tue, 6 Sep 2022 01:53:16 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 2/6] libavcodec/qsvenc: Add gop_size reset support to qsvenc Thread-Index: AQHYstBqyyfmEPq4oEqtS3GOBGBh0K3RwTeA Date: Tue, 6 Sep 2022 01:53:15 +0000 Message-ID: <673108d98279a661fef6743e09f5c476522fd14e.camel@intel.com> References: <20220818065912.158693-1-wenbin.chen@intel.com> <20220818065912.158693-2-wenbin.chen@intel.com> In-Reply-To: <20220818065912.158693-2-wenbin.chen@intel.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4034176c-81f6-4bbc-dc75-08da8faa90a5 x-ms-traffictypediagnostic: DM5PR11MB1929:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 50ybwJzjqXKJnzkg/9v1FZ3Io4BExCRCTZ7bWiyyWM4sj/WcKSNJB20h9vR7FJq6fKpG70BnaNCmI+HbBTstDzlY4KHPTLq91NgAVSyW6KIXx3baRSAyH0/acu/+FFzRf1Lru+zlPfNEltDsO1cKjiifx0RJmFSlE2M1cbTQ/xgKuZcIoXWJT2ySMqZDhUGHu20f5SAvLbBjXpxc8U23LxueHktTz82uWPOG6WxpBP5HLp06HhMw8qj7+/Zzt4y6dIGMOBj7GG6k08Jl8rgzUAuqSZsfZOCxGmRn2h7O3d/NnENdOjYgWgHOMzujWXc24YLJH+U/8zX0IA/hutW2TGNDdA+pUu9KhhrfuxAVyHq3xfpAdCkwX4YzpJjRAdgE0PDXGYd5InoYXeWTA91IRshGRINPt/7TeF21cfrBbdUz6FRB7mMjyaHAhW/vsE6XI9DasvMNOIuU9i5LkWhSfLlJZQMTyx2Ru2yTUCy/SHsVZIWRh8oIPsAfvD5jmofDXTBzysgXCtZFfb39wNpuXqyrNWEoWPZM+2WkrevAgQFHg3Lb4IOavwx5MDr1UyT9YslA5rubHKVbSMEztg7yUeCzQBKGGaZocO4Ic8ktakQQXiyq3dehhvn3/4NuOdxZvZroo4KDS00mm2q0m0xWcVk8buI08F4Odg0Ihgk0i77b2PU5A227dAX6W5FEJk/OxM8tMH51AFFgu3EldVxYALhyJn+cfGPk4DW8xz5L06NaEd0KTlZEAursatuYRWRYpWEgo0EVYWaa/KO8mHqjRrcW0Lk2DGwSN/EuqOhGzsA= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(366004)(136003)(39860400002)(396003)(376002)(346002)(86362001)(36756003)(76116006)(66946007)(38070700005)(66556008)(64756008)(66476007)(66446008)(8676002)(122000001)(38100700002)(82960400001)(26005)(6486002)(6512007)(478600001)(6506007)(41300700001)(83380400001)(71200400001)(316002)(6916009)(186003)(2906002)(2616005)(91956017)(5660300002)(8936002)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?amFXTUx1U1BoTGlZRHkxeEw0NFE4Z041ajlvSEJhclFIOWI4TWN1SWd1V0Za?= =?utf-8?B?ZjdqbFBiaXNHV21MZlBRc0t4NllCTFNDL1l4c29wam1HNm1CenM4ZjJrUzk2?= =?utf-8?B?eWNMblZRS3BGUTZtTTJGWVZUdEtWLzV1K21Ec0kvemVnNU1mNkx0Zy9Cb09s?= =?utf-8?B?b05wamtVSHNLZ1NIRzNZTlFmeGVGTXN5eHdqNjJ0UW9QeHJEYUMxQmZNWVJD?= =?utf-8?B?bjd0SVBnY0t4OXRkTGlCWUl0Zy95L1IzVSs1QjFTNjlZRDhvNnduQkdET2Fr?= =?utf-8?B?KzdCUmI5cUxpeGFscFEvbm9TUTFJbmo2UXZ5cUdBQjR0OVRIc3ZlaGtIR1px?= =?utf-8?B?YWtydlY3c3N6ZDUxNjZPTTNuUDlpTUpWQkY4ZlVJVXZreVhJWXMyNm1QcFly?= =?utf-8?B?c3FNVFViM05MVFJhV29YeFdSazNVR0NaSGZVUHdRbGRxNUhiREt0OHVxQ2lL?= =?utf-8?B?MmQzKzZvdHB0ODM3NDI4c0UyZ2F0UjV2ZkhEQ2E2WS9CWnNGci9BOGl6OXJX?= =?utf-8?B?SFpqTHZSQ3IySi94Vk9HQ3ZmbjRGYTV6NWdLQ3hkQTFBQjlvbFlnRlVZV0tN?= =?utf-8?B?dThDempSUE1sRkJoNDJKSk9VYXBBK0N3alpWNzBJMkZydFZsNDZNVXVTcXBl?= =?utf-8?B?cklDTFg2THphVVMrdy94am5PQm05c0ZtUTNhZFJZNEJMa2ZuZWFGRmJJWkxy?= =?utf-8?B?Nk1jelQ0Z3VoSjJpd2JMVkE3ZERsVGNiSzFjWEsrZDRmSjZJNUw1ZEQ4TFZQ?= =?utf-8?B?NnYwLzRyNmxqR2YxQkdJTVdIWHJBQkl6Nkt2L2hRUFRCRU1sMXBVODZCaDlm?= =?utf-8?B?YnpmMDJVNG9NbG90aTNDekNLWFhsUzYwNmpUSDJRb083TTU0SEZ3U0dINHZq?= =?utf-8?B?ZlNhNDZwcHB6NExEQ2hET2x5RXFnSkZtc2I3dXBpd2lUd054QXJuYnVPdDJY?= =?utf-8?B?cEd1Q2xwZ21JVm1aQm05MlVlcXZ1QzNZVjg4M1Z2b09icmcrUHJWbG1YdXpG?= =?utf-8?B?Y3hXS3l2dEFHWmtXbjV6RmM3eCtCOGtxZ3pzVGdvcnZQSDMwWldCMzB0Tm9j?= =?utf-8?B?ajNaR1lxSGtmTDZBVFI3azdUL2xBVGtLK1FhVWN0TWUvMmlsUGlyRUh3MjVv?= =?utf-8?B?REJPZkZiWGlWR0wxWS9kZWo4YlVzWThPWkZHRDJlSFhQWTBiYTBic1ZINVY4?= =?utf-8?B?ZE82S2pUVFdiUnBYZGlIU1J1d0dXck5uQlRPdDVtMlhmS1pkOGprMDdrRHQw?= =?utf-8?B?SVQ4VmRva2h5Ui9KK2MvcVg4VU5SR2RnTWV5dENJeDRQVTNndnVjWE1Kbnl3?= =?utf-8?B?YzNrNy9nN2ljNkpSWEd4WkZ0cjZmeUdhajlQUUxlaVZ1ZnFsLzhmRDZ3Wk9G?= =?utf-8?B?WlFaRkhkNkNIeklrQkhmNEd3WTVSUmJBWTZybU9KaEluSUptL1FTZ1E0R1VF?= =?utf-8?B?V0RLRXYwNGl0eWZCY2F2YlZYbnI5VzZZMnZ6VUgvV2dCa0tTWlFvZVJDUWZz?= =?utf-8?B?bG5TLzVsTXMyUjJIclA5OFF1a1JaWUhrR21LaGV4ME1tN1M2UUxISFRTb1p3?= =?utf-8?B?TUp2SncyVE9aY3BPQ0dUMmRHbVpzN0x5OXZZeGdqMDYzeURIclBoR2I0ZWEy?= =?utf-8?B?OXdScVhINmJkY3g1cnBCVHVlcGdSdTFtMVRRdUQ1U0dhZ0NzSmQ2Um5OVXJD?= =?utf-8?B?b09yUlhoUkhIejZYOEFGZEE4VE16bzFuWkd6U0UzaUdqc0JUMDNXbkN1OE9l?= =?utf-8?B?M3orN0FjTUNtYzB3dHpGYnhZQjJYUjd5VFBMMDF1TVFaL2s0QlluSGNINFc5?= =?utf-8?B?MGwrRGkyZVdPKzVXVm4yQk9MdUsrVVpBMUo4amJOZ0dMYkNJWmV1VlJiZ1NM?= =?utf-8?B?d0F3RFBVOUJaOUtUL3p2UGhObldpWXpFYlV3YUE4TmVDRVFFaUwrK3RuUU9E?= =?utf-8?B?NUJWUGNWcHo3eFFGWWQrSlROMmY1OVFienBOY3A1M2pmTXJXT1UrRGZTcXdB?= =?utf-8?B?MFNxM3VIM0pWdVJ2NjNwSmhQV0UxQk1vVUZ3MnZjR3RkYzR2U1pTazdlcFVR?= =?utf-8?B?eHZEVDJvcVkrc0NNaFpEbXpKNTAvMlFkZUppUHZxMjQyME8yeGpTaGFjMkxw?= =?utf-8?B?L24vVUdFU1B1blJUZlBicXAvaytyL0ZYMzR6dEFHbHFKNzBTdXRZeFFqdXBK?= =?utf-8?B?N1E9PQ==?= Content-ID: <4CD667345CD373489B24A36D1651CF5D@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4034176c-81f6-4bbc-dc75-08da8faa90a5 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Sep 2022 01:53:16.0035 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: RfAVvEDtyNCXisS30Y4rR4hOpjCyDr81jsLrRa9vjst48EO591ZyEHo8zaCRy2pcAzm5XpbUVTFc1jSRvZR9WA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1929 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 2/6] libavcodec/qsvenc: Add gop_size 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 2022-08-18 at 14:59 +0800, Wenbin Chen wrote: > Signed-off-by: Wenbin Chen > --- > doc/encoders.texi | 3 +++ > libavcodec/qsvenc.c | 18 +++++++++++++++++- > libavcodec/qsvenc.h | 2 ++ > 3 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/doc/encoders.texi b/doc/encoders.texi > index 69fa46f3ea..9fb63856b1 100644 > --- a/doc/encoders.texi > +++ b/doc/encoders.texi > @@ -3348,6 +3348,9 @@ Change these value to reset qsv codec's qp > configuration. > @item @var{max_frame_size} > Supported in h264_qsv and hevc_qsv. > Change this value to reset qsv codec's MaxFrameSize configuration. > + > +@item @var{gop_size} > +Change this value to reset qsv codec's gop configuration. > @end table > > @subsection H264 options > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index c911b81e7d..b3820e4fe0 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -635,6 +635,7 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > q->param.mfx.CodecProfile = q->profile; > q->param.mfx.TargetUsage = avctx->compression_level; > q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); > + q->old_gop_size = avctx->gop_size; > q->param.mfx.GopRefDist = FFMAX(-1, avctx->max_b_frames) + 1; > q->param.mfx.GopOptFlag = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP > ? > MFX_GOP_CLOSED : MFX_GOP_STRICT; > @@ -1692,16 +1693,31 @@ static int update_max_frame_size(AVCodecContext > *avctx, QSVEncContext *q) > return updated; > } > > +static int update_gop_size(AVCodecContext *avctx, QSVEncContext *q) > +{ > + int updated = 0; > + UPDATE_PARAM(q->old_gop_size, avctx->gop_size); > + if (!updated) > + return 0; > + > + q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); > + av_log(avctx, AV_LOG_DEBUG, "reset GopPicSize to %d\n", > + q->param.mfx.GopPicSize); > + > + return updated; > +} > + > static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, > const AVFrame *frame) > { > int needReset = 0, ret = 0; > > - if (!frame) > + if (!frame || avctx->codec_id == AV_CODEC_ID_MJPEG) > return 0; Better to fix mjpeg_qsv in a separate patch if mjpeg_qsv is not able to resetany parameter. Thanks Haihao > > needReset = update_qp(avctx, q); > needReset |= update_max_frame_size(avctx, q); > + needReset |= update_gop_size(avctx, q); > if (!needReset) > return 0; > > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h > index c452c5b806..fdedae28dd 100644 > --- a/libavcodec/qsvenc.h > +++ b/libavcodec/qsvenc.h > @@ -237,6 +237,8 @@ typedef struct QSVEncContext { > float old_b_quant_offset; > // This is used for max_frame_size reset > int old_max_frame_size; > + // This is used for gop reset > + int old_gop_size; > } QSVEncContext; > > int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".