From patchwork Thu Feb 8 07:38:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 46102 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp102585pzc; Wed, 7 Feb 2024 23:40:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVi+4626xbgjhAYaGkScUhXWJtXNFN7Uxun9uYLOe+EFh1PI6YY3dG7NSFBykGpYJLU+pHFYxUu+Mp7qRlAQ3QSi5yvAdL0Ua0Pqg== X-Google-Smtp-Source: AGHT+IGcvBK7jEI6PbImmV4SgKEB0sBCpzEA3RbM10pzNb9azwD+g7K48xbT4yrN5eJB26jVIS+j X-Received: by 2002:a50:cc81:0:b0:560:229:e2ea with SMTP id q1-20020a50cc81000000b005600229e2eamr5200041edi.1.1707378023770; Wed, 07 Feb 2024 23:40:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707378023; cv=none; d=google.com; s=arc-20160816; b=v5JEQ5/KpYHCxvwqUwM3aZgGIDKdx4+Z29+haySXCb/xSg0ZwOnG2RpJSvpOR7rLO9 aHlaEAGVtCw9XSC1YNvBvFp5ZeDgwG2Btat/ehioPoYHtO2/R2bJsNuWNHJ3594oxt4e L1ABZ5VeINXl7ZJBJ53bJ25l0dVO1AuKKjnHf1fEXxKBYsSHM6mLVQomLjkhBnCwug/Y l90ZDjJQzzkH5JSRi4xUVY+7/2T334i3du+R5oQJdCtFkwXTv+X4dywP5xT8hdgRwtb6 XzmJIGUUsOxARO3+fvHw5XpLTYuSK/zUw6VpoVUguDvn0D3afwJ8iRQPPj2DLcHX7Hv/ 0Z0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=RqYYvgu8Q871S8dtfZn6MDj32/C20MCuR+5+nAkejCk=; fh=LycsCje3EZxFKNQYbi4fPwPd5zHQ3Pt+RkNMwFn/4p8=; b=geYHV6Dsfy5W4igBnMQ+vKL3syWW3CTFfZL1RzdX9/c4+uidVcEMGgihirjhOnY8C/ NlkT4KhpxUmxlvQUpQZzfz7z0bzIBgpZhH+PLpklJjrRARIf+YFwKc7zUcNajwdQssuP bD6a5pJaNQT8aFLpP9ns6QK6E70jElgaBn81Wo1J+8cbzSB+7F6wuvLTfGsVT/8vaIdm DOFwmy9i6lukw1SLaiAi+fHni/G0TpBkpGYspxr8CTpLmuYAQAVbnDYTbU0VXNYTmtus ublSQesNju/b+LbgqdK0KPO5f74zsTj3ZlZYAZAtxJ651VmSk7NqLDAPvuodu5Yq+wtb PfFw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=aBbHhZUH; 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 X-Forwarded-Encrypted: i=1; AJvYcCXyUXMuilUSBDU50WMgkqsyHiGM6nlwhWhxeN3eiJ/SVOQvANTgy7+ldT7pnaprgwXclBCIL2lroZzFrShk2txVOntE+Aj5/3/pz3CnECrCvJpMY/qofkkWlAxpTLoLmNZk640/70XI6FWruzdV9KtK4mopTQHkJBFOGH7lnvwdw8Dw3YEYTHr6HIo+P0e+IG3lFoHaIRK0zSBubkBh0m2ksUKYXNFSoandL8Ut2ZSO0yS6oqEoDBDsB631Q87C6yFqR4S/Vn5Z/bIw2HEzOS9glBilrgFlqDBANqIvCTcBx6JeHmZWOQ1PF2Fg7UA0YPWBF8337XqzrVb8qWQvDjyqM6GyMkVwD9HwBDI9Fy2GSKbtt2+UZ7VjiWb/0XQ1i+W884jgSb+tFqjI3/zXb8UvFg3vWBy/KukbBgj1rqErCnaEZg/xeCYsifr7MF9FJRimxjyJ6CPWmcFtqeegWmv6g6l4ExZD9NQB/AvMieANzoppqXK7uWV7ozTL7Gu1C7tfAE0V074ln+bRoqbJJfv0OEQ3u8c/BOMK/OaOIB2273yZuUX2bjZ6YTrFbebcJAW5SrCuuZJBeuytJg7mS3V7Zrz+QTrWaDEacW1TR0ql3vCKbD7iWZMRkmIlrEbuNik9m9YU3AZA0Tm+C2KDerL58JdA2PlSRJlIn4oILpZwG+kdABx8K/+SYMdWcRlDwk4WA+fGIGDWXe+bI1VBJr+1xlWw4Xrp6UbVX3er2UmROdeykYzzl8mLFkgPjO6+7xX6pxryxqYhtF/hq44KewXHJuDB/+IHmxqCi2CutA4woOuooUt7F4OYOlkrU1QyeB4UYIy7WI5CQPPVACotleCYyuNmebEZMvxIIFKJkOYFuVN1l2za1kc0qk7EHW7i3EEOvkozmEnIBkcOGq+J79aBVCMCc84+hAA1jI3cC58KXY9QNZ/SgYpJVgBDS+7LAcH8hc CI5TyE2pEZyXswzGSx5piccxaDfdog08nvpNpfG2qmWD0azAWEFkW3C5If6mb0H9qkDDHcvshU2eiTpzRgnSdVIZNdDcYAv35UiKGDThvKtUUGKStaa649OcCKBAyxqT5ZWbbZy6H2IVhtzJaU7hJF49uZvZYuPug+nCi8G2HL9aENFmZATuBRd4zHE/Fs6yoR5qhyZIjJtOQMfrf/WXT1VU7RXfyqTJyezdSyMDST0lkYquDJzSkmGXnQMfT35wKBGOirMnHy1o9fDQ16L+gTwHf/CWjZTTPISPNu2fgTNr3FosoCtlmJtIBom9fZL1NgVPKvvbgeAmyZNSxN9Zsthe+WXHYOIvt9XdC1APJIsVlpy5KpKlkA/i7V97b/GB2jetz4sYXswnglWcRT1q7KeeUnwH2K5TDQvNNkDPzc8U8QPF6nqWMmfM9Q6ARCndRfExhU0WqQOq289Q4n8p5k7wJwK4lQD97c1YXLTBL+hrTWynA4kteMdogBvWE6xIimEabbrA+/0XYANSZtknECAmfCii7KEgVtpvEGIG8WORp0jafTWTsu7l2W7qgRZ3A1OTkXHVexk2zzewcCk6bEYwsWxJs= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b7-20020a05640202c700b0055d24d974d1si644383edx.329.2024.02.07.23.40.19; Wed, 07 Feb 2024 23:40:23 -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=aBbHhZUH; 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 637DD68D194; Thu, 8 Feb 2024 09:39:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E582168D194 for ; Thu, 8 Feb 2024 09:39:41 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707377987; x=1738913987; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=knV1ya0bWi1jAamR+w5BMTOtIiglckw0So/rxmZU7E8=; b=aBbHhZUHqn/53JGTEO4VbTuwDM1uoUkOgYtDHj79Q9vD8E9aY1wiLDHm bGCni0inZL1gtZwwIYd00COcJmtFcweoHowKhdiG6bnx9MNw4ZoxIE9tr KA90nAdmQ1Cqhy5Wb3nt+gnAKmgJHpUcmdO3maW0DzR/o8SyoMZ8iAZDJ ouQte9+G/yo9hT6UPrWgXBeMNvfHbpel1GxUvVNH1Ch/IYpCCNgFMiAXn DB8lTIdUcHGQC/KPp7l7BwK3zWQHa7jhlbYaXkJZRQ6td7zcN2uUsIXkl mLV+OukshaaCBDk5F7HgknH4v8PobaL/xSBko1yaD7ejgLsa/KJqrWWWN g==; X-IronPort-AV: E=McAfee;i="6600,9927,10977"; a="1047703" X-IronPort-AV: E=Sophos;i="6.05,252,1701158400"; d="scan'208";a="1047703" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2024 23:39:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,252,1701158400"; d="scan'208";a="32390261" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by orviesa002.jf.intel.com with ESMTP; 07 Feb 2024 23:39:33 -0800 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Feb 2024 15:38:20 +0800 Message-ID: <20240208073824.206-5-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240208073824.206-1-tong1.wu@intel.com> References: <20240208073824.206-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 5/9] avcodec/vaapi_encode: extract gop configuration to base layer 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xO31VFOH1cFk From: Tong Wu Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.c | 54 +++++++++++++++++++++++++++++++++++++ libavcodec/hw_base_encode.h | 3 +++ libavcodec/vaapi_encode.c | 52 +++-------------------------------- 3 files changed, 61 insertions(+), 48 deletions(-) diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c index c20c47bf55..bb9fe70239 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -782,6 +782,60 @@ int ff_hw_base_rc_mode_configure(AVCodecContext *avctx, const HWBaseEncodeRCMode return 0; } +int ff_hw_base_init_gop_structure(AVCodecContext *avctx, uint32_t ref_l0, uint32_t ref_l1, + int flags, int prediction_pre_only) +{ + HWBaseEncodeContext *ctx = avctx->priv_data; + + if (flags & FLAG_INTRA_ONLY || avctx->gop_size <= 1) { + av_log(avctx, AV_LOG_VERBOSE, "Using intra frames only.\n"); + ctx->gop_size = 1; + } else if (ref_l0 < 1) { + av_log(avctx, AV_LOG_ERROR, "Driver does not support any " + "reference frames.\n"); + return AVERROR(EINVAL); + } else if (!(flags & FLAG_B_PICTURES) || 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 { + 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; + if (flags & FLAG_B_PICTURE_REFERENCES) { + ctx->max_b_depth = FFMIN(ctx->desired_b_depth, + av_log2(ctx->b_per_p) + 1); + } else { + ctx->max_b_depth = 1; + } + } + + if (flags & FLAG_NON_IDR_KEY_PICTURES) { + ctx->closed_gop = !!(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP); + ctx->gop_per_idr = ctx->idr_interval + 1; + } else { + ctx->closed_gop = 1; + ctx->gop_per_idr = 1; + } + + return 0; +} + int ff_hw_base_encode_init(AVCodecContext *avctx) { HWBaseEncodeContext *ctx = avctx->priv_data; diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index 57cfa12e73..d6d2fc03c5 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -276,6 +276,9 @@ int ff_hw_base_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt); int ff_hw_base_rc_mode_configure(AVCodecContext *avctx, const HWBaseEncodeRCMode *rc_mode, int default_quality, HWBaseEncodeRCConfigure *rc_conf); +int ff_hw_base_init_gop_structure(AVCodecContext *avctx, uint32_t ref_l0, uint32_t ref_l1, + int flags, int prediction_pre_only); + int ff_hw_base_encode_init(AVCodecContext *avctx); int ff_hw_base_encode_close(AVCodecContext *avctx); diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 30e5deac08..0bce3ce105 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1443,7 +1443,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; + int prediction_pre_only, err; vas = vaGetConfigAttributes(ctx->hwctx->display, ctx->va_profile, @@ -1507,53 +1507,9 @@ static av_cold int vaapi_encode_init_gop_structure(AVCodecContext *avctx) } #endif - if (ctx->codec->flags & FLAG_INTRA_ONLY || - avctx->gop_size <= 1) { - av_log(avctx, AV_LOG_VERBOSE, "Using intra frames only.\n"); - base_ctx->gop_size = 1; - } else if (ref_l0 < 1) { - av_log(avctx, AV_LOG_ERROR, "Driver does not support any " - "reference frames.\n"); - return AVERROR(EINVAL); - } else if (!(ctx->codec->flags & FLAG_B_PICTURES) || - ref_l1 < 1 || avctx->max_b_frames < 1 || - prediction_pre_only) { - if (base_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); - base_ctx->gop_size = avctx->gop_size; - base_ctx->p_per_i = INT_MAX; - base_ctx->b_per_p = 0; - } else { - if (base_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); - base_ctx->gop_size = avctx->gop_size; - base_ctx->p_per_i = INT_MAX; - base_ctx->b_per_p = avctx->max_b_frames; - if (ctx->codec->flags & FLAG_B_PICTURE_REFERENCES) { - base_ctx->max_b_depth = FFMIN(base_ctx->desired_b_depth, - av_log2(base_ctx->b_per_p) + 1); - } else { - base_ctx->max_b_depth = 1; - } - } - - if (ctx->codec->flags & FLAG_NON_IDR_KEY_PICTURES) { - base_ctx->closed_gop = !!(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP); - base_ctx->gop_per_idr = base_ctx->idr_interval + 1; - } else { - base_ctx->closed_gop = 1; - base_ctx->gop_per_idr = 1; - } + err = ff_hw_base_init_gop_structure(avctx, ref_l0, ref_l1, ctx->codec->flags, prediction_pre_only); + if (err < 0) + return err; return 0; }