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 805E940E7A for ; Mon, 11 Apr 2022 03:51:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8706B68B367; Mon, 11 Apr 2022 06:51:06 +0300 (EEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B38A068ACAB for ; Mon, 11 Apr 2022 06:50: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=1649649064; x=1681185064; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=SzOv6sRHn1ZwWew4ZoCTAMJC4cp3fVDMBBGi+xTaFgQ=; b=Jb+m/UoYIEyLuvqF/mtZ74av/HFrb0dXIi9D684i4miO2SD7QCl2i0Dz Vx0kz+zYeYvA/8Ib7NljO6MMgOXS6hktIvKDoRLSNOdyB0S+6tRhgPumt HJ/RbeCBZFtOpKWcZj9oSAMNojJvXdevPq/wzCvbCj60ux0o2kGVmSVd9 UE5QGFECxUrYX41b8ah7/seHxp86zbgEUHqDi0HUog4hKbLdHPf+dOYmu EDWyHxPYQRudmhFC4iqWKyTsetehRlu9NsjbiG5/M2H6kmIgsNnjJG79A ICpB/kp83Z89Cfy7Fm4tSHSmqhIu7BdMeP4Y0ArnFBTnDSWmk8qh4lxv0 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10313"; a="262205713" X-IronPort-AV: E=Sophos;i="5.90,250,1643702400"; d="scan'208";a="262205713" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2022 20:50:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,250,1643702400"; d="scan'208";a="723798093" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga005.jf.intel.com with ESMTP; 10 Apr 2022 20:50:57 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) 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.27; Sun, 10 Apr 2022 20:50:57 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Sun, 10 Apr 2022 20:50:56 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.172) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Sun, 10 Apr 2022 20:50:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l5KOeZQpODNX2SjI4cBy3DBBeY1yzdlnpo6eS0vcYlrTK6X96XPy2Ttbpq57nop3puKFNE3k/TBPjTkUri0ndwLYMM8MJyiCODlOXotiLCvK173J9K/7nfE6235k6pEcafQbJrm/KF/3hTmLMdd0sJ6bCTJJJMudPOLPCHjXyZAPitPJW2LmBmjnCt6u0c017NnCVL2++S0AuJGtV7dwhq6DQgO03JyZKGT8ydhqzV3WCGj+ccXkaosis8xgkqllKyPovIH7g16cNYmEcVGauehA7+U+kP+vq6URB1MWgXATbFM3tU5sudDtLrn0Hry/wpRr9WcUCZRHP3DB2sMFgw== 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=SzOv6sRHn1ZwWew4ZoCTAMJC4cp3fVDMBBGi+xTaFgQ=; b=nL+PzWWsCD7PV71BIurFKIhQiQf3j8kTHUjCVKoYrJjJUSCrg9WxqhqP5xVUMIrHd+PmKDlB5+rsDiUJMVAq4PpaWQpPLa+CzIbMZpvj3ZYG+H3BnvQTEft1m5VO73Zi1CCjzkhPn2FS/mCpLiCaWSWUyunpvy5KSTtUImms1K5xVwO5YODhxtRXerCnG/OVubnY73Vzwrc9Qln5617c1jxYNfZUBZubF95TKrQxkWNVSukj33fOF6us7tXGZsG4/DsoUUOpjQCd5Lx9lxdeDYOmCGTmy3DlRvaNvG6bUO9Bd1dkXeOb63JKBNcuEHTm3cDTR0gFTKJSXZsnO9LAdA== 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 SN6PR11MB3070.namprd11.prod.outlook.com (2603:10b6:805:d4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Mon, 11 Apr 2022 03:50:49 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::6534:444c:a75d:4bf2]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::6534:444c:a75d:4bf2%7]) with mapi id 15.20.5144.029; Mon, 11 Apr 2022 03:50:49 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v5 1/4] lavc/vaapi_encode_h265: Add GPB frame support for hevc_vaapi Thread-Index: AQHYOct35cz29vR6DUOqTaVS4Zv1TKzWYfoAgAxL0ACAB41GgA== Date: Mon, 11 Apr 2022 03:50:49 +0000 Message-ID: <4527b6e391e26c4f30cec9c7914076244a4f6d2e.camel@intel.com> References: <20220317064152.430212-1-fei.w.wang@intel.com> <35d1fb2cbaa86f7e9cc09efdc07daac845e68fbb.camel@intel.com> In-Reply-To: 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: 8aa45e2d-d043-47ee-8dce-08da1b6e77c9 x-ms-traffictypediagnostic: SN6PR11MB3070: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: ER3dBGgQTn0GDfIU+L01l6ipxN8QIXC1z6t6W8f9yD4d0epkqb6OgCHEUZ0lO7077bxudJAz/+Q6VbpRvcaJHr3QjKipPrY1zSxtFPYVemRKtkuxFbIHwFkLBj5ClEjFbUGe/D+FcNFCflB3hyXGLp/eMrLVM4lloe23XrzNYVwhG1SeBMkwr8J+LA1uP4qMuBlzLpjg8R+FPbHozmHUqx0VCmJIUxlpr8iYH6bEkkOeVWcW6z0ALG5KZqYWTTYgy6VXlna94xFU81EqJ3soQNSSXLsz+LktsTpdbJHBn0zVSM4WVw1vKvIiU07ZBY6vSxmomTNYAJzsb8rqAi1zN9prPKcuaZQ9UK0o/xo7GKNhylTbwFjndDUu4VECUbaCJj7inJOeJfyqTsJFF5aDgPToklkIAK8T9c8jSiVGEQRrQ7Ai5HZYe3bS/hPO5WD1DGX0Bl3rCeSY17Vb3OOxiRkZgHmiDkrFj4jSF4yxh2s//5ABone+W6Menj7E4+kyH/IXjft6MTukeBEe5kDqeNu9ampOn4FJx+s905RV+zc3odKjXUFUWLgLpgJtH9wBN+jccCZB1dapBthrlhA18tk5mT5SZvpy1mXjQC3q4+Rj4xNeYNjDkn+jxa7tZh5Gk2nqu4E6kt45LJaE8kK7F6cfeCxJv50C/1FPmOe/5beeqBy1TcppmQitJ0yhRoBih1ffUOtb5Z8oVOsJUp9RXNP50Yhz8vd47Bm/RPxHEN4= 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)(71200400001)(6486002)(6916009)(54906003)(107886003)(2616005)(36756003)(508600001)(83380400001)(66446008)(76116006)(66946007)(4326008)(8676002)(64756008)(66556008)(91956017)(186003)(86362001)(38100700002)(8936002)(5660300002)(316002)(66476007)(38070700005)(6512007)(6506007)(26005)(122000001)(2906002)(82960400001)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?LzJhaEtuSkRpMXJkZElBNUlzVEtpMkJXUWk3dXA5QUtrOU9WcWxHaDQyS2cr?= =?utf-8?B?bXRlSC9ZOGNBQ2ZBN1hJbkQrV2Ywc2dUd2hTWVFLRFdjS1ZtZ1VWTmVjbEF4?= =?utf-8?B?azNBdHlGVTNkZ2drWkhoZHZuN0ZlUHpqOWlVdEJwZCs5WDIxdWdndmg3ZmJs?= =?utf-8?B?byt6RXdJV0NvNVk0WVNEdUwwbXNUR2tpVVdYdHlPSnJZVFhoa29nR3FBaTFB?= =?utf-8?B?dENaWm45UVJ6TmhuRThWeGJiL0cxdkM0Y21wWktPMlMzZytXVU9oWG5FOWln?= =?utf-8?B?dXI2YVpQREk1d1k5UC9pdXpPdEJWVDNnaGxZdXJqMjg4VGxUMmFUVGplTGlk?= =?utf-8?B?dkxGbjlGQTJMSjFVY3FvOFdwSkFxSnYrQWQ4U0wydG5kTTh3eXRieElIVlNa?= =?utf-8?B?MGVjSFNycUpwV01ONGtqZHZZRGhtbTBmL3Y4UThCUXg5Q3JoSGgxTTk5Mkp6?= =?utf-8?B?WG5oZ2JTdlBnWnR6bE52a3U1bmIvSXk0c2NOY0E2ZzlEMzg1ZHNLUnNURzdx?= =?utf-8?B?N2FsSDZKZ0ZOazVVT3U1UTJtSmN0UVlTZUIxbXhkNm5pVDNJazY1MzJZbEJ1?= =?utf-8?B?SEFmMWVjcWxiNG92ZWtRUi9HMThkY3Y2czBiUGpMdThjSmo1a1JpcDRGV0Fu?= =?utf-8?B?bzQxUW1HSG1YZ25qeTdPRFEzWEN2b1IxaExQUVp4STdVUVNwcGlBQmpiYXVk?= =?utf-8?B?VFFZOUk1NE9ZMlFTUUY3bnY1aHhHc20yVVRacnFhZWp2ZnJhL2EwVkJjUnVy?= =?utf-8?B?R2xSSnZ1VmoyK2xVL0QzNGdmckV0L1ROa2UrMFpOT1hjMmZwbjB1VEVRWllq?= =?utf-8?B?RlRNcEduaUt4UEIxVWoyQU5sQldONWxUVkh2UDU0UTZaVitWVGszL3QvZ3ho?= =?utf-8?B?a0VaVWVMYVZORjFnN2VGbnlqNlppK01uQS93dkhRM2t2RmtJcEZja2s4bFhh?= =?utf-8?B?eHZGeVNiaGhjQWhKU0YwbWh5bDAwR1p4L0c0QlJTT09yUUxMMEhxdGtzbnJ6?= =?utf-8?B?dHlNcTU0VXZpUzJsMUcxWlU5UXduMWdDSHVkTkIxdjlNbG9JMnNOYVUreGwr?= =?utf-8?B?V2xaT2pXeTcwWVZrSS91UHcxcUEzUWNueXJRbmtuYW5wRmw2VFZ0WDBFd2dV?= =?utf-8?B?YW9KUThudVpPYVlSRVRrTlFGRm15QzI3aTA4S0owQVVxdWh4c1YxRUlpeGUr?= =?utf-8?B?R0FsTE01SHZIOTRKU2FJRGVVQUxjQnM1TzBOVEk3WGJERnB6UjAxM01EdmVy?= =?utf-8?B?NnpmMmVXM2dEeStHM1JCckxaUnN6ZTd4aVBQaGdQdVZIZkd2elVKUXNIcmNK?= =?utf-8?B?RXltUXRUV0pGcDhCVEZ6dGdGR2Eyd2xDZVcyaGFvQ2xoam4xNnJzTjFXNjVN?= =?utf-8?B?RTV0OVVPY3lpZjVmSVdRNTZIZXVzWG9VNEQ0K0YrZGs2VmlXdzErQWh3OUhI?= =?utf-8?B?QXFFdjJGNXZlZk4xRDg5UFgwZi9UcU9WbGkvMnVhQTIxTW1WckI0QkhEclQv?= =?utf-8?B?MEZVK1pUZ2tmTHFNVmJiN1NLNnZHcmpjRWhoTXFhaDJqTVQxMFIvQ0d5R3RP?= =?utf-8?B?K0pDdFJQMGJhZ3dUQ0tCelJYbEFrUjdESXZuMUloelZNRmZhN092eFZNWEVy?= =?utf-8?B?bU1WL3RCM0ZodE8wd25iRzJVN3BPYUZIL2RXaitkMG92ZXl6RG4vT1RZZnZj?= =?utf-8?B?YVpYR2hVTU1KZU8vTG05ZGJhaldFLythK1Jtd2ljc1NGLzVNaEdIY0ZNdjdE?= =?utf-8?B?Q3Q1NTd4TWVGaTdacG10TSs1ZTJKbFA1V2dWd0VFMCtxbkZ2cEJZeFUzd3ow?= =?utf-8?B?QTNaMWgyb3VkWjF5WFhLS0ppNFdNaXMwMHVlL2MzbUFkQzNyYVNidU12Qmha?= =?utf-8?B?eUo3US9ZSlZITUs5Nm9KRXF5UGZPaEZhazZqZXE3Ky9UNHljdWpLc2FwTDJS?= =?utf-8?B?QzVIait3ZkFVYmtIMkhmUTRrTXhyR1N3TS9vaFRQSlg2UWsvS3BZUkJ6YktB?= =?utf-8?B?eU5JVC8xQlVsZ0xKMi8xNFVaRS9Bc1d1M0RBUjdSVlRweGFSTWZ4M2Fyc0ln?= =?utf-8?B?UXp0dDVVclQ5alpTZlJhSWp6OVVhSmJBZXhwQ29VTmNHSFl2aEJaaFp3N3Qw?= =?utf-8?B?Z0MwMTZqOEgxb0F5MGVpSkZxL1pJZHhRZUlEdFhOYTE3Y2M1ZGhwMkNpTVRt?= =?utf-8?B?dlpQMENkM0l0QmVoeEROU3o4Qkh3OVhDOVliZTllUjhYSDZKMlFvTXFsWWlk?= =?utf-8?B?eWNxdlp3R3pUYSswU1lXNkxXb1Zoby9EZjhqM0M2cVM1UExDQVlodG0wOEVq?= =?utf-8?B?R2w5UWtJYWFITThHR2RIRnFGT2F2eUppUXk5SkYzK0h6a2xpZXpDclloZS9k?= =?utf-8?Q?14/NjcpHnqc9NNkE=3D?= Content-ID: <5737B5E830033D44949B167F92295453@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: 8aa45e2d-d043-47ee-8dce-08da1b6e77c9 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2022 03:50:49.6084 (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: enEs7LHmLxeLM2/Kj09zEpLSOcpvtmShhROW7Hg2WTYRzR7kwJxmHkonlqx/r6Kh7c0lyZY/FACoaKpArHRXlA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3070 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v5 1/4] lavc/vaapi_encode_h265: Add GPB frame support for hevc_vaapi 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: "Wang, Fei W" , "linjie.fu@intel.com" 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 Wed, 2022-04-06 at 08:31 +0000, Xiang, Haihao wrote: > On Tue, 2022-03-29 at 12:44 +0000, Xiang, Haihao wrote: > > On Thu, 2022-03-17 at 14:41 +0800, Fei Wang wrote: > > > From: Linjie Fu > > > > > > Use GPB frames to replace regular P/B frames if backend driver does not > > > support it. > > > > > > - GPB: > > > Generalized P and B picture. Regular P/B frames replaced by B > > > frames with previous-predict only, L0 == L1. Normal B frames > > > still have 2 different ref_lists and allow bi-prediction > > > > > > Signed-off-by: Linjie Fu > > > Signed-off-by: Fei Wang > > > --- > > > update: > > > 1. fall back logic that implemented in v3. > > > 2. refine debug message. > > > > > > libavcodec/vaapi_encode.c | 67 +++++++++++++++++++++++++++++++--- > > > libavcodec/vaapi_encode.h | 1 + > > > libavcodec/vaapi_encode_h265.c | 15 ++++++++ > > > 3 files changed, 78 insertions(+), 5 deletions(-) > > > > > > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c > > > index 3bf379b1a0..081eb475a3 100644 > > > --- a/libavcodec/vaapi_encode.c > > > +++ b/libavcodec/vaapi_encode.c > > > @@ -1827,6 +1827,7 @@ static av_cold int > > > vaapi_encode_init_gop_structure(AVCodecContext *avctx) > > > VAStatus vas; > > > VAConfigAttrib attr = { VAConfigAttribEncMaxRefFrames }; > > > uint32_t ref_l0, ref_l1; > > > + int prediction_pre_only; > > > > > > vas = vaGetConfigAttributes(ctx->hwctx->display, > > > ctx->va_profile, > > > @@ -1845,6 +1846,51 @@ static av_cold int > > > vaapi_encode_init_gop_structure(AVCodecContext *avctx) > > > ref_l1 = attr.value >> 16 & 0xffff; > > > } > > > > > > + ctx->p_to_gpb = 0; > > > + prediction_pre_only = 0; > > > + > > > +#if VA_CHECK_VERSION(1, 9, 0) > > > + if (!(ctx->codec->flags & FLAG_INTRA_ONLY || > > > + avctx->gop_size <= 1)) { > > > + attr = (VAConfigAttrib) { VAConfigAttribPredictionDirection }; > > > + 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 prediction > > > direction " > > > + "attribute: %d (%s).\n", vas, vaErrorStr(vas)); > > > + return AVERROR_EXTERNAL; > > > + } else if (attr.value == VA_ATTRIB_NOT_SUPPORTED) { > > > + av_log(avctx, AV_LOG_VERBOSE, "Driver does not report any > > > additional " > > > + "prediction constraints.\n"); > > > + } else { > > > + if (((ref_l0 > 0 || ref_l1 > 0) && !(attr.value & > > > VA_PREDICTION_DIRECTION_PREVIOUS)) || > > > + ((ref_l1 == 0) && (attr.value & > > > (VA_PREDICTION_DIRECTION_FUTURE | VA_PREDICTION_DIRECTION_BI_NOT_EMPTY)))) > > > { > > > + av_log(avctx, AV_LOG_ERROR, "Driver report incorrect > > > prediction " > > > + "direction attribute.\n"); > > > + return AVERROR_EXTERNAL; > > > + } > > > + > > > + if (!(attr.value & VA_PREDICTION_DIRECTION_FUTURE)) { > > > + if (ref_l0 > 0 && ref_l1 > 0) { > > > + prediction_pre_only = 1; > > > + av_log(avctx, AV_LOG_VERBOSE, "Driver only support > > > same > > > reference " > > > + "lists for B-frames.\n"); > > > + } > > > + } > > > + > > > + if (attr.value & VA_PREDICTION_DIRECTION_BI_NOT_EMPTY) { > > > + if (ref_l0 > 0 && ref_l1 > 0) { > > > + ctx->p_to_gpb = 1; > > > + av_log(avctx, AV_LOG_VERBOSE, "Driver does not > > > support > > > P- > > > frames, " > > > + "replacing them with B-frames.\n"); > > > + } > > > + } > > > + } > > > + } > > > +#endif > > > + > > > if (ctx->codec->flags & FLAG_INTRA_ONLY || > > > avctx->gop_size <= 1) { > > > av_log(avctx, AV_LOG_VERBOSE, "Using intra frames only.\n"); > > > @@ -1854,15 +1900,26 @@ static av_cold int > > > vaapi_encode_init_gop_structure(AVCodecContext *avctx) > > > "reference frames.\n"); > > > return AVERROR(EINVAL); > > > } else if (!(ctx->codec->flags & FLAG_B_PICTURES) || > > > - ref_l1 < 1 || avctx->max_b_frames < 1) { > > > - av_log(avctx, AV_LOG_VERBOSE, "Using intra and P-frames " > > > - "(supported references: %d / %d).\n", ref_l0, ref_l1); > > > + ref_l1 < 1 || avctx->max_b_frames < 1 || > > > + prediction_pre_only) { > > > + if (ctx->p_to_gpb) > > > + av_log(avctx, AV_LOG_VERBOSE, "Using intra and B-frames " > > > + "(supported references: %d / %d).\n", > > > + ref_l0, ref_l1); > > > + else > > > + av_log(avctx, AV_LOG_VERBOSE, "Using intra and P-frames " > > > + "(supported references: %d / %d).\n", ref_l0, ref_l1); > > > ctx->gop_size = avctx->gop_size; > > > ctx->p_per_i = INT_MAX; > > > ctx->b_per_p = 0; > > > } else { > > > - av_log(avctx, AV_LOG_VERBOSE, "Using intra, P- and B-frames " > > > - "(supported references: %d / %d).\n", ref_l0, ref_l1); > > > + if (ctx->p_to_gpb) > > > + av_log(avctx, AV_LOG_VERBOSE, "Using intra and B-frames " > > > + "(supported references: %d / %d).\n", > > > + ref_l0, ref_l1); > > > + else > > > + av_log(avctx, AV_LOG_VERBOSE, "Using intra, P- and B-frames " > > > + "(supported references: %d / %d).\n", ref_l0, ref_l1); > > > ctx->gop_size = avctx->gop_size; > > > ctx->p_per_i = INT_MAX; > > > ctx->b_per_p = avctx->max_b_frames; > > > diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h > > > index b41604a883..61c5615eb8 100644 > > > --- a/libavcodec/vaapi_encode.h > > > +++ b/libavcodec/vaapi_encode.h > > > @@ -328,6 +328,7 @@ typedef struct VAAPIEncodeContext { > > > int idr_counter; > > > int gop_counter; > > > int end_of_stream; > > > + int p_to_gpb; > > > > > > // Whether the driver supports ROI at all. > > > int roi_allowed; > > > diff --git a/libavcodec/vaapi_encode_h265.c > > > b/libavcodec/vaapi_encode_h265.c > > > index e1dc53dfa9..ea45893508 100644 > > > --- a/libavcodec/vaapi_encode_h265.c > > > +++ b/libavcodec/vaapi_encode_h265.c > > > @@ -886,6 +886,7 @@ static int > > > vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, > > > VAAPIEncodePicture *pic, > > > VAAPIEncodeSlice *slice) > > > { > > > + VAAPIEncodeContext *ctx = avctx->priv_data; > > > VAAPIEncodeH265Context *priv = avctx->priv_data; > > > VAAPIEncodeH265Picture *hpic = pic->priv_data; > > > const H265RawSPS *sps = &priv->raw_sps; > > > @@ -908,6 +909,9 @@ static int > > > vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, > > > > > > sh->slice_type = hpic->slice_type; > > > > > > + if (sh->slice_type == HEVC_SLICE_P && ctx->p_to_gpb) > > > + sh->slice_type = HEVC_SLICE_B; > > > + > > > sh->slice_pic_order_cnt_lsb = hpic->pic_order_cnt & > > > (1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4)) - 1; > > > > > > @@ -1066,6 +1070,9 @@ static int > > > vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, > > > av_assert0(pic->type == PICTURE_TYPE_P || > > > pic->type == PICTURE_TYPE_B); > > > vslice->ref_pic_list0[0] = vpic->reference_frames[0]; > > > + if (ctx->p_to_gpb && pic->type == PICTURE_TYPE_P) > > > + // Reference for GPB B-frame, L0 == L1 > > > + vslice->ref_pic_list1[0] = vpic->reference_frames[0]; > > > } > > > if (pic->nb_refs >= 2) { > > > // Forward reference for B-frame. > > > @@ -1073,6 +1080,14 @@ static int > > > vaapi_encode_h265_init_slice_params(AVCodecContext *avctx, > > > vslice->ref_pic_list1[0] = vpic->reference_frames[1]; > > > } > > > > > > + if (pic->type == PICTURE_TYPE_P && ctx->p_to_gpb) { > > > + vslice->slice_type = HEVC_SLICE_B; > > > + for (i = 0; i < FF_ARRAY_ELEMS(vslice->ref_pic_list0); i++) { > > > + vslice->ref_pic_list1[i].picture_id = vslice- > > > > ref_pic_list0[i].picture_id; > > > > > > + vslice->ref_pic_list1[i].flags = vslice- > > > > ref_pic_list0[i].flags; > > > > > > + } > > > + } > > > + > > > return 0; > > > } > > > > Hi Mark, > > > > The new patchset version LGTM and works well, do you have any comment? > > > > Ping, I'll merge this patchset in a few days if no more comments. > Applied, thx -Haihao _______________________________________________ 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".