From patchwork Fri Feb 2 10:16:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 45978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp841097pzb; Fri, 2 Feb 2024 02:08:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuKIxg6C7Un/lrSPp4t6TKYMBYVOmBqtdshdGmybz2F8FPn1rB3LxYjXNIHMN55zD3dl+4 X-Received: by 2002:a17:906:d9ca:b0:a36:7e15:ca55 with SMTP id qk10-20020a170906d9ca00b00a367e15ca55mr1148190ejb.40.1706868516902; Fri, 02 Feb 2024 02:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706868516; cv=none; d=google.com; s=arc-20160816; b=kaKUDxb9HkJOpFYPAiBLh8XOCcpt3QMEpeYzD8plJsuiX6QHcgLgokKbSW1K5K8E2m eOnFIFUUcmSRdFxO3cbA82+Kw2dtjXHcBazUDbsB0PQHCLa3va7Hj6NluxsfhQ6K4vBd gqJZeDHDaA72W6S3GrW14RIJb2NuhfGAkMpDyEsR4AMcVruk6rPhjKUMZF3GHt57FAvn YldbcWsQ1pISAswV61W/wrCWTeWpYdDNmtF54+MG90hIoeD5CpPt04RFj9ANYYhCP35g ZEBNJn7xIKJZZ7+67awGGKR7SZZ7wNDpAxQSB3NB4PfKxgyV7xDvwNrujtney4+4nCKM HeXw== 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=o9sjo2hknWzUuaC0g13skU7soZtryJtji75Mnk1bu48=; fh=rVKwpGFINhlecjYjxpxz+QdiARJbzo+Bovv0fNGUcO0=; b=ILByzZm6wL/J/UtyRCTm4jkb6/0TJMO5QM0qZb75h6ZKMXrVZFyCWtIdQSWTU5vdhq OvY+z5D4YIsR9wwmSYNM3SLmvUMo4EJukKbYj64MWt+7RnZAIDlNO9zcCEaLpJQwdm6c XXl79LZ/Q9GJpT2Sck4EID1B8PVjyRaAip0TpBeXtIO+HhsF9ybIW43jGdHj44PaUHuY xIA/v6tJJZecPf+Kzdl/RvV5t10ACPebHaO2gBf2vxmm6On4/c7fJbxpck7aTpHoamtA o96I/r6DPB2jLwoBRxnJ/EYTIQBW8mq0AbwDi2JIyMxbjyxHxpuoMYq6YrBwMuBX8MCE Nj8Q==; 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=fzUitckE; 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=0; AJvYcCXcsV8Z4ZOhBe4UAPphwtMZ56Tq9pcz7eUyPMWaUSJo7Q1ocZjnfUbXDyjjsadCxgyGiz7f0Y2MAZXUIT3x5sjG7geFBhe7iz+vOp7MODDjReB2BIXOhwQlnxF+Pdcsn9otTGk+I4VOb0y3wq1AOBIyQTYQiU5D7gXpfcTzsY6kaU2aLDPn6PxXpLzBOuyxVuB+jNpVoPOx1JJUc3PaZv/lJC/ZTrsjLdYYAjwXTZfG91VssDX/NzNZ9Yqx3/qIw7XmU1HwzbXybiHGxRgmbRNETxMgpN+TwfUgdCfm2hd68Ldiu/5GF9jfmyblK97mCYnUUYSHHGrjMgOM+n5EftL8BTPHTrmxA8vC54Op+NrZ5G+EzFWEBBgP1KkN3XEkW5/SvhI13N2noTxQE+5sjRPS+X+zu6x6N99f15iHk51Yb+n5WdUF6gJQkNxvqPuGazZf5F82UjSTw+3ukkPAyL5l02uLU45cRibLFd5Ac4EuuSz6MSB2F0I/7lY9DiIG5azw1snMcRwPmT8+R9360nPanFPKHDhoxzT5UZ/ER2oWIedfSGIpsP3NJAgjyqCyAkac8ZpUMqXwl76+0uLciP3qaf0TmJo/AaSIBamAszkAPA86UtybQWoSEjQsMiW1D3SbcG1vP5N8ut+JS0xcCzOuI7PULg9KsER5X1zgtsyz5eFWzZMq4n51cdHa2hj0KODSlJ8KHnzLie826OiIgdZ77GcloIMwz/3vDBfWU5GnqkmWVLbi4mZDagu6dPaHwP3WYgt8IDOLDvLhIEtOxBzmOAGCo6J9IeYABhL/TN5rkqM27RHT+qdYqbHje6Ez/UK9vpfGUOUtvbHpPUctdrp1TukugM5CQQL9usRBe7S8yn/6ndRiLFUkczvM8MRpmMV+Z7aleDjbt7az3z0k8bGJBCs5zm1iAG+FPUJEMIaXcvvktzRILtKwekZ8aVE3LHdZid CNGLcZ8gjTGNLlsSUiH7dEnaxJ77sFGvuGyygkO8CqfQFfMCQRE4RONLllr3wva37uRbDXUX1NxskZuLnQEqMPGg5FqrTS9lZfOii3hJd4x111C++5tSyOv9nPSDz4QWiOf3ihDTxHEvEWH7XMRaqb4fwlcMog1kewB8u1aDxa2RiE+fGIPPnnoZYoeX9OFL36mRRnbwZVRoISropp6DQG3Q5R6Y/Bqy1BtHYXqGMpFdLJSzh6otJZfLZcOW9hO7Ami3+qlU044UFJI53GdawszCPp547QFFFOFdDmeg6RnIWp6gBiRdFUf+yqP2mKv9VoMRGlqFncoP8ExonfBigrmdAay5qphMXFGkySMPtyeOVepigqz3Ea8+ODbxAQ8Si3azmFQWpB4XWJCAN6YBTIVcRDVY4XXA3XKObrqlPj2d8v8s3mkMfGpTgFCz/8Dhm+xNI/S/9+Ac7fZw1J0YN1Bd6hx8RzxpsUJk2l+yDMJhiBndPLDdsq+VOCy1U61BSD37CzjSh/T8v8GWtIk7qqek6kdAtwBkHvOpMX5rxkAVyuO9OCntnzCtAO8o7Ed6LZRsW0kFv4LCFo5InamqgzSSRpBqWrNe3bzhTb7RWH Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t16-20020a1709060c5000b00a36f879bda4si614394ejf.631.2024.02.02.02.08.36; Fri, 02 Feb 2024 02:08:36 -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=fzUitckE; 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 F001568D150; Fri, 2 Feb 2024 12:08:02 +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 5A82568D150 for ; Fri, 2 Feb 2024 12:07: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=1706868481; x=1738404481; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BKmltXIxKKZ61ihnyvqaeRLfcSmZNBMHCMxcIYGG9jw=; b=fzUitckEKu8EpkJy/Z6/oP8mF0/o0XPF3yjDcAh3KpsPNA1n8oq75i1w uICUWWnntcRsNdqvTZ8gRzkFdmDPFijYO0L7n1WkjUhkW+0Ufj8xdzePs Pso8a6EjA0V3lRW/J9zcbM7T5ZqnyhqHXAt3Esjp2Hy6whbko/8B95n6A f0ncwbPzde/Omao4USFenW0UJuAovslkOD97WrPbUNk7H57sU+um9c9No yGfkrybj3lzoFOVRiEQE2yOKdJd767PLr8FRsEvD/Uc9ZxyXyL7yKVu9s 9g60t1AIgKBUAJthR2uA2CNLp6wjA9yE8D2cc8dMkNsi6QVB/VooXIQMc Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="33384" X-IronPort-AV: E=Sophos;i="6.05,237,1701158400"; d="scan'208";a="33384" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2024 02:07:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,237,1701158400"; d="scan'208";a="4795895" Received: from media-ci-tgl2.sh.intel.com (HELO localhost.localdomain) ([10.239.47.127]) by orviesa004.jf.intel.com with ESMTP; 02 Feb 2024 02:07:50 -0800 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Feb 2024 18:16:10 +0800 Message-ID: <20240202101615.382-5-tong1.wu@intel.com> X-Mailer: git-send-email 2.43.0.windows.1 In-Reply-To: <20240202101615.382-1-tong1.wu@intel.com> References: <20240202101615.382-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: LgvNj74MAbGA 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; }