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 3836B40521 for ; Tue, 25 Jan 2022 04:59:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBE5068AFC0; Tue, 25 Jan 2022 06:59:17 +0200 (EET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C771689F8F for ; Tue, 25 Jan 2022 06:59:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643086756; x=1674622756; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=mbCkR6Px/3MLwIMiWjfhTFkdyGTj8fyOuk+3U+4XygI=; b=TMmBIw49beLZdHS5TJtlDjxwN73KiVJ0Ar6Sht1U7RV3E6QmH/3i2I/y qZoIItMP2Rnk5Fk42vL3mop/op0Y0Gz9VVVUAjV+aQjEiPJ3emEJWSvXU V3StJSIiKfi26NL3FccoE4u4zv2zBdPa9DEgRizf4eL+vt5YPk1ZuKnyh zdOMjbYYQilq2oRh8da9D5fuoH6oWHooDfvqi4ahXGzsEFtiP//uGxzlz sOw1322nS9EFw6hnB39wnqO2z31MHPN6G1a5p1KC8spSuxc4elVmmylz6 Qf/e+Hfju1VUZm5KjQMVxB6D3sOtR4zLeOrgFlXYdTHR/QGE+Ksakg9rm Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10237"; a="309538359" X-IronPort-AV: E=Sophos;i="5.88,314,1635231600"; d="scan'208";a="309538359" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jan 2022 20:59:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,314,1635231600"; d="scan'208";a="494871583" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by orsmga002.jf.intel.com with ESMTP; 24 Jan 2022 20:59:08 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Mon, 24 Jan 2022 20:59:08 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Mon, 24 Jan 2022 20:59:07 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.108) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Mon, 24 Jan 2022 20:59:07 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SoY3cBgOsOpoMsaU7LkmxwGskffYlF/ysP0pKj46C89LLU5/Mb3mclGJoWCqyG9nDQ/gobCJ5Q77hEEC1tAQWc5t3whTyDveleVmvZN23Ep+ZlpxYvT+wTf8qqraslz0tuHMmWwPLlNhwGTUUlBCDknuoICpFjN3aCAPw3ZBi7s1/VzT5tpVBSYdYJB1wG9n3ttAmcAazitiSdUhRjb5rRMqFgofdocI4EIhEnMGxwaW22KmiFlgY0Mmwfdnl/TUd4P6By53qD8EL2eGtDAEIReFbs4wCLbi2otGGUT2VISvi1QxXJYCcTCm5HBRnrbFfv3FQxMMCod93oZizCvwOA== 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=m2Roi69XCQG8rBEwqJ3StQ2gFI26g1wK0dUS0MqOGfg=; b=drNr0Z91VAJLFMT+0Bj+iO/oOsRnXE1ZIsCZb+OSgAd8AeYo8nBioogy8aaGVmDsRkWVKYYUrDQfQAXGyHz9X7mtJcadR5i149Sm5cNeeB5jDFZOv9A+0sip+Ne8tloidShTifmJ38Aojnknbg8HnM7BJISHMZmBoWDLVAMAlhOeKUkI2YCfOKHv04AoexHg7rA2s9KWBHz/fiNwyoj29CQXyVFcit4isJc8kg06qrzKm02DVM/f/MQYMD8liwpXfS5YCycmBR/9ScpKV6aKAUvSgocs9nFtRRPC9p/fpvanzCqN5mfTjr3IaT8eJQlsF/fYOftOja7BFH5u5hpGVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from BY5PR11MB3879.namprd11.prod.outlook.com (2603:10b6:a03:18f::17) by BL1PR11MB5525.namprd11.prod.outlook.com (2603:10b6:208:31f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.8; Tue, 25 Jan 2022 04:59:05 +0000 Received: from BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::84ae:5433:fc99:9d61]) by BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::84ae:5433:fc99:9d61%5]) with mapi id 15.20.4930.015; Tue, 25 Jan 2022 04:59:05 +0000 From: "Chen, Wenbin" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH 3/3] libavcodec/qsvenc: Add intra refresh to hevc_qsv and add new intra refresh parameter Thread-Index: AQHYEM7Tb+KedIX8RkObsCm9mRORAqxzE9OAgAAa18A= Date: Tue, 25 Jan 2022 04:59:05 +0000 Message-ID: References: <20220124025955.204168-1-wenbin.chen@intel.com> <20220124025955.204168-3-wenbin.chen@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.200.16 dlp-reaction: no-action 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: a9f0ded7-e2d3-4575-56e0-08d9dfbf69bb x-ms-traffictypediagnostic: BL1PR11MB5525:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1443; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: tllm8cO+DUN7LEJ7jaJM4uOpngywIjbZgSWNvC8fNZTUL4t/TerY0vn8MC5RuRFxzktzGm1aJr40GgWGpraaKFhmmpq+OTWrJR1zKzHWrdwNvPOrcIgPJJSxpzjP3RJgLnbRVBYjnZ/tUmX5Yi7rgXm4+kII8FaA1vi1g6vGScGgbHeLZ5xzJVvMXgwRidf9yT9lv2/qKQGgXZNPWei2B3+CbYe5olCD8w5FmMEOqeEDTxZt2xK4NSxQnYqV/mTFCz9Nm3msBwuRebFebF1opW+97QWbT8OOpAIV/Tj/p+ErYHe+wZ3zowqlwZF5Aw4gcjXS/pb7Ye0CHQm1ykCVgZJS8Esq9RYxD4CKiI2OsHrjm5NX61vlgiTgcBNx12ZzLCzhbzwI8qphXP6XyJE1SXsx/Y7Nck0kp5QOI5O7fmA/x1ulRHAhs1OmouTAfQLpn9GjdhWy3sRfuOhvQidYzQ5lpoVEfKkAPlz39dWRgbW5ND4QYskoktRSx8SgOMtFryW45fEjskQSKJZ2xx5mwQlk9LJ6aHFwE9ul58J7XT0hq/S7YG36x4bQz92MqpVjSowWYxSSjSWOmKMuyZwztzv75MX8B4crz/EOGUJPcnW6DsPmdzL69U3XveINk1ER03RUemobBqjy9NDEELR+SjmsfMYP8dPHiGk6a8G+L5URvjzIFhAE0R3qFoBpY19RCNC2Jd3lGb+qyoO1F3u1hRxZcpcx/gfBq5FWgVTOpdbu4Qnw0ViN0IqRS9bHF6vOBijsaeFT1ci2hydK5eQJgULPY1iqmlldXKhAxuyTbjs= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR11MB3879.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(83380400001)(6916009)(7696005)(316002)(76116006)(966005)(38100700002)(82960400001)(6506007)(86362001)(71200400001)(186003)(38070700005)(122000001)(52536014)(33656002)(30864003)(66946007)(9686003)(2906002)(5660300002)(26005)(64756008)(66446008)(66476007)(508600001)(66556008)(8936002)(55016003)(8676002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?hDhd9CtKxLMsXYhLec+L7116JZOzYV7QnxkjNgegqwkbEYE/X2U5FLk7i7qh?= =?us-ascii?Q?Rm6T4+gjHFrQlTSZanIYmWjNsU+6fcSUEyfW+EnJ9/HnTeyelwrtL0gLou1c?= =?us-ascii?Q?0q42chBpbqGofjzd2nopjKakfIc0e9UM8/1vbP+AgBxj0kGiX3ksrVfzNVbu?= =?us-ascii?Q?Ikubv5FFfrj2/r1dagK6BXizszyzzhbo6m9jNXz+zax1SQqFV8NxEMwLw3Dr?= =?us-ascii?Q?yWry/l5hcMEDsiT9m2Kby1/6YU3GOaQ2O0GLIZNn49FXNimSHp+zFDu6w+c+?= =?us-ascii?Q?+Wr5nkoFsM9fk2wQBXlkeL8Aw7d9+JtBAtUzx1koSkbXKGAwF83T+wJVZjZo?= =?us-ascii?Q?1rXZ8n9copheRGe7C6jEQQZ2UgS7i9/ZHqWcMqqDDb4KIsiJJAJffBaF+cW2?= =?us-ascii?Q?YY1JozQlagYwsj8niKgS4/IYlTeklBeNtB59g4lk+pQLpDnUfEQMa5P6RLv/?= =?us-ascii?Q?GDHFd5dOesksv8IOQwGNbdU9IL1gYVA4856GlD2JLrvZ1g1LXIcamFkwAUK2?= =?us-ascii?Q?H7dqDOTXACRDn/gwW7HsAnMBhRYc+OTi4yRX0H1/9YIh3QcJLyyYWXocchPs?= =?us-ascii?Q?RbZUDB1OlYrtQRM6ipWDoQpYASMFFL4AbknN1Am1skvoJPh2ESBUOncAedEu?= =?us-ascii?Q?ooYV1dFGJVDUHGrxG6DojeWX1H0+O/r8ovXCk8a0aBJCeI2jkx7b3g6jaevD?= =?us-ascii?Q?6nDrAzstisa0OIIGk9IC3qqv6Kv4G0Exlntl58d+z4rGSx0caOMD4/CQclvU?= =?us-ascii?Q?RrBS5t9mxz6khY1Z0tRyz1zb7MvM3FkM5f5zT07xzYmRcx+fCxoXofiphJBh?= =?us-ascii?Q?YlInnSkQdBM2rrz7QNHNfWQcVqYa1n/GSjmKkCgVhqXpOzeReQ1aazE5BzWq?= =?us-ascii?Q?wbezi4qqwFbrc4Qt7UdDEElGo2DRC2W+wlZEY+zkptXmWsmH+rK3m4GpHR7E?= =?us-ascii?Q?DgzgcSelAO2lJOkYIh25C/jCDdkO5SVwvWB7CHCAzMjZ6nBnex9Oeee+OPD/?= =?us-ascii?Q?ArPDNr2C0I++I2nBeuoX12qRcIcKymLAy3nRsDRfXzavuQ+6hxEzvT1Mu1Vb?= =?us-ascii?Q?FngYyOB7ffnFzDz9uCU66h6FHHGHREAl8ynv36CBYsdgvs2cUkmRWzkTgDLx?= =?us-ascii?Q?fLvjJuAjaFm5N8s3vIOUSxGyhuAxt1mQrKjbWGOTjtLQOu8VaKQw7HKc3XJX?= =?us-ascii?Q?A4rNdZOhqYjS+jzmUdCXDyNipLWEoIcEii7HKPdhuBox9XA3SvHYo7VA5rkI?= =?us-ascii?Q?zf9ksbdzOUZQLyByFEZG5lMa268EwsM2vkgrnxsHifkQ/Wb6dzEpDM7wZ3TO?= =?us-ascii?Q?RhVXCMMniMNEyFc7k40YYHnmAlyGHL0uQ63HCQKEc0w568BW9lk4qeZvy3Jo?= =?us-ascii?Q?UYz9WUk/vVjqsV3A0d1gDcT1URhfaOyki3wlrxQbMLAkTTxnZp98aAJK3+qM?= =?us-ascii?Q?Qv1HddddFbwqdF0DeKlUNoiMFgXpFS9tZmNwfdPVAVMXya2i0wQeJEtLRyMa?= =?us-ascii?Q?2yvZyBg4BxLTB9S2U2AZEEZLFsbp4DonCOtGO0uUfhKEETGnJkyHLlA/XhKp?= =?us-ascii?Q?7vc0vWVtkwju7MelsYwoSlLFPT0BUJNWM3JHv7qdwmAt/SPDpdWTynpUibYS?= =?us-ascii?Q?7NtqYcFDIQ32YmaB/9z/Re0=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB3879.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9f0ded7-e2d3-4575-56e0-08d9dfbf69bb X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Jan 2022 04:59:05.4018 (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: au++RI1FWCIs1SgU93EVb1A1fRGgAejDakaACR0CWTkE0OlbIVe9JzFl3ZCvCFo/cFZpuDc7dlgmTWt3LEjIsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5525 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 3/3] libavcodec/qsvenc: Add intra refresh to hevc_qsv and add new intra refresh parameter 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 Mon, 2022-01-24 at 10:59 +0800, Wenbin Chen wrote: > > Add intra refresh support to hevc_qsv as well. > > Add an new intra refresh type: "horizontal", and an new param > > ref_cycle_dist. This param specify the distance between the > > beginnings of the intra-refresh cycles in frames. > > > > Signed-off-by: Wenbin Chen > > --- > > doc/encoders.texi | 26 +++++++++++++++++++++++++- > > libavcodec/qsvenc.c | 23 ++++++++++++++--------- > > libavcodec/qsvenc.h | 1 + > > libavcodec/qsvenc_h264.c | 7 +++++-- > > libavcodec/qsvenc_hevc.c | 9 +++++++++ > > 5 files changed, 54 insertions(+), 12 deletions(-) > > > > diff --git a/doc/encoders.texi b/doc/encoders.texi > > index 6c1c4df57a..4e35e50e4d 100644 > > --- a/doc/encoders.texi > > +++ b/doc/encoders.texi > > @@ -3344,7 +3344,8 @@ Specifies intra refresh type. The major goal of > intra > > refresh is improvement of > > error resilience without significant impact on encoded bitstream size > caused > > by > > I frames. The SDK encoder achieves this by encoding part of each frame in > > refresh cycle using intra MBs. @var{none} means no refresh. @var{vertical} > > means > > -vertical refresh, by column of MBs. > > +vertical refresh, by column of MBs. To enable intra refresh, B frame > should > > be > > +set to 0. > > > > @item @var{int_ref_cycle_size} > > Specifies number of pictures within refresh cycle starting from 2. 0 and 1 > > are > > @@ -3355,6 +3356,9 @@ Specifies QP difference for inserted intra MBs. > This is > > signed value in > > [-51, 51] range if target encoding bit-depth for luma samples is 8 and this > > range is [-63, 63] for 10 bit-depth or [-75, 75] for 12 bit-depth > > respectively. > > > > +@item @var{int_ref_cycle_dist} > > +Distance between the beginnings of the intra-refresh cycles in frames. > > + > > @item @var{profile} > > @table @samp > > @item unknown > > @@ -3463,6 +3467,26 @@ Insert picture timing SEI with pic_struct_syntax > > element. > > @item @var{transform_skip} > > Turn this option ON to enable transformskip. It is supported on platform > > equal > > or newer than ICL. > > + > > +@item @var{int_ref_type} > > +Specifies intra refresh type. The major goal of intra refresh is > improvement > > of > > +error resilience without significant impact on encoded bitstream size > caused > > by > > +I frames. The SDK encoder achieves this by encoding part of each frame in > > +refresh cycle using intra MBs. @var{none} means no refresh. > @var{vertical} > > means > > +vertical refresh, by column of MBs. To enable intra refresh, B frame > should > > be > > +set to 0. > > + > > +@item @var{int_ref_cycle_size} > > +Specifies number of pictures within refresh cycle starting from 2. 0 and 1 > > are > > +invalid values. > > + > > +@item @var{int_ref_qp_delta} > > +Specifies QP difference for inserted intra MBs. This is signed value in > > +[-51, 51] range if target encoding bit-depth for luma samples is 8 and this > > +range is [-63, 63] for 10 bit-depth or [-75, 75] for 12 bit-depth > > respectively. > > + > > +@item @var{int_ref_cycle_dist} > > +Distance between the beginnings of the intra-refresh cycles in frames. > > @end table > > > > @subsection MPEG2 Options > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > > index a8d876d6d9..af1529936e 100644 > > --- a/libavcodec/qsvenc.c > > +++ b/libavcodec/qsvenc.c > > @@ -267,8 +267,10 @@ static void dump_video_param(AVCodecContext > *avctx, > > QSVEncContext *q, > > > > #if QSV_HAVE_CO2 > > av_log(avctx, AV_LOG_VERBOSE, > > - "RecoveryPointSEI: %s IntRefType: %"PRIu16"; IntRefCycleSize: > > %"PRIu16"; IntRefQPDelta: %"PRId16"\n", > > - print_threestate(co->RecoveryPointSEI), co2->IntRefType, co2- > > >IntRefCycleSize, co2->IntRefQPDelta); > > + "RecoveryPointSEI: %s IntRefType: %"PRIu16"; IntRefCycleSize: > > %"PRIu16 > > + "; IntRefQPDelta: %"PRId16"; IntRefCycleDist: %"PRId16"\n", > > + print_threestate(co->RecoveryPointSEI), co2->IntRefType, co2- > > >IntRefCycleSize, > > + co2->IntRefQPDelta, co3->IntRefCycleDist); > > > IntRefCycleDist is a member of mfxExtCodingOption3, and was introduced in > mfx > version 1.16, so it should be used under QSV_HAVE_CO3 && > QSV_VERSION_ATLEAST(1, > 16), not QSV_HAVE_CO2. > > Thanks > Haihao Thanks for review. I will fix this. Thanks Wenbin > > > > > > av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d; ", co2- > >MaxFrameSize); > > #if QSV_HAVE_MAX_SLICE_SIZE > > @@ -865,13 +867,6 @@ static int init_video_param(AVCodecContext > *avctx, > > QSVEncContext *q) > > > > #if QSV_HAVE_CO2 > > if (avctx->codec_id == AV_CODEC_ID_H264) { > > - if (q->int_ref_type >= 0) > > - q->extco2.IntRefType = q->int_ref_type; > > - if (q->int_ref_cycle_size >= 0) > > - q->extco2.IntRefCycleSize = q->int_ref_cycle_size; > > - if (q->int_ref_qp_delta != INT16_MIN) > > - q->extco2.IntRefQPDelta = q->int_ref_qp_delta; > > - > > if (q->bitrate_limit >= 0) > > q->extco2.BitrateLimit = q->bitrate_limit ? > > MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; > > if (q->mbbrc >= 0) > > @@ -900,6 +895,12 @@ static int init_video_param(AVCodecContext > *avctx, > > QSVEncContext *q) > > q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : > > MFX_CODINGOPTION_OFF; > > if (q->max_frame_size >= 0) > > q->extco2.MaxFrameSize = q->max_frame_size; > > + if (q->int_ref_type >= 0) > > + q->extco2.IntRefType = q->int_ref_type; > > + if (q->int_ref_cycle_size >= 0) > > + q->extco2.IntRefCycleSize = q->int_ref_cycle_size; > > + if (q->int_ref_qp_delta != INT16_MIN) > > + q->extco2.IntRefQPDelta = q->int_ref_qp_delta; > > #if QSV_HAVE_MAX_SLICE_SIZE > > if (q->max_slice_size >= 0) > > q->extco2.MaxSliceSize = q->max_slice_size; > > @@ -973,6 +974,10 @@ static int init_video_param(AVCodecContext > *avctx, > > QSVEncContext *q) > > av_log(avctx, AV_LOG_WARNING, > > "Please set max_b_frames(-bf) to 0 to enable P- > > pyramid\n"); > > } > > +#endif > > +#if QSV_VERSION_ATLEAST(1, 16) > > + if (q->int_ref_cycle_dist >= 0) > > + q->extco3.IntRefCycleDist = q->int_ref_cycle_dist; > > #endif > > } > > > > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h > > index 65f035045c..5fa0b6f5ba 100644 > > --- a/libavcodec/qsvenc.h > > +++ b/libavcodec/qsvenc.h > > @@ -195,6 +195,7 @@ typedef struct QSVEncContext { > > int int_ref_type; > > int int_ref_cycle_size; > > int int_ref_qp_delta; > > + int int_ref_cycle_dist; > > int recovery_point_sei; > > > > int repeat_pps; > > diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c > > index 9f127607b7..bec3633268 100644 > > --- a/libavcodec/qsvenc_h264.c > > +++ b/libavcodec/qsvenc_h264.c > > @@ -126,13 +126,16 @@ static const AVOption options[] = { > > { "4x" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = > > MFX_LOOKAHEAD_DS_4x }, INT_MIN, INT_MAX, VE, > > "look_ahead_downsampling" }, > > #endif > > > > - { "int_ref_type", "Intra refresh > > type", OFFSET(qsv.int_ref_type), > > AV_OPT_TYPE_INT, { .i64 = -1 }, -1, UINT16_MAX, VE, "int_ref_type" }, > > + { "int_ref_type", "Intra refresh type. B frames should be set to > > 0.", OFFSET(qsv.int_ref_type), AV_OPT_TYPE_INT, { .i64 = -1 > > }, -1, UINT16_MAX, VE, "int_ref_type" }, > > { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .flags = VE, > > "int_ref_type" }, > > { "vertical", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .flags = VE, > > "int_ref_type" }, > > + { "horizontal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, .flags = > > VE, "int_ref_type" }, > > { "int_ref_cycle_size", "Number of frames in the intra refresh > > cycle", OFFSET(qsv.int_ref_cycle_size), AV_OPT_TYPE_INT, { .i64 = > > -1 }, -1, UINT16_MAX, VE }, > > { "int_ref_qp_delta", "QP difference for the refresh > > MBs", OFFSET(qsv.int_ref_qp_delta), AV_OPT_TYPE_INT, { > > .i64 = INT16_MIN }, INT16_MIN, INT16_MAX, VE }, > > { "recovery_point_sei", "Insert recovery point SEI > > messages", OFFSET(qsv.recovery_point_sei), AV_OPT_TYPE_INT > > , { .i64 = -1 }, -1, 1, VE }, > > - > > +#if QSV_VERSION_ATLEAST(1, 16) > > + { "int_ref_cycle_dist", "Distance between the beginnings of the intra- > > refresh cycles in > > frames", OFFSET(qsv.int_ref_cycle_dist), AV_OPT_TYPE_INT, { .i64 = -1 }, > > -1, INT16_MAX, VE }, > > +#endif > > { "profile", NULL, OFFSET(qsv.profile), AV_OPT_TYPE_INT, { .i64 = > > MFX_PROFILE_UNKNOWN }, 0, INT_MAX, VE, "profile" }, > > { "unknown" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = > > MFX_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, VE, "profile" }, > > { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = > > MFX_PROFILE_AVC_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, > > diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c > > index 91a316f9c8..5cac141c4d 100644 > > --- a/libavcodec/qsvenc_hevc.c > > +++ b/libavcodec/qsvenc_hevc.c > > @@ -258,6 +258,15 @@ static const AVOption options[] = { > > #if QSV_VERSION_ATLEAST(1, 26) > > { "transform_skip", "Turn this option ON to enable > > transformskip", OFFSET(qsv.transform_skip), AV_OPT_TYPE_INT, { > > .i64 = -1}, -1, 1, VE}, > > #endif > > + { "int_ref_type", "Intra refresh type. B frames should be set to > > 0", OFFSET(qsv.int_ref_type), AV_OPT_TYPE_INT, { .i64 = -1 > > }, -1, UINT16_MAX, VE, "int_ref_type" }, > > + { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .flags = VE, > > "int_ref_type" }, > > + { "vertical", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .flags = VE, > > "int_ref_type" }, > > + { "horizontal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, .flags = > > VE, "int_ref_type" }, > > + { "int_ref_cycle_size", "Number of frames in the intra refresh > > cycle", OFFSET(qsv.int_ref_cycle_size), AV_OPT_TYPE_INT, { .i64 = > > -1 }, -1, UINT16_MAX, VE }, > > + { "int_ref_qp_delta", "QP difference for the refresh > > MBs", OFFSET(qsv.int_ref_qp_delta), AV_OPT_TYPE_INT, { > > .i64 = INT16_MIN }, INT16_MIN, INT16_MAX, VE }, > > +#if QSV_VERSION_ATLEAST(1, 16) > > + { "int_ref_cycle_dist", "Distance between the beginnings of the intra- > > refresh cycles in > > frames", OFFSET(qsv.int_ref_cycle_dist), AV_OPT_TYPE_INT, { .i64 = -1 }, > > -1, INT16_MAX, VE }, > > +#endif > > > > { NULL }, > > }; > _______________________________________________ > 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". _______________________________________________ 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".