From patchwork Thu Apr 18 08:58:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 48136 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp1551539pzb; Thu, 18 Apr 2024 02:01:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXncjXKOX9t3azBT0F1572xnV+wYonRtjj6Ek5cr8lOzh5QdIQm03sqddp8HxKSCdIFHBsTFl9vwHpyZxLQ/sLHuZIAvUiYUePHSA== X-Google-Smtp-Source: AGHT+IG3qvIW2lx3ub76g3OYbxvmz9tv8L8xjoficXk3yzrFBexg60fzeiBfafiztfPeZKY8vga9 X-Received: by 2002:a19:5e4a:0:b0:519:6f94:3803 with SMTP id z10-20020a195e4a000000b005196f943803mr671969lfi.6.1713430862687; Thu, 18 Apr 2024 02:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713430862; cv=none; d=google.com; s=arc-20160816; b=EWy9mweMnK6euJH7ArozLBkeqtZ0LHlwdF00zEHp04GbppGxtYB1NzD4ZkuMZu3Vzm JTmJdpbSNV136rounds213+8g8KvdMeASDRFpH9NiBoW5dXJP7sZMTEhY+lyHdBDavLU EdHyrMJ3WVv9meNj4pRK4EEU1kWNlIYtrRE60p2DWoadvyUO+MSi0UyeDl32O45mpADv xRIXsKhcFVcfdQhEpFxFAme2fzfyXBSXtRWZo1otM+EHx2xJcW9hQpq7gvluM6KCQkeT rtCHbzt1LKVzCKl/SZJ8/Xqfa0WuPFvVlAXw7S1eD3Yh/x2+NQBGTFEXyUOEdqQNUpGD 2hQQ== 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=hYaaet/KSAK1wxMwotV047JINGAryp7zMHCpPfBWTHg=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=p9WXP7R3YFrGRUPmJ/N/QGmo8lTP5MdqT1/+m1iM0CCVsDz1RAzzh6FuT0oH4QVDlB l1GOVbqGEKwzABIj4RGWLMGL1qMcGAIKnzBat1yHA70y+KD06WBBevVhTA85PfFWhklq lr1YzdGUT91ml5bZ7Jzzwr2IW2yetvaRugbV/5hMoP2p2eRKPKkL/UjlMcha5e+984gA TUIXwh6bKF4bEVKj1lwt09LVSfNErwXLR7KvA+5fFnp30TEUATGdb7z9JUAbSMDs8MaP /b+7rgEt8S3TcJv4HskeejbMxOcXH2jHU+t/aaykEbyIXw3E47zPJ3A5sB1XbUiLc0DY Rnyw==; 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=dwfkmArr; 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 cw24-20020a056402229800b00570091fc474si606074edb.468.2024.04.18.02.01.02; Thu, 18 Apr 2024 02:01:02 -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=dwfkmArr; 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 F067368D41E; Thu, 18 Apr 2024 12:00:59 +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.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C73968D2BC for ; Thu, 18 Apr 2024 12:00:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713430857; x=1744966857; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=9d14znv2DhMmS7JRGtgXX2Lg0y0Xs2wXoGJLxci9ZrI=; b=dwfkmArrL7jcorfgJ/q2w1EGYmNDA5vXwGXMPJqY5HnznI3ehUaHTrrx /KnrK811/7JCa9YDUoG07M85oZjeaRXXnmf39sy4Hn211wEagXRAiF/is G3B+wBA/TlvOeLZhHcI2IJV8WpvE+yE7GahWkhoY/5Q3hUCLgAfprzeWF HAjvSlB5ful6bIjCaT/OQREXR62/xoVZ79Nhd1gYQG7jFVXkYFciJVj2W 7hZyDEYFwp4iBFGh2p7AHZnuWhmjtHLVsViSCS4xX+SHry9/X4Dldm9m0 xJrf3jV223DU3q0LCg0VweW6PcSmLZEb8njXO7cYHrbe2xsYuGeCloscs A==; X-CSE-ConnectionGUID: DUb0u8T8TTqKMFO/I/DqHQ== X-CSE-MsgGUID: lhN8aq53RVimeUIwNC85CA== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="12748287" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="12748287" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Apr 2024 02:00:41 -0700 X-CSE-ConnectionGUID: cCLnN2X0Q0eudWgskD5Elg== X-CSE-MsgGUID: OiSlu84UQCiq42aSZUtzrA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="54127503" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa001.fm.intel.com with ESMTP; 18 Apr 2024 02:00:31 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2024 16:58:55 +0800 Message-ID: <20240418085910.547-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 01/15] 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: nMTNwMygDAxN 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 | 52 +++++++++++++++++++++++++++++++++++++ libavcodec/vaapi_encode.h | 36 ++++--------------------- 2 files changed, 57 insertions(+), 31 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..3d1974bba3 --- /dev/null +++ b/libavcodec/hw_base_encode.h @@ -0,0 +1,52 @@ +/* + * 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, +}; + +#endif /* AVCODEC_HW_BASE_ENCODE_H */ + diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0eed9691ca..5e18f374a7 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; @@ -397,25 +390,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.)