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 CA7B14292F for ; Wed, 6 Apr 2022 08:31:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55D9E68B24D; Wed, 6 Apr 2022 11:31:41 +0300 (EEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BF5168A351 for ; Wed, 6 Apr 2022 11:31:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649233898; x=1680769898; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=NzQzqq6gusmy31IDUyDoit7cKohu9oCDLapOWAeHfho=; b=VQ7WBx0fjUNrD1qQtiGZ92GYL+SHZ9ZSxHnb7eCTAIqTZuCKzUzR9D32 hU/EiZyk7HGwezkQaV8FQmpjI7s9BMetZOP/1ilq0ZIV7EmmsA0ONx5zu XE/4vv5o/jWre8Z7fCmyPRVMxW7ipIl+vO2L1cpQb0fMO2oFmH+y6HQFz FBUnGZSEl5ntmHKIbINJ34EWKpUcd0OYfYalvz8F4866EkJ93UCCOISgk rFSScutYdFFAsHWcxBmUdbNRMEpzLNU6r9ReAyLDkB17psSjHIwtGXAUo bKxT+ULFQoYDnRSgmnaLfuN/gMN7eJp0zRiph+hxIk9XtHGpxVFMeswBc Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10308"; a="259820326" X-IronPort-AV: E=Sophos;i="5.90,239,1643702400"; d="scan'208";a="259820326" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2022 01:31:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,239,1643702400"; d="scan'208";a="641964421" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by FMSMGA003.fm.intel.com with ESMTP; 06 Apr 2022 01:31:30 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) 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; Wed, 6 Apr 2022 01:31:30 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Wed, 6 Apr 2022 01:31:29 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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.27 via Frontend Transport; Wed, 6 Apr 2022 01:31:29 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.109) 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; Wed, 6 Apr 2022 01:31:29 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X4NSBw/2doGkLfUJer/5kOoKSXHpmiiWzugdmlzP8Ne/oWHs/XTN04P6QSdq3d9VHjqHw11+Y+3j8Y9bvlBCcEHHyGWo0QOLIaSsgDoZzg3wKckKteqxPvck2xRVv7uIHQIU5xy8s+If5WxfL2WGToj9HdGlIWep4+CBbCcEhljNxa5Qzugme9+nzEqFn4nv03sVXEpfdigsSMJK+W+w3IiKbM4yBY7OJjiLLmcsUNaKKe6pZaUUcpX+ZgRgQ7prGrMgKVdBnsWx2FbS9mmrEL6URs+8S4Rey+P3qUNOEONJ8nWm2YbOnhNeKD2Clywasu108ehgK4XwdPf/p5JMvw== 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=NzQzqq6gusmy31IDUyDoit7cKohu9oCDLapOWAeHfho=; b=gQIup3mG3fKO1wMhpjiq03lz2/IslDGK9XNDUMEVDz60rfm7a4n4p99S9D3U++/+eNbcyw3A3BTpCfBLFldWq7e/T9f9oiUJbdPkviouAzxUyVJhvADVyouYXFMsD2nbPCiEaoS4rgWOYemQYxvaRfk/pWiMVDFlw9ze5w+o8slcArhO89sz4w2tKJYJ8Yw59WDfQqIJjNP4/86xre5o+u8aeZdT6WgsTi+8QNVJzEvTCWYKte7wue78w9hSJ8eL1SbboY6iNSfarf70NGePkT2Vi9iNQnZaNsIivs/HF9upEvAQHoHE8NX7rzm9Efx8Gq+2ZozIqMPD2NQPfw2NEg== 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 CY4PR1101MB2264.namprd11.prod.outlook.com (2603:10b6:910:24::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Wed, 6 Apr 2022 08:31:22 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::c0b8:e06a:3d29:da25]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::c0b8:e06a:3d29:da25%5]) with mapi id 15.20.5144.021; Wed, 6 Apr 2022 08:31:22 +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: AQHYOct35cz29vR6DUOqTaVS4Zv1TKzWYfoAgAxL0AA= Date: Wed, 6 Apr 2022 08:31:22 +0000 Message-ID: References: <20220317064152.430212-1-fei.w.wang@intel.com> <35d1fb2cbaa86f7e9cc09efdc07daac845e68fbb.camel@intel.com> In-Reply-To: <35d1fb2cbaa86f7e9cc09efdc07daac845e68fbb.camel@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: ceb486c9-feeb-4319-3b0f-08da17a7d4cb x-ms-traffictypediagnostic: CY4PR1101MB2264: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: EVcCscURN8iuGg7wxNnYZABCqSU4cmuXiKH8b2pOvkx2p6tx3xehcZXKJoAkvljqGDKRV82+O4KoqBEliqVNTESp+L31vkw6h/scSP9+FiKbjagG5YLWZWa8mOiHFgblhKFBo8PqJoew0cfvM5WeQG4j94ZnEPJ0VfUf+NCq5WMAzUzyteC3snCtwK8/93+ajEl3rNISPamgD4ho+KG9LZi9zCLKXl47OmhiKyOEvjMcajBrkNvWqaJzcACM8pGwBQDyN5ptsTCQZSedh2/6+REztEu+lVpdBkp9njJgXTA6GYKY91Lcg3u1j6Maqr8yCyjwvmVoO/P9hJCB488XFa/y3hVQgVcDYgO3E6fMqq6RfR888Gh5VERFwZBJviMwR6Z/eH1ze0GwHFWmgkrbEhuRi9WwTrTuANuSDSXKH4pmvzmMns5DD1hQ1Y/zbJfYOmSNB3Pp5J226/D8PdlOqkSLi/cXakz4e+WUKtVmL4WTD9VvEjWMZaWrFVWuPcTo0HlhhQ483kVTS/MIwspo028bvhAa8x3ySDZd0f9xJuyPKErDcRnPnk3NFf0IfmSn0wqUDiUoXK5EcNkfq82Xaz+D2mBOLvZJkbER82GYXbTXAATJd9wnbOzCER61bz6/yDqdDdpWUxc0y6dbHly1EzX99/sZVAoTy7Bto7DB3MGXZVw//QfSkLPDmfmQDIdtLbol8rxg5llH7/ZT0XFlwSqtZMZgMaaOnrD2Y/jYqVU= 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)(66946007)(107886003)(83380400001)(66476007)(66556008)(86362001)(66446008)(186003)(64756008)(36756003)(91956017)(76116006)(508600001)(38070700005)(5660300002)(6916009)(71200400001)(54906003)(316002)(2616005)(6506007)(6512007)(2906002)(38100700002)(122000001)(26005)(8676002)(4326008)(82960400001)(8936002)(6486002)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?U0tkaW5QVGxtSk5wcGQvWTJXTzdTbXNWSmdTZTJFM3pJQXNLK2tFYU1YWDh2?= =?utf-8?B?SlllKzB4bkhobEtaakFva0YyTEcxU0NYSmp3VWtRZHFTQ0tnZGFLV0ZKck9l?= =?utf-8?B?WGNYbWxmUHNqUzJmUWhoREZ5bnJqZnlCYktudmIxMk5RMHdsNjZyOXY5WXRo?= =?utf-8?B?K1RyWVhQOWwyUmtkVmUzT1RRUTlnNDB5Q0tMeHEydnJDeG15eUlYNXBYMjdE?= =?utf-8?B?YTNSemJqVjBRbW85UFMrREJRdlNnYVJlQ3BhRDFwUjlYL3pJck1hUVIzQzh1?= =?utf-8?B?MDhDaXlEMW95WFJrNTJFdjg2cnB5SmNjSFdueEFmOTErWFA5Nkk3Z3VIUUdZ?= =?utf-8?B?ZEFiNDJxTDQ0emtINFdHUWVzcW45b1QxTDVDWUhNc1VhTDQ1MmlydjRxYkpP?= =?utf-8?B?U0V5RFJsWmpoYWY4bWtEbSs2dmRtblJRY0RkODNRRkhPd3pQdkxyTSs3WC9K?= =?utf-8?B?OXBocS83bmR6NmEzOW5rMUQwVWV0OG1GdCtTNFVWYWQvSXkxQkN1QjBvenRY?= =?utf-8?B?NzhzTHlEb05mY3JYMmVBSGFOZ0wvR290RVNPaWpqNFNFbit1dXRqbHJ3N0tj?= =?utf-8?B?MkhVQTZ1M0gvQkY5d040MWpmRytYc0RiUFhNc3JuUnR0V3pyNHJVRWxIdVhk?= =?utf-8?B?QkpydzQ2M3JabWJjb0UvanBMT25EaDdwdFo2MEU1UTlpejhvbnBnTklqazRC?= =?utf-8?B?WkhMY2oybG43ZElMM25mUjdaOGo0S2pEY01OZUFOenZHN0VSMXBiMFR1LzVl?= =?utf-8?B?UldaVmVudG1rQnQ5TjRxNStxamF1ZFpNQXJoVDY0eXROLzRFRU9OVmNaOUpQ?= =?utf-8?B?SmRmQXJLNGFZM2dseXVpZ0llWWpWYlRqNmIrSFgweW5iSDZGeWNsdzlQeWxH?= =?utf-8?B?cFY3NnJ2Z1JWM1VQTG80K1JmQ3JDYWE2UmZaWUM1SDlsLzY5WlJmNTFvYTRt?= =?utf-8?B?MTNYUEgxeEtLYmtCd3h5Tk1XR1hVdnRPcUZxU2FkTThtRXdDSUZDdVVLTm5F?= =?utf-8?B?VjhmOGloMXNlWWlMM0NVUUhWazVIQ2NOWTJLMXgyd1Y4WDYxTytES0tYUVVZ?= =?utf-8?B?SmcrT3pNOHp1Z0ppS1UxZVR0NG10N2xGcjNnY1FiNDlTN0FSbllmYWZoMHlv?= =?utf-8?B?NXoxNVZuRkVKYWtpZE9yTXdSMnRCSG5TYWl5czZObXErSE1vY2MwR2xVVy9R?= =?utf-8?B?YkxGcllHOFhIclhiVjRUckVqSEtBTUxxZ0YyOXZNOGNZQkEyR0hlOFhGNFIy?= =?utf-8?B?NXBtRkZoRGNVc2ZseUQvSVJvaTJrTytkYUhKY2w4VUZ0TStxM3YvZU5GNVo3?= =?utf-8?B?UmgxRk9vNnJnUEVqVU90RkFLSnZacnJkSE1SS3Bpd2tGSUtzN0hYYjhhbjli?= =?utf-8?B?dHZoS3N6akthMGFmbmNHWTBxR1dOblQwK2ZGdnJXYnNOUmYveWtSY0lseExv?= =?utf-8?B?YnlNQWhtR2pmZFlvOWprU3Rta2NhcnRBM1p0cHZBRElqNG1BeTJmYmk3a3Rk?= =?utf-8?B?elBpN3Q1b0kyTEVYWFQ2Qm5tZkx3SlJFcTdHQ0ZvS05taDdydGEzVFZZVmp3?= =?utf-8?B?MGxzWGEwb243MFFJaGdYUWZ1cGtjck5CanJEYjNOaWRHNHlOakxERW12S1R4?= =?utf-8?B?WW1xMjJUcjhRSVo2b3liUGtrVy8xYXBEQnZUUEN0bURIL01COG13TnMvTFpQ?= =?utf-8?B?eG5MSnFPb0xNNVozdEV3OWxPVXRpa0J3QXB3cGJST0htSTFENUw2WXBQV2c5?= =?utf-8?B?aEwrUE8veEFNREhXNDYzTk9jdlNjNHFkcnMwajA4Sjh0cmNDMkpDY3dHTmNp?= =?utf-8?B?RzlpN3J2Z3pkUXR0a1BzYnpvcUNhNDQzd0xzL1A5bWVZR1c2cW5CTlFjVXdX?= =?utf-8?B?N0RZVnp3UTFUaWM0SFdmTTgvUzd5cmIzU1JUTDUraEVTWHBxVU84YWw3NWZo?= =?utf-8?B?M2YxdGxocS9Bc0lrZUUzMVE1MitLTkxDR3RNejd5am92b2RYQmRpUG9Xc1lW?= =?utf-8?B?ZTd4NmdudzhocDN2bUFnMlVadkZ6VHdIYjYwVW9NNE80V3VqLy8wV2RkMy8w?= =?utf-8?B?dG5rSzVEdDJpY0c3M0VhUWN3RTVhSjJOUjJlbFFZQjJwMEcyRzEwc2N2aGY4?= =?utf-8?B?aUErd2pQV214NmVoVkpwTE0zb1J5bURzL1NBZVpUc1Y2TGtBWC9Sell4S3hp?= =?utf-8?B?NExGaDZvd0hsd0JnKzNTNXFseURiT05mTFJmaisrSElqL1Q1NTNZOVdsaThz?= =?utf-8?B?MDJxN3d1NnBZOXFLZlphak1Uc1dkVHgzMXJKYzFuNWhJNjRDQ2trditjT2dy?= =?utf-8?B?ZnoxWWt6Y3U0UlY4Zi8zUUtaL21SazhiL3BGV0pWQitZdUJTYnloeVlnMlhN?= =?utf-8?Q?c2AYzP1B9Uv+4o1g=3D?= Content-ID: <7F8F4D09EDE1CD4EBBFE6B987F8AC495@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: ceb486c9-feeb-4319-3b0f-08da17a7d4cb X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Apr 2022 08:31:22.2163 (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: MXnQNP0xkb1I6TlBrsqI9qjpqP2DOnXsETIE0HHOc06g1pZ11NpoY4qLNh6gP2Rv2pJfMwOFh8e1ectxdRFAKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1101MB2264 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 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. Thanks 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".