From patchwork Sat May 25 10:30:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49238 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2239483vqf; Sat, 25 May 2024 03:32:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUA9gKN2nt/j1TbQsl6Qak2VqRxz0ET26aSsAS/ppDxmH1tIK42DRkA26pMlQS/ejTh/2cCfX1OfiVvnrVVVVxtvujFRu/Xnil6aw== X-Google-Smtp-Source: AGHT+IHqkxPAj2rpc+oZsww/yZpmIbzoupKDC9E+W0S6Mehmrd/HWwmT7e5lRfGyhCqZeAdmMh4i X-Received: by 2002:a17:906:38cf:b0:a5a:3a6c:8b57 with SMTP id a640c23a62f3a-a62641a3555mr307039266b.6.1716633161891; Sat, 25 May 2024 03:32:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716633161; cv=none; d=google.com; s=arc-20160816; b=ntwPzcYfclvQLrGDp/qbiRAMe8UZwu9pxL4AyQoMPdfRZezdFsXELBSJB1ng+D7aUp Qm1BnOkleEmap6E8Wr6WpJkq0wB/mFiV4tChJJHD7wt7vCg/HAUajrbyyit2IArbeJG5 aMk7mSVhyZfI5T9geYiMiu9yNCP5V/JZh/yXRiHeEOKKIUyfM8PSm3yHuTU2kkVtd9o/ wR1SGTzjwLF9wWn6pbggo7GxumOVG4uF+FwUk86WG1eDwgLgBwFBMSpyTPtWTRz762j5 0ji52wOb/PM9NvlAPN8/9Q+OawebgLpXavH01BwKEzi3demFgREaLSKDeTo+hahc1EEy Brpg== 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=h6XJb8GiKrW+arK69I7Soh/4ZV8A1l/gNQBpW5DWCxk=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=GBYh9ECY4WqdwnDCNLxVXxFyOY1nuzXNNY8nWlgwkOY1uvbdcDSzo7T3FBAENDjXaY IA67xaBj3qFQlXriiRjFbDHVLaXi5lelz8lqHXs6W/BdH5eTgMzgZ/oa5N8DDHmQLS5W GIHxHISXTxWndB2FDYsePRsdwL64OBpjWrhYl1C9RPIeVwI4jY4ky2BHOu8gOeq7wUEr bMMqJqE+R1HWvKPrfCe8OZ8zrcPj0DPFZBgWZdRoXfLDyOM2XmKp9VW7UK2PGTHbB6rd v7g5amKrERFsvFAwC4A5VZuZHgk0ArKoZAu+hyvJKhuKiORDiu0cDJAlIXQsiflREUYt av7A==; 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=OfeV1Bu+; 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 a640c23a62f3a-a626cdd2f60si178823066b.994.2024.05.25.03.32.41; Sat, 25 May 2024 03:32:41 -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=OfeV1Bu+; 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 2B0DF68D58F; Sat, 25 May 2024 13:32:14 +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 2BF0B68D566 for ; Sat, 25 May 2024 13:32:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716633132; x=1748169132; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0o9z1NPtxDUhzMcSzSZQXNFxOXWJqm/eOZ96igSiTCg=; b=OfeV1Bu+/h+ZuIpk0jw1viWFD09VurprTb9n2/sQ30U4DUXsvo8IshQ8 AyQI8KiZN1YRNRQjjvjrTcqOBYsal3WrDn4+91ri1I7GtI7CZ+q1YWI20 8w1LYoqXJ6Cn8vkhsi9gMimfwbPysgTUOsL1JOMPv/0yFiD2PPDORQPAW WlcwtABmpFYM7XjeWUyMieiHYkMqlayj0aWj/mYWlvESELU65kc0JZ2D+ geW4htwXK36onPa58kGxGvpxg/B8e08T8yLTkUAMugVM3ETxlICiJ/DEk SiyHdMWbIpGsT14QdfXDUIxWhjOn/G+0OpLovzxbGbpgT+ksLYtPlQWEz w==; X-CSE-ConnectionGUID: LQuNlhh/TOiPYHti4+n7qw== X-CSE-MsgGUID: jS/d/VXJQUqIRFYn51S3tA== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="38391097" X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="38391097" 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:32:01 -0700 X-CSE-ConnectionGUID: 344tTvy9StWsSDauOoCuYQ== X-CSE-MsgGUID: BOTOo6N2QAGuhSkongC1kQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="39252395" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa004.jf.intel.com with ESMTP; 25 May 2024 03:32:01 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 18:30:11 +0800 Message-ID: <20240525103022.1390-4-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240525103022.1390-1-tong1.wu@intel.com> References: <20240525103022.1390-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 04/14] avcodec/vaapi_encode: add picture type name to base 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: P1yQlySqQCqO From: Tong Wu Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.h | 6 ++++++ libavcodec/vaapi_encode.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index c14c174102..858450afa8 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -25,6 +25,12 @@ #define MAX_ASYNC_DEPTH 64 #define MAX_REFERENCE_LIST_NUM 2 +static inline const char *ff_hw_base_encode_get_pictype_name(const int type) +{ + const char * const picture_type_name[] = { "IDR", "I", "P", "B" }; + return picture_type_name[type]; +} + enum { FF_HW_PICTURE_TYPE_IDR = 0, FF_HW_PICTURE_TYPE_I = 1, diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 77f539dc6d..54bdd73902 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -38,8 +38,6 @@ const AVCodecHWConfigInternal *const ff_vaapi_encode_hw_configs[] = { NULL, }; -static const char * const picture_type_name[] = { "IDR", "I", "P", "B" }; - static int vaapi_encode_make_packed_header(AVCodecContext *avctx, VAAPIEncodePicture *pic, int type, char *data, size_t bit_len) @@ -277,7 +275,7 @@ static int vaapi_encode_issue(AVCodecContext *avctx, av_log(avctx, AV_LOG_DEBUG, "Issuing encode for pic %"PRId64"/%"PRId64" " "as type %s.\n", pic->display_order, pic->encode_order, - picture_type_name[pic->type]); + ff_hw_base_encode_get_pictype_name(pic->type)); if (pic->nb_refs[0] == 0 && pic->nb_refs[1] == 0) { av_log(avctx, AV_LOG_DEBUG, "No reference pictures.\n"); } else {