From patchwork Mon May 20 14:52:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp4513868pzb; Mon, 20 May 2024 07:54:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWyZkEEsJe+5N3o5foyC88Y1XOn9oqLlqPJRPt8EBh85ro0PcG8uBluL6nHj7Tvpp0EarxJb2kAT3BlqUtkJYFenDHdYAlwQ/rcNA== X-Google-Smtp-Source: AGHT+IHP0NEzqFTomV3IvZKoTZu9SfdvGJKAEkhNBYhKZIbgvUTe82aliKN+nlNHisfEsvGcOr6G X-Received: by 2002:a17:907:7292:b0:a61:a581:d5c with SMTP id a640c23a62f3a-a61a5810e00mr199516666b.6.1716216869590; Mon, 20 May 2024 07:54:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716216869; cv=none; d=google.com; s=arc-20160816; b=j88HtXw7x1tkPpUpidzKggNZgyATg2+N+RPVAHTo9+RppfPcEZRkYABZpIlfnK+zRg FzQrDbNDONgxdjkIOLPvhm4vKM2p6J55W4HzVimQQbtbWggAfGNN7IDRgdDGDDzIJnY+ uDA+0AJntmUpnekZm8jE4bbqCTUIozyAaHz5wJNEzxc+dLGrK6YDuz0b1tESVP0ebllg d12qLoWey9LB1NOH3x/61xWYgFvrXKRrf8kppafjvCx1QWANs1mc4IZ/lqXbfe2JxcaE LmkctMlQOzOVbihKvjHTP6SyTt+WadcI4gB50f1zjeRaxtGL0L+EGEStYYbfcKEIsdgE I3Ng== 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=s3h8qXIb/6SCa0HmOZCJijhbMQMfLm48LE9Abf+J85lDs4wXxcDDbDScPnCK6G2vQU 918z0FTGkAoczjT5i9wy5AyofEDOXjbR2FAH2q/HRk3iCJ6nHUgXp1Q0Y6uxEmelMmMs jJqKOzGQO8AXpgEDVagFQoqQkVYWw1bMN3qLXA/rf590nkHkPN/Pd1lgmg0OXXcGiqVs Y7j9lpZnDXtDNYPrULgckrJPmgXBgiGK+um9uCHQchB/DrXcPv/ySUfDHqYglkzGumfs FckwI1mI9QhX7sGgijimCbUXYJQNzydmTaL0k7L7vdwIntuXX47Frb+3ZEsMhspt51my 2trA==; 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=nRapLtq1; 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-a5a1871e3ccsi1340463966b.185.2024.05.20.07.54.29; Mon, 20 May 2024 07:54:29 -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=nRapLtq1; 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 8E92368D120; Mon, 20 May 2024 17:54:09 +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 4689C68D180 for ; Mon, 20 May 2024 17:54:00 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716216846; x=1747752846; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KAG/yivTgGEHchufiYiAVJxZSI/iQ/DiNn32BP+e50Y=; b=nRapLtq16G8eiahX+P/os6ZudPEg8Zf0GqdNj43UwkYyES0wCl4+MiiZ XfnI39CImsPXQK/eykTs6efrTCXU7jdKfu79frgHVrs/mKDTKfbHp/sKb j+rcuzVP4geR+rWdTPVCA9iK3677lpIYTQycG8E68wB9i2CWdM83EOIj3 /V93+R8CjoflABkIXxqu8D3N/t0+LxCnqekTuAAiCduPzKbWlzD8idJ5V ap/9QsP0kP3Vnwfd8TAW6GckyCrwX9akuJsVfdzQaUqvQ9zpWsu1C4+6N abScZNIsARPLxXPz01r/DfMy1uFO9gMUOfcKkjPRRhJ5wbCBNKaIYF2iR Q==; X-CSE-ConnectionGUID: 5KfrfeDGQQinxqyV09TGiQ== X-CSE-MsgGUID: 7plwfAiHSV2sXSoZBuJO/Q== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12197245" X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="12197245" 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:58 -0700 X-CSE-ConnectionGUID: PKbylybwTFayM4Ps8AsOkg== X-CSE-MsgGUID: 0OUmmkexQ9qPYCLCHCijZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="55787866" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa002.fm.intel.com with ESMTP; 20 May 2024 07:53:57 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 May 2024 22:52:12 +0800 Message-ID: <20240520145222.291-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240520145222.291-1-tong1.wu@intel.com> References: <20240520145222.291-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: PrI6+qVJdiuR 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 {