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 2B27F40C1C for ; Tue, 8 Mar 2022 14:56:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CCA668B0D3; Tue, 8 Mar 2022 16:56:08 +0200 (EET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B403968ADF2 for ; Tue, 8 Mar 2022 16:56:01 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646751366; x=1678287366; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=CNkN3sQPUOLUqZ5V3lW3He6dbPK9Vg/+STIYJChVFl0=; b=e2BR4UtxFi+YVUe/WL2zTWWz0giuFoDLd/Rn9/rpQrOQm19zXhGG8HJc wKRBpw3adhpZIMnlAliqWy7DuVrxffHdbJCJ6Bgz7XCZ/5LYwxKZ2cELd 0ji+cSfBxuaJqMsU8YpL9iANhaWHjEMVoDHZQSuwwnfqSRRRobBHHZSvc ig3+1/Tvd+o66vrdomhegYc8uewDwfzQQUyyx9CDcPfH499HDABY5TcvD er/aBaNYDUsfNPqk9DYI7kVUHPLRcun81x7t/KNWS2G4PXjFjKC/jcAPd 94BesIX2pylCodd+67juwaphFe9la+etdPmOrK5MIzN/h8zShlPhJRg20 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10279"; a="253529102" X-IronPort-AV: E=Sophos;i="5.90,165,1643702400"; d="scan'208";a="253529102" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2022 06:55:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,165,1643702400"; d="scan'208";a="513131241" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga006.jf.intel.com with ESMTP; 08 Mar 2022 06:55:54 -0800 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Tue, 8 Mar 2022 06:55:54 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21 via Frontend Transport; Tue, 8 Mar 2022 06:55:54 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.170) 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.21; Tue, 8 Mar 2022 06:55:53 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m9/WvyrqmR+e2868MfMC1nDhnmRZUPPuiRUWjgXpscaFIO15XQxcQLS6RykPoEo6qgiZWyWxYEVzpH8vffx2AWfH1JDg/dPlmPVvGhEoUOEFcLP18r72Z8UHHhxtP+kqbDXh2pf8MIETRWzYz175pYF67HAIabupjpxrw5mw3UPBb3F6MFcp8ku+bwvTb21N/d2rePHEArVssCFHGykNZHOjKc6I8ozD6+VrL58ahYWFARJ+e+fcHN83K1J7tWV19xX/A4daaj7lmau/fJeYZI7VIvmlqRJAYpAxYYPisy4CiRSGSmt2cURYVFiERkDB/znKXoymJ/HqiYPGdihiqA== 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=CNkN3sQPUOLUqZ5V3lW3He6dbPK9Vg/+STIYJChVFl0=; b=WiJedGpQuuBs6/BbGz6ySVa1FNULEymTEsodE1Y+xm7QIm0HyhoPN299kpkclqQLWRHuRumPdLUZgaRmoymYWInQhAwObk2WqDlRsYYgtdNsgKKBXPeu4ABflC9THIVOKoe5E79zMEaHFtXkwZWELIa65tWRlUsapOvS3dovaYH6wrBs4j+X+xKdyMBOiqCcKFJ5ubBjTfPEY/c8bAS1ZkLttL59rlXXIreCaToWP1ZyQzcbE0Ze7uVjUu/HnZhKXNOCwAtxShveSRy/paidFuMnmJ3UP0PM4kZJgDOlDXrxAegIcwG8pTihGjV8R+f6vHCUIJkmBLIPKrAe277+7w== 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 MN2PR11MB4712.namprd11.prod.outlook.com (2603:10b6:208:264::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.17; Tue, 8 Mar 2022 14:55:52 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::7101:6a5c:456c:9fa6]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::7101:6a5c:456c:9fa6%3]) with mapi id 15.20.5038.026; Tue, 8 Mar 2022 14:55:51 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v3 4/4] vaapi_encode_h265: Query encoding block sizes and features Thread-Index: AQHYL6PwoqrNRPSra0OmcLgTtXrNCKy1mekA Date: Tue, 8 Mar 2022 14:55:51 +0000 Message-ID: References: <20220304083711.3383019-1-fei.w.wang@intel.com> <20220304083711.3383019-4-fei.w.wang@intel.com> In-Reply-To: <20220304083711.3383019-4-fei.w.wang@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: 999ed952-e8fa-4abb-ad22-08da0113bd58 x-ms-traffictypediagnostic: MN2PR11MB4712:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: /4Fym/kPZYlgycoAktjuJ/eP1gBX4xwuj8bb6kGXvNSE6H0ahXaw1VNIoWwrnScgCINydi75j0D5j0Raz981riQdsRmVfBBH6hGzuys2EorQi/61VdWUz9Iz5CGCKmNPUfXw+sKiFgduZvwn+FZZx5+HvQjXHM+/ow6+qsF8zAb4BVwKlrtJaIzPeRxqBKCSivnd4jz+XCvreWPXv6QJFonvg+LpzN+0S5D/hQcwpppU13L4lDbzu4K6iOYrY8yqtB1t8uxoZRTsklO8bb1Bv1GjFPdZg/jKbWN3JED/2SRw1A3LzcZqw17ADlmFyEkNAYp94C5+TfxP4GtLuDwILeTir2hQuzghHHn1a99zZWK0Hph7YjZuy0tafB8/QD+ch8QDqo+iqknPnkPfsTN7z9QXYIK9Uf7j/mYspnWNiTsCoOzcWez88CyXccau0WlQGGVtQhtvyyJar6WeSbUS+kw8mSUKxKDC+Ee7YAVYeTFKvWjpf2qAS27AdWLA1AN4E/3B40vofAdsZDnJm75cZUF7Ryv2dyeJWl0uFFo0RRjG7kLdBLjnFryDL3MG1uMcAze74M8kVhVRlSg3bDoN6OYwbMjibxF9ubz3oM57fzPY9ZpIvc8Wn7g3i0oQtxKk+uNbh2ggkYXo74USbgHshRLUOueddpRy4WelGDr+umqtR6XC8YbzeGeZWfm56DfGcAqE8zF46BWJGjK32zuQz7LWqWYOULnTq6iQEuN+1ESpgd2h8uy5QtjVqIhh93SSgaqaQSop5LRA8cjTgyUWjg== 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:(13230001)(366004)(4326008)(8676002)(64756008)(66446008)(66476007)(66556008)(66946007)(91956017)(76116006)(5660300002)(2906002)(6916009)(36756003)(8936002)(54906003)(38100700002)(122000001)(316002)(186003)(508600001)(6486002)(38070700005)(86362001)(71200400001)(6512007)(6506007)(82960400001)(2616005)(26005)(83380400001)(99106002)(309714004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?aVRRRlkvUitNdXBCOEtTbzFCbFdCL0RZTDFXL1JsU1gwa01wZWlnVWdPaGJa?= =?utf-8?B?ejF5WUJjR0hXQjhmTXpSM3ZEaUJsNTVMbUxISm02aUM2OURiVnZYYzFQaG9x?= =?utf-8?B?bTNaVWZ6T2prelNzbXJadzVlaUNBOCtmUFdpQ1MvYjNrckdxQ2hrT2thT2xq?= =?utf-8?B?WDVkbGs4SGxFZWk1Wmd3cFRRMUpzaEp2QUVJbW9LeVVsb3ZrUmIrb1lIeDR2?= =?utf-8?B?aTVuZWk4R1MvcEZaQzYybTBOb2xmemJreGYrd0RLbEVpQi94anRyVkplanhx?= =?utf-8?B?OW9zdy9xdk9XdlBIbDRhMWJPT202Qk5GVVZoemJJTFV4YXZuU0sxTjR0a1hY?= =?utf-8?B?WTVTK1RPT2xMMEY4azhhZ0xraGZQc1pnVG5HWFlUYmVWOVM1WGROcGN6VDlZ?= =?utf-8?B?YThUTnRhYnhIYVJrNE10ZXNpK1pGZGtMQTdObytGc3VETWhEbjB4OWdQNlZk?= =?utf-8?B?ZFlValhsZUdFRjA5am1ndFpWWUFZRmN6bkh2RVMxOEFVU3U5eDVCYmVFdU9U?= =?utf-8?B?TU9vUlJoZlRqaXMyZnV4NFF3bHhBSU5JRTFyWUZLYmNQYWxOY2kzYVlaVkxR?= =?utf-8?B?UHduMncrSU1lTmpNRkZqcDRqQm5oMGxKZzFMaXdTVG0xcWhVSUtpTmY3RG8z?= =?utf-8?B?OEgvVGd4L21DNTlDOFRqNStCa01pU0lBSFlGek1pOXVwdW9VYU1EdjU1ejRP?= =?utf-8?B?aDdWazhLK2V6b3oxTTJnQ09PSDA4YU1vT3BETFgyS0E0M0pjSGx3SXk3dTZC?= =?utf-8?B?ZE0yM2VLNTBqdDJNY0pwazU3RllRdGk5SnJqWVdBYlBzYS92NnBZTEthTzlS?= =?utf-8?B?VXdwVy9OUmJqTWkyRTQyVDZKRVpWRGd1d2MzWmJKc1lQL3Y4TVVKRjg5UVJE?= =?utf-8?B?aUpRM1IwVk84UXhCd053U0tXYTU3MmQ5RXpGdEFMRU5DTmZaem13VHFsVC9w?= =?utf-8?B?WEdjTDRQY1FtRnY0MmVQcHpYRG53dXdRNDFGU2hkZGdIcTFaZjVyZTR3ZnJp?= =?utf-8?B?dGVzVno1KzBIUjdHUHQ1Q0NOVTFKTUNlRzY5dmh4bVNOWEkrTDMwVUd3c28v?= =?utf-8?B?TjlXYUpBNlJOSkg1aDhHdnRJZG5QbzRLaHA1ajkyR25tTWF0UHhZSmF2UUY4?= =?utf-8?B?R3paZi9vaFJSNm52ci9GbVF5QlVoYi9nQW5QcUpCejZ3dGJwODllT3p6NHo4?= =?utf-8?B?OVR5bnJQTmVsVVZ4alREY2ZmYmRNRHcraFJUbFNTNzZWZ3I0bS9HK3R2NFVz?= =?utf-8?B?clpRK3lRcHFMS2J3ajhwZjdoTTV4eUV3T2MvYStEMmJoa3BOcFlGSytBUlZY?= =?utf-8?B?OElLSUJ2RGoyS3VtVHoxK2JVTkJsKzU3aS9nb1BVR2ZkUWdZS09peVlGOUE1?= =?utf-8?B?NGoxcGkyYVVhS2tTcC9QV2VZTnBiMUs1V2FjNkM2UU5ObVNaRWJMWjd2R2Rz?= =?utf-8?B?S3pDbTN4S25oUXlPL25uOUJPSExPMjVpY0hrQ2tHRFVVbFJLSFJlN0lBMFVY?= =?utf-8?B?c3pORkJZOWdUY1lHUEcxYkNTTFloY2JES2c5c1B6b05HMmE1angwdG83Ymhl?= =?utf-8?B?U0pXMkdKMWNBYWF4eFVzZVRjVjBqUEYyMXprRDBoSURhbUJDOURnSDZGeXJW?= =?utf-8?B?OGkxMTByUHROMVhRbitUY1B5d3VycHNjRXNHQVpIU3BrY2Fib01zcEJNT1R0?= =?utf-8?B?SUVLVVh3Z21xdExBeXp0TUoydytJUXBFZSt1cjEwQmh2NXpFMzArSDVYR0dH?= =?utf-8?B?eTlQU2UrZnlWMmJ1Z2FLZUNmMVJOdnBtU0FGdW1GaUwrdndhK0IwalYxbC9H?= =?utf-8?B?d2NBMXFQdDc2UEtJNHhkZTZwQmtqeURkVWJGekVXbXJ1UjJzZml4TTMvQklO?= =?utf-8?B?cjRIcEF5VEV0S2tkYTdSdjJ0YnRrMVpYSFhZbGtjNEl6U0xLZmZCQkVxUVox?= =?utf-8?B?SVJpUHpwdnJicXNNU2tnNDlzTHlTWTBSUGUvOUJYY3FoWEhObEJUNVZadVBa?= =?utf-8?B?YjFxdzR6Rmlid29KL2pldWVKSTZkcTZwNFV4a2pSWnZDMlpPOENUd2xnaDJa?= =?utf-8?B?RTkxK1dWcWE5dFZ1NEludXo2WkdEeG15MXhGWVFUTFhnb0ZhTnVFN2lTK2g4?= =?utf-8?B?T040L3JsK0Q3WExpV0ZKWTduVWhaSjdqMUcrZVV3SmNVaklqZEE4Z3V1QmpX?= =?utf-8?Q?76fCouo6JS56PWago5WWtPw=3D?= Content-ID: <79C3905DA096424B8EA871A1DCC536A9@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: 999ed952-e8fa-4abb-ad22-08da0113bd58 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2022 14:55:51.7027 (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: 43pvjbDtXyg3mcFNupzkW+g36Wg+8f0LuBxJwFl39lPQjqRptro+gR1p6rNKrsOThECV37vvpVMvSEQ5y10k+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4712 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v3 4/4] vaapi_encode_h265: Query encoding block sizes and features 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 Cc: "sw@jkqxz.net" , "Wang, Fei W" 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 Fri, 2022-03-04 at 16:37 +0800, Fei Wang wrote: > From: Mark Thompson > > Signed-off-by: Fei Wang > --- > libavcodec/vaapi_encode_h265.c | 112 +++++++++++++++++++++++++++++++-- > 1 file changed, 106 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c > index cafc860772..b9cf3209b3 100644 > --- a/libavcodec/vaapi_encode_h265.c > +++ b/libavcodec/vaapi_encode_h265.c > @@ -56,6 +56,9 @@ typedef struct VAAPIEncodeH265Context { > VAAPIEncodeContext common; > > // Encoder features. > + uint32_t va_features; > + // Block size info. > + uint32_t va_bs; > uint32_t ctu_size; > uint32_t min_cb_size; > > @@ -427,9 +430,9 @@ static int > vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) > vps->vps_max_latency_increase_plus1[i]; > } > > - // These have to come from the capabilities of the encoder. We have no > - // way to query them, so just hardcode parameters which work on the Intel > - // driver. > + // These values come from the capabilities of the first encoder > + // implementation in the i965 driver on Intel Skylake. They may > + // fail badly with other platforms or drivers. > // CTB size from 8x8 to 32x32. > sps->log2_min_luma_coding_block_size_minus3 = 0; > sps->log2_diff_max_min_luma_coding_block_size = 2; > @@ -447,6 +450,42 @@ static int > vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) > > sps->pcm_enabled_flag = 0; > > +// update sps setting according to queried result > +#if VA_CHECK_VERSION(1, 13, 0) > + if (priv->va_features) { > + VAConfigAttribValEncHEVCFeatures features = { .value = priv- > >va_features }; > + > + // Enable feature if get queried result is VA_FEATURE_SUPPORTED | > VA_FEATURE_REQUIRED > + sps->amp_enabled_flag = > + !!features.bits.amp; > + sps->sample_adaptive_offset_enabled_flag = > + !!features.bits.sao; > + sps->sps_temporal_mvp_enabled_flag = > + !!features.bits.temporal_mvp; > + sps->pcm_enabled_flag = > + !!features.bits.pcm; > + } > + > + if (priv->va_bs) { > + VAConfigAttribValEncHEVCBlockSizes bs = { .value = priv->va_bs }; > + sps->log2_min_luma_coding_block_size_minus3 = > + ff_ctz(priv->min_cb_size) - 3; > + sps->log2_diff_max_min_luma_coding_block_size = > + ff_ctz(priv->ctu_size) - ff_ctz(priv->min_cb_size); > + > + sps->log2_min_luma_transform_block_size_minus2 = > + bs.bits.log2_min_luma_transform_block_size_minus2; > + sps->log2_diff_max_min_luma_transform_block_size = > + bs.bits.log2_max_luma_transform_block_size_minus2 - > + bs.bits.log2_min_luma_transform_block_size_minus2; > + > + sps->max_transform_hierarchy_depth_inter = > + bs.bits.max_max_transform_hierarchy_depth_inter; > + sps->max_transform_hierarchy_depth_intra = > + bs.bits.max_max_transform_hierarchy_depth_intra; > + } > +#endif > + > // STRPSs should ideally be here rather than defined individually in > // each slice, but the structure isn't completely fixed so for now > // don't bother. > @@ -539,6 +578,23 @@ static int > vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) > pps->cu_qp_delta_enabled_flag = (ctx->va_rc_mode != VA_RC_CQP); > pps->diff_cu_qp_delta_depth = 0; > > +// update pps setting according to queried result > +#if VA_CHECK_VERSION(1, 13, 0) > + if (priv->va_features) { > + VAConfigAttribValEncHEVCFeatures features = { .value = priv- > >va_features }; > + if (ctx->va_rc_mode != VA_RC_CQP) > + pps->cu_qp_delta_enabled_flag = > + !!features.bits.cu_qp_delta; > + > + pps->transform_skip_enabled_flag = > + !!features.bits.transform_skip; > + // set diff_cu_qp_delta_depth as its max value if cu_qp_delta > enabled. Otherwise > + // 0 will make cu_qp_delta invalid. > + if (pps->cu_qp_delta_enabled_flag) > + pps->diff_cu_qp_delta_depth = sps- > >log2_diff_max_min_luma_coding_block_size; > + } > +#endif > + > if (ctx->tile_rows && ctx->tile_cols) { > int uniform_spacing; > > @@ -640,8 +696,8 @@ static int > vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) > > .coded_buf = VA_INVALID_ID, > > - .collocated_ref_pic_index = 0xff, > - > + .collocated_ref_pic_index = sps->sps_temporal_mvp_enabled_flag ? > + 0 : 0xff, > .last_picture = 0, > > .pic_init_qp = pps->init_qp_minus26 + 26, > @@ -674,6 +730,8 @@ static int > vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx) > .entropy_coding_sync_enabled_flag = pps- > >entropy_coding_sync_enabled_flag, > .loop_filter_across_tiles_enabled_flag = > pps->loop_filter_across_tiles_enabled_flag, > + .pps_loop_filter_across_slices_enabled_flag = > + pps->pps_loop_filter_across_slices_enabled_flag, > .scaling_list_data_present_flag = (sps- > >sps_scaling_list_data_present_flag | > pps- > >pps_scaling_list_data_present_flag), > .screen_content_flag = 0, > @@ -1001,10 +1059,13 @@ static int > vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, > sh->num_long_term_sps = 0; > sh->num_long_term_pics = 0; > > + // when this flag is not present, it is inerred to 1. > + sh->collocated_from_l0_flag = 1; > sh->slice_temporal_mvp_enabled_flag = > sps->sps_temporal_mvp_enabled_flag; > if (sh->slice_temporal_mvp_enabled_flag) { > - sh->collocated_from_l0_flag = sh->slice_type == HEVC_SLICE_B; > + if (sh->slice_type == HEVC_SLICE_B) > + sh->collocated_from_l0_flag = 1; > sh->collocated_ref_idx = 0; > } > > @@ -1105,6 +1166,45 @@ static av_cold int > vaapi_encode_h265_get_encoder_caps(AVCodecContext *avctx) > VAAPIEncodeContext *ctx = avctx->priv_data; > VAAPIEncodeH265Context *priv = avctx->priv_data; > > +#if VA_CHECK_VERSION(1, 13, 0) > + { > + VAConfigAttribValEncHEVCBlockSizes block_size; > + VAConfigAttrib attr; > + VAStatus vas; > + > + attr.type = VAConfigAttribEncHEVCFeatures; > + vas = vaGetConfigAttributes(ctx->hwctx->display, ctx->va_profile, > + ctx->va_entrypoint, &attr, 1); > + if (vas != VA_STATUS_SUCCESS) { > + av_log(avctx, AV_LOG_WARNING, "Failed to query encoder " > + "features, using guessed defaults.\n"); > + } else if (attr.value == VA_ATTRIB_NOT_SUPPORTED) { > + av_log(avctx, AV_LOG_WARNING, "Driver does not advertise " > + "encoder features, using guessed defaults.\n"); > + } else { > + priv->va_features = attr.value; > + } > + > + attr.type = VAConfigAttribEncHEVCBlockSizes; > + vas = vaGetConfigAttributes(ctx->hwctx->display, ctx->va_profile, > + ctx->va_entrypoint, &attr, 1); > + if (vas != VA_STATUS_SUCCESS) { > + av_log(avctx, AV_LOG_WARNING, "Failed to query encoder " > + "block size, using guessed defaults.\n"); It would be better to handle VA error in the same way in the same patchset. patch 1/4 returns AVERROR_EXTERNAL when vaGetConfigAttributes doesn't return VA_STATUS_SUCCESS Thanks Haihao > + } else if (attr.value == VA_ATTRIB_NOT_SUPPORTED) { > + av_log(avctx, AV_LOG_WARNING, "Driver does not advertise > + "encoder block size, using guessed defaults.\n"); > + } else { > + priv->va_bs = block_size.value = attr.value; > + > + priv->ctu_size = > + 1 << block_size.bits.log2_max_coding_tree_block_size_minus3 + > 3; > + priv->min_cb_size = > + 1 << block_size.bits.log2_min_luma_coding_block_size_minus3 + > 3; > + } > + } > +#endif > + > if (!priv->ctu_size) { > priv->ctu_size = 32; > priv->min_cb_size = 16; _______________________________________________ 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".