From patchwork Wed May 22 01:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49118 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9214:b0:1af:fc2d:ff5a with SMTP id tl20csp81856pzb; Tue, 21 May 2024 18:28:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVwp/KP+Ou9iVKJqA9Aq5Qzr1FqxTSF45GSz9edXR4qheS1eZdL1rYwea0LjWuKHKlrtjNfg/b+6fMiF7F7zbnW81Z7EavAjfFofQ== X-Google-Smtp-Source: AGHT+IHjZ0cSaHznRZBQpRDy8jTbs07p6vJNUQZZhfpjuYXTA10dbRutBUe2Gm+sT8AakhS4iSED X-Received: by 2002:a50:d581:0:b0:572:5f4b:bf2e with SMTP id 4fb4d7f45d1cf-57832a3fa43mr410550a12.23.1716341313409; Tue, 21 May 2024 18:28:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716341313; cv=none; d=google.com; s=arc-20160816; b=DRqOAI2J+ixXL0GFwcR+6MEhtXUNDDZY87UiTjuj3whffQk+2IMInjgozlM43zowGB e3wHfLWXYv7AKYDlNpBjt0rVbRxnA//mZIAzihOTkNWi82ccI6bcIj71CQOSShp/btx8 yBmaRVXxTNFFSROHiF9l+mc0aYclhAWgzpD/sgVX8XC7ysonmKKGO9gJA874wY6WeTHq twMqVjFd0d9QnmS7G7CfrX+MC6nWV+VnCoHu/aLKnbhICpshv7nijKFH8wyLBhMl0+Gz yzMfeNaEG+QmYR0e3g1QsGXjFi92cfcJ/i2wuz1mNWs1uTve6ZJafBLArVu40ciMzAk+ rbKw== 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=KcpKrQ15rIxbbz8wg9NIQDK+eaweb6KksBGd4KZkVLsmx5mP0ChUr01eOX3U47wMzg gH1LU9f4X97SIAuZ949zU/1JWnPzZeLtK5SlfULLIcM4zfFTgxcOUedu4KPgfnHWGGCn Oz9VcVZY+6uQFZOz099ain1MKd2ny3sEd4zQbVPFHLLuWcL0kIqfw0ORXtau9IECnbEr mnjNHEH1IQeT8XKNgfTXWmcnQZiFDhnvlPxYvroSmL7o6SyxB4KCin0CZWVExLqhaEz3 cg3xE5sKROSOkq2qxm4kHewG7YQg82v4bJLuZUhAgm2BNh7NFAqRRJ1iMc2IUaoDRmPN 3aow==; 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=EWBYIOhH; 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-5733c37850bsi14111991a12.629.2024.05.21.18.28.32; Tue, 21 May 2024 18:28:33 -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=EWBYIOhH; 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 7B6FA68D3FA; Wed, 22 May 2024 04:28:12 +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.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B212868D3C6 for ; Wed, 22 May 2024 04:28:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716341291; x=1747877291; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KAG/yivTgGEHchufiYiAVJxZSI/iQ/DiNn32BP+e50Y=; b=EWBYIOhHqEjMREWuHf1D2eQUm/QM8mF4+mPzagmfYS5tbF+38k1mj1jR xiLds+SN7In4zvYDJFheHYiwugtPbMkOlvy3LTtMh+Vq8Mw9pCqv9WVFv LHN+hjs8xis1jCIUEU4hhnyNk5o+Rew6nKFfTPROFR1+TQ9M5BQTexKK5 SQn3CMX9m3VqXPamH5pZLCyY1t2++7e2W+IL6rSpXXrbYJZNtKBQC0vEr xw9q6uksdHCG81/QXMQg7lPb6gLfwQLrL+31/5f86pbGr5LhV++ZFFWu+ C35mpcSMHysvcsTfMMNHA0DMR/VIqsIpNjUuNR8IaKV2JkG7fHqXaCO/v w==; X-CSE-ConnectionGUID: zYrjvbR6Su+WqJaTcD71OA== X-CSE-MsgGUID: xDN7EHFTTKyfMsT9HXUXQQ== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="12797198" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="12797198" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 18:28:03 -0700 X-CSE-ConnectionGUID: 86di0l1tQqawx0GZeFoZwg== X-CSE-MsgGUID: KCRaRggjTQ2T9J/vgs4tkA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="33537440" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa006.jf.intel.com with ESMTP; 21 May 2024 18:28:02 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 09:26:16 +0800 Message-ID: <20240522012627.1386-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240522012627.1386-1-tong1.wu@intel.com> References: <20240522012627.1386-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 03/13] 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: vdc0jC3axZMR 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 {