From patchwork Mon May 20 14:52: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: 49052 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp4513651pzb; Mon, 20 May 2024 07:54:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGiK8mDG/YzPzRto/X53zPTqT9qsHuh5eI7Ogtnjpb9mOCA+jCZFwo4pugO/Jvwn/QtcajjZJC9p2L+uDNccLwDkpR6CxlJZB7SA== X-Google-Smtp-Source: AGHT+IGNzIJulgagW/hyDwcP0BVzPVUohvAeeHOC3W43EBi8tEU3N8cec/KyGI4j3QNPHi/4z9ov X-Received: by 2002:a50:9e8e:0:b0:56e:2daf:1edf with SMTP id 4fb4d7f45d1cf-5752b4d085emr4844914a12.21.1716216849411; Mon, 20 May 2024 07:54:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716216849; cv=none; d=google.com; s=arc-20160816; b=KErvCuZfTdZmMZ7P3/z0aF4t8B+Lp221Vw4A7As5c5pAtjjvFXqGys1D39NfnY0N6A Qz9tMK7Q3334Yt0HxPp322EnOOAz+H3CJK3fOx+rA91Gw9/MPK+oWehNt4y/rNdOxbXx 9uchuF4jHjKL6QKZcawJreNf3A++LqjSAlFVkZFeieYE9ADhx9kV9dl7G2z5cN4m1ejy eI9ePsqvVJ9x5HW39JwssLoDvMeIe7eN9WV55W3KaAYcgihPT+XhL/4CVUlx1dG0AQBB Xs31mbDc9kiAWL8mjNX9x2nTNqHqo+2PALbP/q501lXVxjhlc/dU+u+l8ItWVzN1nUi0 5S3Q== 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=wsJ3TJuX1NfALfWGavJ3p9g3UvnVOe/26HSaQtWVUjs=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=SL3BrdRvc6jUSldB1GaWOTDaPsfaBnDSzX9yBd6fCwGAQg145sJbB188wIs4LRuNQp 0hS2SNwzqFYp3a4cdzx26HS1YokTh1Db+ugUOPyrETkyqaJuCQ/Zeb9F3r3+pPLzY/MR ICYjvAmEQnQkIMO6n68PD2pTI3sk0ByR+LbAtqFYXwahoF+I+fMkV+3hjNEfB4z/WuOX aoH2IPChUcxLig1YTF1CEEKUQ0U5T250yH0OR5wAGYRpMF1bfEIrxZVdRw0shLx77FIj SfG8wRb2An4/UCfx21/jFkh8tWPWYamv3oUedWpIVKoo7W3Ydl8zcSfd9KTctg/qwB9B zv3w==; 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=Z2dBs9vz; 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-576932432dfsi2115072a12.399.2024.05.20.07.54.08; Mon, 20 May 2024 07:54:09 -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=Z2dBs9vz; 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 2176F68CEBC; Mon, 20 May 2024 17:54:05 +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.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C947F68CA16 for ; Mon, 20 May 2024 17:53:57 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716216843; x=1747752843; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=x7XrFxP5LibwB3DN39MXwR2Z3n8fd79D2curPjW9Dv4=; b=Z2dBs9vz+7AowWSOKMDTn0hso0Iuf299ZtzUCuUNVFFCtIpmV8nKXSHu fiDaeIDlqJfpleCxfI4fNZRfZf5u3hRxQ5FMg93+J9I/E2Qe+/kR8be7X F++s97Qbv4QnHrE3uWnHQ+kGpgQUTU65ZcbY4uE6WERr5dRGTe353hqIN AsiD0/lsKEy0v8Edb1o0tt+JhcZ1Q8DVaFT75CKFc36D6GEVtSylWaVfi iQ1+pXxbbWI1GbXZoc3EyiMlVj8KYhUe87Ut12H9n+ezs02T+sWKqEb15 1AVLaOnBPcWtf2AcqsGf9wdV3naGs4AiwXxC16yRS/+afNvCzsaqGZA5S w==; X-CSE-ConnectionGUID: /K9arBA7S9OhApQwhzcXew== X-CSE-MsgGUID: qQNFOrPNR1m0c/Y8QqgA5Q== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12197242" X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="12197242" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 07:53:56 -0700 X-CSE-ConnectionGUID: kWy0HEJoTuau+HJZDaZ3Lg== X-CSE-MsgGUID: Vhw8AVXGQAOkANQn35zBPQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="55787856" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa002.fm.intel.com with ESMTP; 20 May 2024 07:53:54 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 May 2024 22:52:10 +0800 Message-ID: <20240520145222.291-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 01/13] 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: riajmDC4WUfx 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..1996179456 --- /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 HWBaseEncodeContext { + const AVClass *class; +} HWBaseEncodeContext; + +#endif /* AVCODEC_HW_BASE_ENCODE_H */ + diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0eed9691ca..f5c9be8973 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. + HWBaseEncodeContext 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.)