From patchwork Tue Feb 8 03:05:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 34160 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp415967iov; Mon, 7 Feb 2022 19:06:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyG/itDdQ+hofy1NX76xKRdGEd6GbfounWFmdbTch9cqdvQi/vUwH/xjxPselSTdWSg5HLV X-Received: by 2002:a17:906:9b8d:: with SMTP id dd13mr1928036ejc.121.1644289578627; Mon, 07 Feb 2022 19:06:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644289578; cv=none; d=google.com; s=arc-20160816; b=pYC1CTTLiwQzXogAh69DWcHsxkukTeAFJIomXTCGSKzfpFr+wgCAXNcH/Icxv8oj7O oUYxNmlcmuygKnQ1xWzHKsIn2j7D5NHAnGg0KIhjLN0aSTWOYLqaD9twx8TaDE1rl6U4 feetpaCZt97bZVc4exYFnTYcWG4GWrlbHCVB8jG6wYEes2iWovv/D+jhaeRYmfE7COg2 SsyV+fpRza9EJtyvqUJLWDplaQOhHp5Emz+8N60NlZqrK2NnUo+J1nC+hdkA/2yHatqK f+VokW5C7R6P7nEbX0e/zUpEZxhf4B8AWllNe/8u4JJ9piI/CmC7K4iNCnbDTe+HxCE2 AwhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=1yTSVExclD86ZDzoLcogjwD8F5MtiispGaaRPHmaCXA=; b=IvLvKeeBrlH6EUJ9jfhvno0yWHmm7nlp9Ra266++e99MtraQmyqZCfQUsJSZdtSjZO ilxh2Si/3vScqME/+DZ6Lah3fOVLlGM5QxviraJP1p7r6lAYb4O+ozMj8oTzMTvgY5Z4 9xs5XGskdw9JxnbrdHPK21FtE64hwXdl2VEdjDU6LVqWnG9bHdlHQ5ixp10jCKqm3arA h5EwXSk9pD/Is9k3Mp8fDDES1Hv3Zw9g+iB1jGYtafF/pbwpeXoZED6gL4bAfxrNzGRR h5RHJU1B29WgZwM/VIfVIiRrFUvLfOIQd3fNqyWTggUlxYVnpFoB65Q3zIl+AYlU4ac4 0YPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LGrt9Crg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hr4si10313821ejc.321.2022.02.07.19.06.18; Mon, 07 Feb 2022 19:06:18 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LGrt9Crg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 183D768AE13; Tue, 8 Feb 2022 05:06:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F281D68AE13 for ; Tue, 8 Feb 2022 05:05:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644289561; x=1675825561; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=5hSoa3nl8Elgb09nf3PNqO/X0BcGgr5aNWUF7RkJ+Cw=; b=LGrt9Crgk65yGLuj36Bv4dH5rKY1tVuSOhrql34tJ0cTDROAcMwfFQ2A zW3CO+IlBRhRxk/pioAu7Jou5njACj87NGRVub6cLAXnaJ15pwsTUwtrK WyoczVkPXgXAKB7J7u8x/nu++MEWyfYKCWwT1hgMVU9GvpWLPx191OGpa 2FhtZ3tEBHobfatEjtbIcDBD+sl1A/+OTvxqiD5ebQWp/Xv2+Zl69cVbi Xd6xHAVGmeMczMya3uLbPxBy9aOLAHjtKL0PmClfgNVgHjx6dALtnhN0A MWnTjhs2zZQYJddUQnn1IX+y4/OWdFg6bkEz/Kkw+AQJvwRTTQQ+RZwkt g==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="228829621" X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="228829621" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 19:05:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="628742459" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by fmsmga002.fm.intel.com with ESMTP; 07 Feb 2022 19:05:52 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 11:05:48 +0800 Message-Id: <20220208030549.340748-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208030549.340748-1-wenbin.chen@intel.com> References: <20220208030549.340748-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vgK6yy4tTjlt 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..15ddbbaa4a 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,44 @@ 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_can_read(ctx->encode_fifo) <= MAX_PICTURE_REFERENCES) { + pic = NULL; + err = vaapi_encode_pick_next(avctx, &pic); + if (err < 0) + break; + + av_assert0(pic); + pic->encode_order = ctx->encode_order + + av_fifo_can_read(ctx->encode_fifo); + err = vaapi_encode_issue(avctx, pic); + if (err < 0) { + av_log(avctx, AV_LOG_ERROR, "Encode failed: %d.\n", err); + return err; + } + av_fifo_write(ctx->encode_fifo, &pic, 1); + } + if (!av_fifo_can_read(ctx->encode_fifo)) + return err; + av_fifo_read(ctx->encode_fifo, &pic, 1); + 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 +2583,19 @@ 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_alloc2(MAX_PICTURE_REFERENCES + 1, + sizeof(VAAPIEncodePicture *), + 0); + 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_freep2(&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..d33a486cb8 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 + AVFifo *encode_fifo; + //Whether the driver support vaSyncBuffer + int has_sync_buffer_func; } VAAPIEncodeContext; enum {