From patchwork Thu Apr 18 08:58:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 48138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp1551763pzb; Thu, 18 Apr 2024 02:01:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXA8L8B+8vEAFLceR2Gle0ZkaQrcCXisvhNQpxBGoFavMv/cEg1dsi+REO7dz2VsLDR2P5Hc62obEnrJ/faL2cVQnxYuNjsyvV1Jw== X-Google-Smtp-Source: AGHT+IFPewdBFodVq8aOqAI7nGrksjTqgH6xjPSrj3g+cMVemC/H1W2fFeuAFYkNlO3gLkFw63LX X-Received: by 2002:ac2:5188:0:b0:518:8c8c:db57 with SMTP id u8-20020ac25188000000b005188c8cdb57mr1094464lfi.1.1713430885451; Thu, 18 Apr 2024 02:01:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713430885; cv=none; d=google.com; s=arc-20160816; b=pqkvd1QM7VsKTTvtm18qADAPEmxfdYiS0XjBX3iqpIu7BrLjueFlH0hiydDCzbJfS+ DylMEdTj+Op3xPl6/heGvnz9zeMduDu+un2W9EzYcuFCt/jVsvfOryvt4BfG9FgKrb9d kYNl9ZUydPjNZzZ7T2g7Z63I/uweKPNeHK0yAOHvOSyUgbPyHT6OK3OkBORtL72TODHN AffM5InchBXAW9CvlcS52PiJWVgB3dlroeHc8NoN4eBYt0GzILYo5ZYHrDNkM19130e9 yT3kqHb3zAKy74C7a8WNZbu9vgjPcuRgNBBjQculRbbf0lwyhxBSZ1LxlOyzPyemxu0r vTfQ== 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=q1kdfZ2WVoEFjfviXQUkQo/qA20jDHG+TCQ8dQEuWeI=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=Cu9qgP2VTLmwINnqcDHkBrk4sPDB+eE1MMV150e7/6W2dEHGEaK/y6ixTV63CQ6kZd TWVJjTNreEPP0dj4TPMVFYDjU4DJmijYtXtSTBThCkna+srH8R/6ErIXccNHRfHjAg3e Skz0QJGbqmq+b+JjfWSzlk1jLtLNbhS+0j/7HKhqx4yr5Fg9lZlkLo8IlVjUtltjwJcD /Jfgq5Ap751fvlk5wzDKPUK1aoyMnbSgDhwaZikxLU01uD88BouWxrJK4+3yvDFsSEKO 7lA/bptdh237lVdDkbPirVbiDP/Gjrk2/mYBbSBFa+5+mkX8TAsE+SYFNia5fHw+pIKi 5yhw==; 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="mJ/4NT+o"; 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 h4-20020a170906590400b00a5554e96232si619012ejq.618.2024.04.18.02.01.25; Thu, 18 Apr 2024 02:01:25 -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="mJ/4NT+o"; 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 15E2D68D42F; Thu, 18 Apr 2024 12:01: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.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFEF068D41D for ; Thu, 18 Apr 2024 12:00:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713430863; x=1744966863; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KAG/yivTgGEHchufiYiAVJxZSI/iQ/DiNn32BP+e50Y=; b=mJ/4NT+oE4yl89t+soF2Xbmjik7VrziivqkZCH4twimi/X++Noc5EZf1 Flw0AE1g9OlxIpwxEnyxqCTQmWyGzFxJcq6dZItS7Kjue7TJrmz0lkrWT Q7gnEY3vXIJK854PMMLMEspjzp1cGY7VegalOwPtIFjITp/216pnK0OS8 +Nvu/2QWHCNPp821sxK1R5/9ZS8McleYdJXbdb4Os8BSwFB2fxAWzfuwM 07zCJsJ6L9m7rMZeukbSDwBwGXFd3L+7k06FZ+/tMsVemG769PaovvgM0 VsTeY3zRi4wPaB7OyXSvI4i7jPwRC/c8PGO+oCo/LxCrGCtOMT+KIU73R A==; X-CSE-ConnectionGUID: JmZSTxBVSDqlpnsOkf07ow== X-CSE-MsgGUID: OTkI00PAT36xszkfN7683A== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="12748315" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="12748315" 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:52 -0700 X-CSE-ConnectionGUID: f3Z1XLCLRLug5GbUGKJxiA== X-CSE-MsgGUID: /AdDcfU+Qi+XcnIC/a3ObA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="54127538" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa001.fm.intel.com with ESMTP; 18 Apr 2024 02:00:35 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2024 16:58:57 +0800 Message-ID: <20240418085910.547-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240418085910.547-1-tong1.wu@intel.com> References: <20240418085910.547-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 03/15] 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: uANrlyUN27Ja From: Tong Wu Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.h | 5 +++++ libavcodec/vaapi_encode.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index 5272f2836d..a578db8c06 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -25,6 +25,11 @@ #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 { PICTURE_TYPE_IDR = 0, PICTURE_TYPE_I = 1, diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 9373512417..2d22e4bd85 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 {