From patchwork Wed Sep 18 07:10:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 51639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d32e:0:b0:48e:c0f8:d0de with SMTP id cf14csp727773vqb; Wed, 18 Sep 2024 00:08:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/JpPNlTKuTzvMCJvh/71ICDRanZqUwsCOdw3x0QvttcmtYUE0C/vK7wPMyNGlN/WbykuV1yVno+3IYWYaoTNS@gmail.com X-Google-Smtp-Source: AGHT+IENzyp9lsUaF/DWLKZCArZ4krG/OakuvlvOcZ3EMnTD9tGcUmhviNNlvSrEvS4+0NgRvYVC X-Received: by 2002:a05:6000:bd2:b0:374:c512:87ce with SMTP id ffacd0b85a97d-378d61f0beemr14518789f8f.30.1726643310070; Wed, 18 Sep 2024 00:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726643310; cv=none; d=google.com; s=arc-20240605; b=NbCFXx7dPKORFdgdwexf/RC5xDG4cqZzYjL9zfYzduV4zmg8LjBZwj38ZZdlQtwcl6 GvnKpyh5hbb9CdQR+aeWIhVDvNZBrAoHK3gIIhaAuZ4OznRjQZH6+/hyFxSF4+haqBI0 yaxyatr9wZjA+OCvD7vSWSZ/9HsBnvVP79PAie1MHiPpGQcFdUFyKJ4RyQvsCJJxuuBx D2izrCVzJbQGfY1XpVPJ7vmFKEedBGt1As7VT4v2aeywloheVXOQFyb32E3dsX07cZs3 J/U2KWwVz1fO14UiBf40lNBoe0E36CPnRkFEw45fSKDCG7W1wqgHYKizdwN5pQxoApon zoog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=2MNdDttoKr+JgFokbJdhWR/S2I0kXUO3+qz6DqI3YAY=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=CWLKWk1MJJ5JGCf4cM7S8xhwP09djThpMvvWMp7nzVcmqzhsy97HlCRGU/kKx/p4ES YNNkpQ1Zax2V/VJuEhgZ/4LpLeNpGuCEedneyYgVBLQBYzTPQIhSt+8pZRAua2Y6gydm v4+o61uX3MKFmgQE6Ti7FxbhcSwZ7vnhXrpvDtQYBYs52dAU+2RdyHhw6MXudTfM5n4Q sHukmQsgu84HLeKcU5RXpe2F46qJ3xMZluN4BntFVN0L2YT8GmvImPH1JuK7G1acuqkY fjlsnoeT0Jl17kOT8i9xrcpQaRCY/X0xMvGNsmhOVLfP7iag1Rn54eKaksphVnUe6Qe4 Tbmw==; 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=d5XiK9Ig; 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-a90612ef5ecsi612439566b.667.2024.09.18.00.08.29; Wed, 18 Sep 2024 00:08:30 -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=d5XiK9Ig; 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 D639668DCAD; Wed, 18 Sep 2024 10:08:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6D4568DCA3 for ; Wed, 18 Sep 2024 10:08:10 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726643297; x=1758179297; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IrO3rgiaATFCBMWE8x0XGUgX9cB++vIZ1AeoG4bfn3A=; b=d5XiK9IgQjLuxaZwb29aIeYB246JlJxuST2XIOrXenBkrmK2GxO6WK1A Mq5imRMu+bhRH3X0JAtpFsomPMeWgpPgAHBaw/sYMRUxRamummWbkdrHH gqUpopHZTpmOK4a2oR8fh/ezQotQoXTKy+HZYIj80HLzr4wPj18J5aZzy o/BiW/LZMbAp64Su1BgciH/J/NAnxTbYCiWzBOi3UxKrsyKhkLBOx7lb2 IQ8VBVNeL2w/MzGYIHtx0xDDY1jDakrRK+8VFeLtvFerwMmBbgBs9xZcI mDH3pgzg2tGP++9c7zksCLauP7FqnyExNVGwZDzcQ9k+z4P4IGpfCMfdp g==; X-CSE-ConnectionGUID: iELr4SONS86/c7st1UglGQ== X-CSE-MsgGUID: u/MxUyP/RR6yjvnau6b0Gw== X-IronPort-AV: E=McAfee;i="6700,10204,11198"; a="25695716" X-IronPort-AV: E=Sophos;i="6.10,238,1719903600"; d="scan'208";a="25695716" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2024 00:08:07 -0700 X-CSE-ConnectionGUID: XHZjl6+qR+q9hH7gGWvRdg== X-CSE-MsgGUID: avPrLEVhS+SnE+MnsGsm7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,238,1719903600"; d="scan'208";a="69452239" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by orviesa009.jf.intel.com with ESMTP; 18 Sep 2024 00:08:06 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2024 15:10:25 +0800 Message-Id: <20240918071031.1377336-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240918071031.1377336-1-fei.w.wang@intel.com> References: <20240918071031.1377336-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/8] lavc/vaapi_decode: Use a more meaningful variable name 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5xL4KpcBivvY From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 20 ++++++++++---------- libavcodec/vaapi_decode.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 709699dcaf..7753f72106 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -84,19 +84,19 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, VAStatus vas; int index; - av_assert0(pic->nb_slices <= pic->slices_allocated); - if (pic->nb_slices == pic->slices_allocated) { + av_assert0(pic->nb_slices <= pic->nb_slice_buffers_allocated); + if (pic->nb_slices == pic->nb_slice_buffers_allocated) { VABufferID *tmp = av_realloc_array(pic->slice_buffers, - pic->slices_allocated ? pic->slices_allocated * 2 : 64, + pic->nb_slice_buffers_allocated ? pic->nb_slice_buffers_allocated * 2 : 64, 2 * sizeof(*pic->slice_buffers)); if (!tmp) return AVERROR(ENOMEM); - pic->slice_buffers = tmp; - pic->slices_allocated = pic->slices_allocated ? pic->slices_allocated * 2 : 64; + pic->slice_buffers = tmp; + pic->nb_slice_buffers_allocated = pic->nb_slice_buffers_allocated ? pic->nb_slice_buffers_allocated * 2 : 64; } - av_assert0(pic->nb_slices + 1 <= pic->slices_allocated); + av_assert0(pic->nb_slices + 1 <= pic->nb_slice_buffers_allocated); index = 2 * pic->nb_slices; @@ -237,8 +237,8 @@ exit: pic->nb_param_buffers = 0; pic->nb_param_buffers_allocated = 0; av_freep(&pic->param_buffers); - pic->nb_slices = 0; - pic->slices_allocated = 0; + pic->nb_slices = 0; + pic->nb_slice_buffers_allocated = 0; av_freep(&pic->slice_buffers); return err; @@ -252,8 +252,8 @@ int ff_vaapi_decode_cancel(AVCodecContext *avctx, pic->nb_param_buffers = 0; pic->nb_param_buffers_allocated = 0; av_freep(&pic->param_buffers); - pic->nb_slices = 0; - pic->slices_allocated = 0; + pic->nb_slices = 0; + pic->nb_slice_buffers_allocated = 0; av_freep(&pic->slice_buffers); return 0; diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index a373eb5d6b..7813473c98 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -41,7 +41,7 @@ typedef struct VAAPIDecodePicture { int nb_slices; VABufferID *slice_buffers; - int slices_allocated; + int nb_slice_buffers_allocated; } VAAPIDecodePicture; typedef struct VAAPIDecodeContext {