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 26C50425B1 for ; Wed, 5 Jan 2022 07:59:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF87D68A906; Wed, 5 Jan 2022 09:59:43 +0200 (EET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B77D689997 for ; Wed, 5 Jan 2022 09:59:35 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641369581; x=1672905581; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=jMmA7Yx95PhRXqmewVRKnlBIR1GPas2Js4xYcrQOF2Y=; b=Tp3NDBefuklxq3gnyBFt0UCIzoFbHqWKg74mn09uYt5ygndFl5El9VQm o9HOLcYxKoqMTVfUOpRKQ3hgiHx7+gyVbhbqMJgELviHjYyt8OGe7gIHG 4ffhkC2zeJCDpehsyyC4zPv+IMzFQ2HTzT0coNXJf7LTfx+uOZSumFXHv xMIV4zN5w1le0tIZzLBzBOdkeETJ+o3LO37KzTxxdxMpEP07hNjEkJE19 yA6mRhZTNhDUjrvHpoPEf1D8hmv7uGlalFFNQzMaayIesu2qbAXo44+Ji uATzpTKojYJssLLtMUxL2pZ1gRUeyDvotU1YgAZHUjqnBpDMXvR2bkjAd Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="242347840" X-IronPort-AV: E=Sophos;i="5.88,262,1635231600"; d="scan'208";a="242347840" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2022 23:59:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,262,1635231600"; d="scan'208";a="470457878" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga003.jf.intel.com with ESMTP; 04 Jan 2022 23:59:31 -0800 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) 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.2308.20; Tue, 4 Jan 2022 23:59:31 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Tue, 4 Jan 2022 23:59:31 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.173) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Tue, 4 Jan 2022 23:59:29 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bJGOmt3qJ3TLIN7ojxzlPbWfTITwH9Yklq9knzbQ/SG+tTbuZWOBxOboyOexUW5xxUKxRJfn/Vyma2JIu4O0fq4JT1XjRqtkvJfEF93n773iRR2WR4Wl4KZ9MPfIsP3JrrkVzZ7lWcEFjenlB1Fd19HO6h3BLo7o5pusZZ2xVWpMJpQ22YEDzKFbGnfoln2MrKtHrrLV7KmOXhNOCP4jSMULAXo1AWFs3+1SmnhEK8S/VnEt1wQCze1mJGin3NzOt0pgRepf0YgBj72jmeJczJ6ff8gRzPnWZihguK6t+Ufd/tLtFjSufwPBfE5EzrgueQsHTLxuhlRL+5jdzxWyRQ== 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=LlbzRBlom9/n5w9qQhHGCoCJdI1VHJHC7+nQVyAfWXY=; b=PO+cuvqfygSW5CzDRcyPvZhR/fNxNobF086nRe90GFa6cf3QYrXt8DKAqSmKYZaC0+o26i+eBrvoBPJMaSSLBmdya6c3KE/3uCux7jDmbPo5BEm3RdfzTePxrZYP/kuMqwPMEXHdEMnQb0Z6jnZLio3HFyBkAOmmwOC7LoyAZu1yfV7rZsRq4TM976NaNHHgeClunajDmaHT2noIErhZRj75BENMLlaYDld2ULsW9ZHguJdlBKyhhtNcWcc0Mj12FDZc5aARcvea035x42W0yOVmGgyiz8cRl6+ml6uIY8oAkp3AwgrKqT0EejXT9eOdPAh7MqHA7gTYyEpb8BlH0Q== 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 BY5PR11MB3879.namprd11.prod.outlook.com (2603:10b6:a03:18f::17) by BY5PR11MB4070.namprd11.prod.outlook.com (2603:10b6:a03:181::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 07:59:26 +0000 Received: from BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::550:e7c7:13c4:7e0f]) by BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::550:e7c7:13c4:7e0f%6]) with mapi id 15.20.4844.016; Wed, 5 Jan 2022 07:59:26 +0000 From: "Chen, Wenbin" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH V2 2/3] libavcodec/vaapi_encode: Change the way to call async to increase performance Thread-Index: AQHYAd7J+Urj1hP9QEm/Fz6etPIE+axT6z6AgAAjQuA= Date: Wed, 5 Jan 2022 07:59:25 +0000 Message-ID: References: <20220105024810.435597-1-wenbin.chen@intel.com> <20220105024810.435597-2-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: 61b82ee2-8420-4a63-125d-08d9d0214b10 x-ms-traffictypediagnostic: BY5PR11MB4070:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2733; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CFwcwQM/YxTTdMk42N25l8OkSTLq8o7NLT2A3nxdEn5mutGmRn1WSU9Wo8JObMbsnJeuLndYG8m08d2lZst6ig2SPbC+PS88iGQKdD0cZsNfD9ceD40bZ4ZOLAO+CU20RkBb7IQYpZK74Ht0+2xxx575GUV3wiIfaV16YcFZCIYhWdlni3NifkfRG3TMzFctSdroe+mMjlQhQRqqXof3iSuUFFr6cJrSOuKd7W2wmofe7yNkMrURiqizOWUB3txW+3APmqeLu59ayofm6omW7uIdNdxq+TGb0nU7VZewwNWRRJHBvaAFdybHtReswcTxk+xHmIRGoeEP3usP/o7wQFm2EiXimQE/x8uHTqYV8mN4733iSak+MreZysBrn42tIb0Ej1y+nesLD4to70WULwrN6pIKXoTzhMuZZ3GtGM4k+3NFIQB9S9hzScei6iEqnvhzVbPyFA4Np+yDcprjoHlvrwGtRIlpi64ppURI54XD7liO0TdKbcHop/HbeDsxCBaX4lONgIJl/7/HDsv1wXa8JDru10hGPVxk6Igq/nGkYaFs8b60qtQO2RsnGSBnu2+GQkP6CfxSsdTOHoLad6MFCaflq402H4rip5cBwZv6d9fWxVt539Z9T0WZbnQM3pG9d1dGz0pNx5zwFSPL3HjROuWmq5z+adQhZGooQfS2B09XHxSmq/swerlK0jmFzpNndpFxfVmcywJdF9TrrcCmy/BOheKMUKbciXECcKxVKv8CEN5WP8lZu/TP45fZLpYJZcdHr9kdPQbu9NrQayUSA5qsSIsHt95IVvlx/qpkv6rKLo+P8LY/O2B+GseX 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)(71200400001)(33656002)(966005)(55016003)(316002)(6506007)(9686003)(2906002)(508600001)(7696005)(86362001)(8936002)(8676002)(6916009)(26005)(186003)(76116006)(66446008)(38100700002)(122000001)(66946007)(66476007)(52536014)(82960400001)(83380400001)(38070700005)(66556008)(64756008)(5660300002)(43043002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?0Vh3u478lvoxt0nqJgkuo7Hx6ZmdnqpuMjnEj47O1sTSPsHAID3V7oaF/odq?= =?us-ascii?Q?BqXpOs6xxiaYqnyJY8iAJHQVvll7OPzzVy8+Rzo520MXTtYQQXuU9gYDVpmG?= =?us-ascii?Q?pI/AurdLqn1PqnoW3VClHIswDS1XCsrRgymHO2Gq3wbp+ITj6FvQ5AKeyBGs?= =?us-ascii?Q?5wdpkldbNTlmATzJCk4T4RCvrhDzBfKQzekDretYmq9XOn7Y8BptXW9odEAg?= =?us-ascii?Q?n09mjXD9QMM5Z5vNWBxGxY4vi2gNK/YURLWrT2Nmla2UIUKIlUP1e6p37Moa?= =?us-ascii?Q?c1fbhmGNxwOk5QZDmQIgUN1317kgN/QvgTz2+o6pXNhMW+INQ0j732NKMa6o?= =?us-ascii?Q?Ntc/Y1OdQ6Eg+WEsA1tPs7TJ1O+IZdMe26NxEVGkAT3Fb746dckFJ5ag7OYy?= =?us-ascii?Q?hp3btODhfdCSmMn9piKae8gjRBoi6NezhEHIiC9onZBUZnePOaXC2PzVn2fT?= =?us-ascii?Q?aW3/i//vU4stmhOJjKX+f8sXyQd7R0/ZkVOEE0l11Y1pgWYMfyDSGAVtP9Zt?= =?us-ascii?Q?dqGQJ12XwonxrhnYjww8E9+r7iwJwkXusVU4YkNRJrG6dh3l3m38iiY580sv?= =?us-ascii?Q?M+st2Yr3BPnw374VH53BLDBqld0NCzfr0Y/W6oaOkHHpMYARDqSMn1J4F6b6?= =?us-ascii?Q?si8nEVpgEN/7VZ3JSddjpdKq2vOmCBcXXLUgxdtm/bHB7DrUYiiqJVDr948g?= =?us-ascii?Q?GbFx5jermfCU/fCB77FQtY7wdIbGGOHUwN56xLRX9zhEZPoNd8DwuJJCcZPf?= =?us-ascii?Q?LLQiXg3K9fJgTkNDA8IlqiPXsYx+G/QQbpJI8DB+yXZ6aMHHgzK66untDWQP?= =?us-ascii?Q?OnVk+4ptbTyONaBmwRoeLrbaJzE+UbmWZZ108f1RszyuyzOa3rOVl4mAzw7a?= =?us-ascii?Q?A77aq57zvTNWKZhohfS59/50hVlJRJTBNOh/gAMh5SdLzNIjG+I4O+koRiGg?= =?us-ascii?Q?ZbpLNA1UhaHJfWhSxPXQSpDkAXw+nKTrn/Wzu6SLTqcBu0VzrQy0NCRudOdY?= =?us-ascii?Q?ZyyiWgtJHw/mvvB0JXCKZE7GD/r80v5lCAxU+N1O/0SmxilHaclJuiO5y5ln?= =?us-ascii?Q?YTDrQlgfG/gNR9cZ+rmuz9d/CYvrCHrOfAKyxbq/pJ+owb5F+j1Pid9pmxcV?= =?us-ascii?Q?HSxzWea+pekqbMwP+NIvWsJY7M3Dy/uXfp5lUqRfEc4g3kN6vO4Efma5fWBy?= =?us-ascii?Q?qx0M4ROknkiwd8UEhhXh5ftUzmFSazIfBm+CJQdG/N/EjmnZFKam0lD66k7t?= =?us-ascii?Q?QsRVczYn6DPorrslBoQvJW3Fk/pZmGjkpFQxN8O+MgwubuLW441zwJEDv66K?= =?us-ascii?Q?CFnaOrXlrQ6wsPqzwnKWWQgRe/cgKCcaCc08yQhKzfeIgUAns0IuCpWI8txz?= =?us-ascii?Q?GePjt6cxznEz6CZZ1BiqAro4isjCyGm1Tbuhu0z+YcOiyChRz2iWG1CqM5Kn?= =?us-ascii?Q?crWQk5trjADvJiczLvVhO5r8ATgDBzMdKHPQIILQLadlulYRpjtMMwj75qNK?= =?us-ascii?Q?GBbIqvgjM6MVtbjmk204AwpEIDn0en4R5ejtXrvPcfb1u5Oip9dbEG5lPcfB?= =?us-ascii?Q?2gwx2rG9p95lLc2rjVDV69mmWgNRwGrcHwScWM+ggFqWpIMFMfZljQWQZZoi?= =?us-ascii?Q?AWA/wuMBvo4joq7lwNiZ+Qo=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: 61b82ee2-8420-4a63-125d-08d9d0214b10 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2022 07:59:26.0384 (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: ysZM5IpWwegZx7al9WgJrUuwTn7MssVqZWSikNMKkmyMjz2/5ylK3TlFVuzcWyBbyX4ymKuI7t0xAbM91lbpcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4070 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH V2 2/3] libavcodec/vaapi_encode: Change the way to call async to increase performance 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: > Wenbin Chen: > > Fix: #7706. After commit 5fdcf85bbffe7451c2, vaapi encoder's performance > > decrease. The reason is that vaRenderPicture() and vaSyncBuffer() are > > called at the same time (vaRenderPicture() always followed by a > > vaSyncBuffer()). When we encode stream with B frames, we need buffer to > > reorder frames, so we can send serveral frames to HW at once to increase > > performance. Now I changed them to be called in a asynchronous way, > which > > will make better use of hardware. 1080p transcoding increases about 17% > > fps on my environment. > > > > This change fits vaSyncBuffer(), so if driver does not support > > vaSyncBuffer, it will keep previous operation. > > > > Signed-off-by: Wenbin Chen > > --- > > libavcodec/vaapi_encode.c | 64 ++++++++++++++++++++++++++++++++----- > -- > > libavcodec/vaapi_encode.h | 5 +++ > > 2 files changed, 58 insertions(+), 11 deletions(-) > > > > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c > > index b87b58a42b..9a3b3ba4ad 100644 > > --- a/libavcodec/vaapi_encode.c > > +++ b/libavcodec/vaapi_encode.c > > @@ -984,8 +984,10 @@ static int > vaapi_encode_pick_next(AVCodecContext *avctx, > > if (!pic && ctx->end_of_stream) { > > --b_counter; > > pic = ctx->pic_end; > > - if (pic->encode_issued) > > + if (pic->encode_complete) > > return AVERROR_EOF; > > + else if (pic->encode_issued) > > + return AVERROR(EAGAIN); > > } > > > > if (!pic) { > > @@ -1210,18 +1212,45 @@ int > ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) > > return AVERROR(EAGAIN); > > } > > > > - pic = NULL; > > - err = vaapi_encode_pick_next(avctx, &pic); > > - if (err < 0) > > - return err; > > - av_assert0(pic); > > +#if VA_CHECK_VERSION(1, 9, 0) > > + if (ctx->has_sync_buffer_func) { > > + while (av_fifo_size(ctx->encode_fifo) <= > > + MAX_PICTURE_REFERENCES * sizeof(VAAPIEncodePicture *)) { > > + pic = NULL; > > + err = vaapi_encode_pick_next(avctx, &pic); > > + if (err < 0) > > + break; > > + > > + av_assert0(pic); > > + pic->encode_order = ctx->encode_order + > > + (av_fifo_size(ctx->encode_fifo) / sizeof(VAAPIEncodePicture *)); > > + err = vaapi_encode_issue(avctx, pic); > > + if (err < 0) { > > + av_log(avctx, AV_LOG_ERROR, "Encode failed: %d.\n", err); > > + return err; > > + } > > + av_fifo_generic_write(ctx->encode_fifo, &pic, sizeof(pic), NULL); > > + } > > + if (!av_fifo_size(ctx->encode_fifo)) > > + return err; > > + av_fifo_generic_read(ctx->encode_fifo, &pic, sizeof(pic), NULL); > > + ctx->encode_order = pic->encode_order + 1; > > + } else > > +#endif > > + { > > + pic = NULL; > > + err = vaapi_encode_pick_next(avctx, &pic); > > + if (err < 0) > > + return err; > > + av_assert0(pic); > > > > - pic->encode_order = ctx->encode_order++; > > + pic->encode_order = ctx->encode_order++; > > > > - err = vaapi_encode_issue(avctx, pic); > > - if (err < 0) { > > - av_log(avctx, AV_LOG_ERROR, "Encode failed: %d.\n", err); > > - return err; > > + err = vaapi_encode_issue(avctx, pic); > > + if (err < 0) { > > + av_log(avctx, AV_LOG_ERROR, "Encode failed: %d.\n", err); > > + return err; > > + } > > } > > > > err = vaapi_encode_output(avctx, pic, pkt); > > @@ -2555,6 +2584,18 @@ av_cold int > ff_vaapi_encode_init(AVCodecContext *avctx) > > } > > } > > > > +#if VA_CHECK_VERSION(1, 9, 0) > > + //check vaSyncBuffer function > > + vas = vaSyncBuffer(ctx->hwctx->display, 0, 0); > > + if (vas != VA_STATUS_ERROR_UNIMPLEMENTED) { > > + ctx->has_sync_buffer_func = 1; > > + ctx->encode_fifo = av_fifo_alloc((MAX_PICTURE_REFERENCES + 1) * > > + sizeof(VAAPIEncodePicture *)); > > + if (!ctx->encode_fifo) > > + return AVERROR(ENOMEM); > > + } > > +#endif > > + > > return 0; > > > > fail: > > @@ -2592,6 +2633,7 @@ av_cold int > ff_vaapi_encode_close(AVCodecContext *avctx) > > > > av_freep(&ctx->codec_sequence_params); > > av_freep(&ctx->codec_picture_params); > > + av_fifo_freep(&ctx->encode_fifo); > > Is it guaranteed that the fifo is empty at this point? I don't think so. I don't check the fifo size, because in ff_vaapi_encode_close() all pics are already freed and encode_fifo only buffer pic. ``` for (pic = ctx->pic_start; pic; pic = next) { next = pic->next; vaapi_encode_free(avctx, pic); } ``` > > > > > av_buffer_unref(&ctx->recon_frames_ref); > > av_buffer_unref(&ctx->input_frames_ref); > > diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h > > index b41604a883..560a1c42a9 100644 > > --- a/libavcodec/vaapi_encode.h > > +++ b/libavcodec/vaapi_encode.h > > @@ -29,6 +29,7 @@ > > > > #include "libavutil/hwcontext.h" > > #include "libavutil/hwcontext_vaapi.h" > > +#include "libavutil/fifo.h" > > > > #include "avcodec.h" > > #include "hwconfig.h" > > @@ -345,6 +346,10 @@ typedef struct VAAPIEncodeContext { > > int roi_warned; > > > > AVFrame *frame; > > + //Store buffered pic > > + AVFifoBuffer *encode_fifo; > > + //Whether the driver support vaSyncBuffer > > + int has_sync_buffer_func; > > } VAAPIEncodeContext; > > > > enum { > > > > _______________________________________________ > 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".