From patchwork Sat May 25 10:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49235 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2239303vqf; Sat, 25 May 2024 03:32:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWeTeW2THfs+eacwQogmOti2+rHbAB2yzbQsdenxHm6+6kzgl2Gktjld0i1cjYfPXzibTlxdr+biRSRSPJvJIeYcHf3eGWrxLBmLQ== X-Google-Smtp-Source: AGHT+IHIq7kVgm/dZfvn/zSY9Ul1ac1dIXOlWN90Bwd5QXPiUOy9b3hRiNIrwbhoLZaep8Lpnn28 X-Received: by 2002:a50:8e5d:0:b0:578:5f34:b08f with SMTP id 4fb4d7f45d1cf-5785f34be56mr3231971a12.25.1716633132587; Sat, 25 May 2024 03:32:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716633132; cv=none; d=google.com; s=arc-20160816; b=NaasC8m082z5n7Swu8P++2+S7PXSn9NqMmG45OCL3DybcajS9kaEJYw3DzMafnrWYK zWAForv+swiehfdkNScJknfc30qh8aVP716u+GBCIpVVOcac1vsLfJnDUpimeFQZDQ1b uhd9f+G20ar7bP7BB68O3Jttk8hrCIWNhBo6bzGIPmL3pCHbLyUiZIzhr2L0fUa1JiMs 30RdpI7Tj+vXqK1vifKyZl2aV56LwdrJ1x5OfptG9Kko35Py6X7bO7Ox1dDgA2kNDPBv sUSZenfc+htOqA1+517Ttn+WCRtx+Rk0WDpyoLEZ2ibVqsqFxACbWyCNxPkBd0COvqlH G4eg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=fUC/QkbNIblpm1WCX4q8WApRPNu2PvGGzlGKcaK7dqk=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=OQcQm82qTn85HwZ1gtOeidZwDEmHB86VhWttYdwFNRVCKUr9C5VJLjyI0ymSciggWQ LVUYvn+XPgM4Wu3NWz4sD/2NQTcY7p06j60okHXvu0MU1gbT4EKwC+E3t85RXEgKYxRm CyErV7Pdjx9Cg3Ur3SZC1JMHpsT+z8UglMX7MO6AW3bYDjSH6rXWjoRuXyKe64lONWBH NSQSInJ7cqnWa5I9XU/E4YIcZ1Ng4xVZ/Rhirax1F1wM1uhUfTEvoQSzyoZyO95GtRAh icG1uWsfXIEyxn+thtGsbjHoUJRrDr4r5T8siGIGuJ/yX/SAcKvsetZjX7+ij1qHokkW 54VQ==; 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=F7eHeKxB; 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 4fb4d7f45d1cf-5785233133esi1810844a12.35.2024.05.25.03.32.12; Sat, 25 May 2024 03:32:12 -0700 (PDT) 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=F7eHeKxB; 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 57CB468D500; Sat, 25 May 2024 13:32:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35CCE68D4EB for ; Sat, 25 May 2024 13:32:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716633126; x=1748169126; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=aDP6lLxdtaRsGTCrJdz2OssXB+9hNcIsXTozk5/2BS4=; b=F7eHeKxBBLXX90BGXZ2y4+6Aye/kxPRz+xT+0L6dI9ogrYMu18APeEbi zmp8G5rczIFRc9LVAYWBughseRi4wCV6/oQz6FAPfac+dGZ4E+o4jMIWi mFYw8ytwV0qypKaQuC81LtWnOnWrIMMrPG4XcQZLmJ/LZa811WRfBqrAX tYGkoX1YcK9Z1NlIHVUPP029xthE7eCcLAaqYhxMBEOSnwVpCTbFLIdoQ BCwCUnkzuhqnxgIJopJnn0miMyLMz2p97tOnW4Wee0jd6q/WHq5LMrJ8K HPJIFVWDcBH0TYztmZzb0iNdhFS6LFP/Krqs+xOVTfMMRW5ajk1bS8/2i A==; X-CSE-ConnectionGUID: bjcvVVHhSk6oUW5ctNfzhQ== X-CSE-MsgGUID: EtTdIS/IQri7rNHQ+lnGTQ== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="38391092" X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="38391092" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2024 03:31:57 -0700 X-CSE-ConnectionGUID: J1j26DNNT0qsjpeUYdyExg== X-CSE-MsgGUID: qYuuyMdAQ4GzmiRHjTlCNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="39252383" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa004.jf.intel.com with ESMTP; 25 May 2024 03:31:57 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 18:30:08 +0800 Message-ID: <20240525103022.1390-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 01/14] avcodec/vaapi_encode: introduce a base layer for vaapi encode 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: rYjfTYEHkKvv From: Tong Wu Since VAAPI and future D3D12VA implementation may share some common parameters, a base layer encode context is introduced as vaapi context's base. Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.h | 56 +++++++++++++++++++++++++++++++++++++ libavcodec/vaapi_encode.h | 39 +++++--------------------- 2 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 libavcodec/hw_base_encode.h diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h new file mode 100644 index 0000000000..ffcb6bcbb2 --- /dev/null +++ b/libavcodec/hw_base_encode.h @@ -0,0 +1,56 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_HW_BASE_ENCODE_H +#define AVCODEC_HW_BASE_ENCODE_H + +#define MAX_DPB_SIZE 16 +#define MAX_PICTURE_REFERENCES 2 +#define MAX_REORDER_DELAY 16 +#define MAX_ASYNC_DEPTH 64 +#define MAX_REFERENCE_LIST_NUM 2 + +enum { + PICTURE_TYPE_IDR = 0, + PICTURE_TYPE_I = 1, + PICTURE_TYPE_P = 2, + PICTURE_TYPE_B = 3, +}; + +enum { + // Codec supports controlling the subdivision of pictures into slices. + FLAG_SLICE_CONTROL = 1 << 0, + // Codec only supports constant quality (no rate control). + FLAG_CONSTANT_QUALITY_ONLY = 1 << 1, + // Codec is intra-only. + FLAG_INTRA_ONLY = 1 << 2, + // Codec supports B-pictures. + FLAG_B_PICTURES = 1 << 3, + // Codec supports referencing B-pictures. + FLAG_B_PICTURE_REFERENCES = 1 << 4, + // Codec supports non-IDR key pictures (that is, key pictures do + // not necessarily empty the DPB). + FLAG_NON_IDR_KEY_PICTURES = 1 << 5, +}; + +typedef struct FFHWBaseEncodeContext { + const AVClass *class; +} FFHWBaseEncodeContext; + +#endif /* AVCODEC_HW_BASE_ENCODE_H */ + diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0eed9691ca..cae7af8725 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -33,34 +33,27 @@ #include "avcodec.h" #include "hwconfig.h" +#include "hw_base_encode.h" struct VAAPIEncodeType; struct VAAPIEncodePicture; +// Codec output packet without timestamp delay, which means the +// output packet has same PTS and DTS. +#define FLAG_TIMESTAMP_NO_DELAY 1 << 6 + enum { MAX_CONFIG_ATTRIBUTES = 4, MAX_GLOBAL_PARAMS = 4, - MAX_DPB_SIZE = 16, - MAX_PICTURE_REFERENCES = 2, - MAX_REORDER_DELAY = 16, MAX_PARAM_BUFFER_SIZE = 1024, // A.4.1: table A.6 allows at most 22 tile rows for any level. MAX_TILE_ROWS = 22, // A.4.1: table A.6 allows at most 20 tile columns for any level. MAX_TILE_COLS = 20, - MAX_ASYNC_DEPTH = 64, - MAX_REFERENCE_LIST_NUM = 2, }; extern const AVCodecHWConfigInternal *const ff_vaapi_encode_hw_configs[]; -enum { - PICTURE_TYPE_IDR = 0, - PICTURE_TYPE_I = 1, - PICTURE_TYPE_P = 2, - PICTURE_TYPE_B = 3, -}; - typedef struct VAAPIEncodeSlice { int index; int row_start; @@ -193,7 +186,8 @@ typedef struct VAAPIEncodeRCMode { } VAAPIEncodeRCMode; typedef struct VAAPIEncodeContext { - const AVClass *class; + // Base context. + FFHWBaseEncodeContext base; // Codec-specific hooks. const struct VAAPIEncodeType *codec; @@ -397,25 +391,6 @@ typedef struct VAAPIEncodeContext { AVPacket *tail_pkt; } VAAPIEncodeContext; -enum { - // Codec supports controlling the subdivision of pictures into slices. - FLAG_SLICE_CONTROL = 1 << 0, - // Codec only supports constant quality (no rate control). - FLAG_CONSTANT_QUALITY_ONLY = 1 << 1, - // Codec is intra-only. - FLAG_INTRA_ONLY = 1 << 2, - // Codec supports B-pictures. - FLAG_B_PICTURES = 1 << 3, - // Codec supports referencing B-pictures. - FLAG_B_PICTURE_REFERENCES = 1 << 4, - // Codec supports non-IDR key pictures (that is, key pictures do - // not necessarily empty the DPB). - FLAG_NON_IDR_KEY_PICTURES = 1 << 5, - // Codec output packet without timestamp delay, which means the - // output packet has same PTS and DTS. - FLAG_TIMESTAMP_NO_DELAY = 1 << 6, -}; - typedef struct VAAPIEncodeType { // List of supported profiles and corresponding VAAPI profiles. // (Must end with AV_PROFILE_UNKNOWN.)