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 447B740D74 for ; Mon, 7 Feb 2022 05:21:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3550C68B199; Mon, 7 Feb 2022 07:21:01 +0200 (EET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8708668AA97 for ; Mon, 7 Feb 2022 07:20:53 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644211258; x=1675747258; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=aydxzrAoFuDzdnl7QsGhKJMwsq8OFwHTxeaBKI2i/2A=; b=hOPIojMnrba3R8eReMmHS33kfdUBhV1AfGd0d0DoZJCzUBnssYKwa33T X/XrUqDhuajA9cRONCeIfD2BDWu5mSoKqCx/kwpDJFcJxQlyUTAFmO1YE 6gXFONtsaI3s29umqseZYxNsTBbW1aj2+wGHaCq3wwL1ChZ8EZPR4kJu3 IGgy3c9eRXYSZYbRey656WifEH1ltbmeH+MgKD20/nZl1kJtb7E1vaaQZ B65fdjKBHbDnbRVIwPHsx//ng2Q9cGKKEb3JIuoj4C720VgGakxgVOcaa EN+4NMZ/XPenJpYMwh+EpMlcdS1YnBnx1+JAQCgdoMBZiICtwe8ijJY82 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10250"; a="335047866" X-IronPort-AV: E=Sophos;i="5.88,348,1635231600"; d="scan'208";a="335047866" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2022 21:20:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,348,1635231600"; d="scan'208";a="484285703" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga006.jf.intel.com with ESMTP; 06 Feb 2022 21:20:50 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 6 Feb 2022 21:20:49 -0800 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 6 Feb 2022 21:20:49 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Sun, 6 Feb 2022 21:20:49 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.175) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Sun, 6 Feb 2022 21:20:49 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=emmNmMYnJfo8liIObod4Zv/OW3KQ9tGNrFsx0qiPsiI0HY+SJC6eMnBPgsdLBq8RSdenCv6qqbQo5QYzLvQ+yMWkIoV5/O9siFbBuDisHdVJwgk7mX0yp0XM91hgDsYKPQMSajMHQDSMQOgOtO6Y22LJ4kJ2fPH0VM7z4pFM6TjV2i3T/tpdfElnW24B2QlQpuP8oiQsR4UVy8V8iCEW/h11LH65PC166C1oUKUq6QamNCxovC2AQU7AZZduSOl6DYkqXy2jVcTURgtluTZdJLckQLPxEr+j66tIh+Jkr4jOQcVl4e8xlfLKzJXNcvlaB+ppEO36MisRGEM6mpXobg== 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=Z4AANWTVyXjNbSDma2OVhUk0E45D+VnmGwwFgVSDlyI=; b=XoDrI/xd9z/BhVDzPkPSvFJ8k9bvS4hStKTkWJ0Nz1YPYUkfh6rvFsmHzytDt1K26HfjR8F8tyOl8kgGSqVmDbkJYk2maxIxtGHrLFR3ioXhp6hjsh3zpvykEpyCrFtUsHDGT2zNjyl02t19xHHSUOg1+JBMkaWLd3giQy0onDlib90QZqYIQUAKJPkjldlZ+gIz/jBKCRllCDGRjsxnMkd30PT1DQiTdgQtvAtZ0/dPU/41Js/OMHOuG/Sf8+gV3ZG+xYmFWN3KL7n3OoIOANch4clPxdPY59F0LMnlArISo/HJfcyf0/5K5cdlWuMPHTfIhWi9/CPZrQaq/1/Peg== 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 CY4PR11MB1414.namprd11.prod.outlook.com (2603:10b6:903:23::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Mon, 7 Feb 2022 05:20:47 +0000 Received: from BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::8854:1c7a:b8e0:19dc]) by BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::8854:1c7a:b8e0:19dc%4]) with mapi id 15.20.4951.018; Mon, 7 Feb 2022 05:20:47 +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+ayHrMYAgAAUFhA= Date: Mon, 7 Feb 2022 05:20:47 +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: 3027b19b-c95a-4de1-c2aa-08d9e9f99938 x-ms-traffictypediagnostic: CY4PR11MB1414:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2089; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: iMbAVaRxmGp7edQ1QKgR7S+7R1om9Sd1YaH78KtYPmqpzAV0sJdh7KXLYwr/8J9soOYAX0soju6bSoOBmGGAqH3MZYxq19s3Usap8LDf014v/Iwwl9UhhaH8c++cmp9kWjyOF5RBuSIDsOoaO28aVvJxMlh0PpBS0HsdTN649rbHY1V7kF16kjPKc8j2keRazyHC4DASXGIVyAPW5SFwLdq+pIUiJw7212NI7QlQ8taLjSjo7mcOgflQsacZNbRyq+vQhOJUhSifkvANf+EbqoldPvlvE4CMpXZ0lTlH7yxa7aXGzqd95nShCEiYjxxgxzpWLm4hqFAe2Mlhxv7IsbKDi4VSzcr9sluyKNyo7wK7UPoOfkJ4pZdyzWkugdwzyHjQutvCjijDLp6EnoJMJeEAzzvEu5f73S7gtLJ2Uy/qRyv5D1Px0VHIYJB61HX8Avi1Tqo0Z+8STyl2zuEhsc0p/g4+zSbWiFdV5U2E25EMOWj7LB755813Txc87MgZ359bAj64XgMJEMJqGbIZ3Xu5JTtQ84X4u3G6Mtd/I4vEpGT2wzNx3LUeTaTvPc8gdLtpwd1Id+DnGfPtu6qGzdniumrrgoaFz+4PNfqWezXdu1fykN/W32gtbVDCScznfjMBG1u4FQgE1hQGOycnjPFJVZd0NyT5iUe6ZHoBzyMWXLIi3abOKkT08KLghh4T8qlRA4aOEkVcH/6F8cNbqtBIY5xGZ7CI7Hcyv7Tf9EcXFq8eyuq4b0tQT+3kOr3Ze7IZxfkCej3D3x06mBxPhkpjNOaBwArPSCkIbjGfY94= 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:(13230001)(366004)(66556008)(66476007)(66446008)(64756008)(55016003)(8676002)(8936002)(2906002)(86362001)(66946007)(76116006)(38070700005)(52536014)(122000001)(38100700002)(82960400001)(508600001)(83380400001)(9686003)(6506007)(7696005)(71200400001)(966005)(26005)(186003)(6916009)(316002)(5660300002)(33656002)(43043002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?8kKGLuZWDtzYODYUj6dNx1J8SlFQC6i14TVZzv0xY8jh4z+bzdQmR0DA/GW+?= =?us-ascii?Q?87aKaGkuIm30KE/KUqRz7M2N/5DFrPcAPHNeZU6Z/YBTDI31NP7ukgOgUS+K?= =?us-ascii?Q?i0A0ccXbBfpustUud8UOplNfX6KscvoAQsTrxtHuBOj5UyuDcnNSMDnUgu0H?= =?us-ascii?Q?zeQf54AAx2DW4JHMd2GvrtEVTq82pjYiJFgk1Ol8do8NRgGZbZxxU3Kmu7D1?= =?us-ascii?Q?O05dApLXMt3i6Pk8F+/YaKx8O0ahaoiDfvkqT49zxhrku+5H4OZrX4xTyTXb?= =?us-ascii?Q?PgTTSWahTaLIAY8sKsSf50QyS7WDxPd0L4ZAJF1w6D/c4iwgM8htU5cqKxyu?= =?us-ascii?Q?CX+bqGtufQsBC8X6Nboc97skSXBWIUV2CWwRKvhZR6gTBLV/vOqMtOHQWJjW?= =?us-ascii?Q?ABw19Zz5Xp5AVq+KqMYVHrsdnxKVOkbYuNrDWQcRqaD+tLFiEWy5EaXdQ2JZ?= =?us-ascii?Q?v5JfgBkw9N/8DasBwriD3KOGAn88g9+oXt/ME38kqrZN+Dot9yivS8MYGLeg?= =?us-ascii?Q?xD2A8LqHl7ZhAfOHqtkWpBzCRK4PFmxs2eUr5tFU9YG8yUsN9AktDrgTQwl3?= =?us-ascii?Q?Q8zPH4KfH4ld/0C1hNZjqk0GtOaUIoPRmzYvSRkEyec1+7mZAssIn9twKAHV?= =?us-ascii?Q?5N3nj4pt1GZqBPgOqVAa7Tg6C3wdlCtKHj/RwozWsjhW5n067vdh5KmetwAm?= =?us-ascii?Q?HNNZFQXOHdy+OefVQMPlWEorBCD74M8U+jbdgOrZGVw1TD0AeuGCH63jNTyz?= =?us-ascii?Q?4GYsWgbuiSP7wy5vztw2XXWdLqeOaEDC1TjnjA5NF5v75p5KvO/34zxnGtXJ?= =?us-ascii?Q?5dzWmFkg0iwYl+F396yhqC6YQLJKgOzZFMwjPlwOhxpN3eUK+PbXWjFKa8TZ?= =?us-ascii?Q?H42qV/c2IDjz9/5aZR5GPuOMj3eR0uZTgB4WhCUoy5qogLnR0YbpbFYvT4QE?= =?us-ascii?Q?gxeJFJgBklj5BosIf4np36AKzWRp5TibUHnDlu6n/gIqv8J1O8JglbPx1fZb?= =?us-ascii?Q?5vJtFmGYGfs5jvL5hizEtioeg4+dE6EmfXZC9UE7njI/3oM5qD533ruDIG0R?= =?us-ascii?Q?k0ndIGetQc61L+2qmiDWyTFgAXn32094OU39c/jcTiX1wSvr17jLeKSMRPKC?= =?us-ascii?Q?beSePw48mtWuUP+l8NeoB3U21+NhChpBhYx2ZF4hm/qUEAljaCPa9GXbq0wv?= =?us-ascii?Q?j1ocCZGomrDoSx1KVJV8ULuxTCbzg7F91VXLUHrJTCLDKjFy74MzPSkhAH3Z?= =?us-ascii?Q?MBLEP4D3U50DvQHlnS9A68uZogVxiIBlYbzrGKA0TBVqF1UgHYOHX7gRGXeP?= =?us-ascii?Q?reHdOkmfHC+En4c7eXZTLLchIePI8eERO2DVr0uuPWAQv0unjPAQa74/6vyx?= =?us-ascii?Q?ZahWzim53vD0NQfBnEHl479CLt4oxWiK604O5/UtBzYaZntxxw5PsrwW5/0W?= =?us-ascii?Q?um2M8xMxAiFrq4WcVrZpgh5yPbY43l3zb63LQaIu7ez6ar1J+0Cz5QDbHEbv?= =?us-ascii?Q?wE1JVlAMBFo0bLREpDYSC+IyiFAAd5aS3q1Uy8SKbX/Z2ameu7J3PAZNOfyp?= =?us-ascii?Q?aS0xdHZa0a4x3oqoR1oxssVDmqtp0d+KpeWzUeB+6SAQwkbKCRMrZVXSqaWn?= =?us-ascii?Q?FQ=3D=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: 3027b19b-c95a-4de1-c2aa-08d9e9f99938 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Feb 2022 05:20:47.5304 (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: /v1CPBWGzt4lTN7eb6n5bgSb6QQu1YqlPLmIlQQW/zIwjDXmodFoNOKF6L8ohX7XnQ1zNi6xanfVOxAQT2uXnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR11MB1414 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: > On Wed, 2022-01-05 at 10:48 +0800, Wenbin Chen wrote: > > 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); > > > > 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 > > Could you update your patch to use the new FIFO API ? > > Thanks > Haihao Ok, I will update it. Thanks Wenbin > > > + 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".