From patchwork Wed Sep 25 02:15:27 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: 51807 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9548:0:b0:48e:c0f8:d0de with SMTP id t8csp185262vqk; Tue, 24 Sep 2024 19:14:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXAfl7646FqlFrjFpQJUxag2L6h/GOWb/KZTmWSwg7r+0wu9lbcD79TQSex+NPSYcZsz+WiuIp0u/7T/7jkbBEW@gmail.com X-Google-Smtp-Source: AGHT+IFm8Npds/DQeK1CMUHPpYb1qRvBcFrA2H22DZ0jUiiJAmMdM01YowTJwe0jeCKXQ0JNbsJP X-Received: by 2002:a05:6402:1ecd:b0:5c4:2ad3:b8c2 with SMTP id 4fb4d7f45d1cf-5c7206198d2mr442544a12.3.1727230474867; Tue, 24 Sep 2024 19:14:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727230474; cv=none; d=google.com; s=arc-20240605; b=FS2pujwr6jFGeyt6nZb9S1zuBJJmwW2HzzOQyOgQY71uufdNixp5cKWqzeL1dc5vIY yzD7Ud3kfy27tnYzLWLRW8Gt99EkeW/Q/1QErEhFoLDTvxA/sl97pGNSO+P8LlTAqGEz pyFlK+yP0hq4hMnvZMjnK8eG1DRd/V+/itSWk1BDoQxZF8UBuLiKMq1ax/s2kspQw6NE 5luTp7MlXlGj8bnlDioFH/ds0EXCJ+B2jROzs1QtXS8Bi7x7UKgrpO4SB3hyf1F1lxkI 75pWXYbAVj99FK/GaDHL2ZM6zG6CZ12S9sd+WZdtrqU9BB0DQZUFTrlC1XVpJWBGBgBJ Uwuw== 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=C5T1ErmarTVdaq5saIUvyVZhVUSaWkcu6xSGggsrYojt0KP2hh5gJkscOWzuPciW3T vQGN6DUkAuRj4QEVKLS3B6r46K8u6TwlNTpLAXSR4OPM+OfQUTAjKClI9wDfyaSQzhN7 x7n0iTdkQS++4ZBn2t3Oqf+XPtXp0TMRtbR2BrnlW1A7qEn8UcfPVU3DibUmriPl1Trv um2hLB83C1EGF9JY+5Y5lbELGt66wfuhHfX6xcNZUnImo3TzE4AOiryyC9n3tUXBO/0B edRNzojTFs02VFo3fbnoxC5oX+20CGvImoA1v9srHvEwml8KKBRNAP/ZREwlPwcXdQ9v qkRg==; 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=CYRS20AB; 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-5c5cf4dd0cdsi1751730a12.523.2024.09.24.19.14.34; Tue, 24 Sep 2024 19:14:34 -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=CYRS20AB; 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 D4E8A68DA4A; Wed, 25 Sep 2024 05:14:30 +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.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 238F168DA4A for ; Wed, 25 Sep 2024 05:14:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727230468; x=1758766468; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IrO3rgiaATFCBMWE8x0XGUgX9cB++vIZ1AeoG4bfn3A=; b=CYRS20ABaHvECuqNl02YCMra/3CGelKbg8aIxBjabPYBm2JYag3OkTgi cNK2uS2Sxey6dxmSZG/IDieZycFCGyz7F3LbTCpnYQ3DMhWS1/dgkJina SI1GfqLN9SzMaBIeNPAWdAeHcFam/HAgN+FeI/FcU4VNQPpLdYLTkqxjX q6/KMdrEF0fgG+ihm6Z2vX98mX9mz48qikqA7drmISjdAo4HIUpWfaxrM m78QYvcF63vFDq9tI9C0G62xZS02OcyxI1b3leL+Q2NrhcfpclQTpU5Eb j4TR8ViR/koV4jaYQIK+A3xU0Fdcd+MKtD5E1u+mpTDtw3CUGWN3Vh6dv A==; X-CSE-ConnectionGUID: PwyX+ro4QberriIdLgQGpQ== X-CSE-MsgGUID: HM2F7PhwRx6tm7HPwSBgrA== X-IronPort-AV: E=McAfee;i="6700,10204,11205"; a="37633940" X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="37633940" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2024 19:14:19 -0700 X-CSE-ConnectionGUID: aWNAWHJRSm6p+sotP2QTqQ== X-CSE-MsgGUID: qSfijCLiSXyS3OSZYWP1Dg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,256,1719903600"; d="scan'208";a="71246383" Received: from feiwan1-desk3.sh.intel.com ([10.238.208.39]) by fmviesa007.fm.intel.com with ESMTP; 24 Sep 2024 19:13:06 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2024 10:15:27 +0800 Message-Id: <20240925021533.1742735-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925021533.1742735-1-fei.w.wang@intel.com> References: <20240925021533.1742735-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: 5d4fcQ2zU9wr 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 {