From patchwork Thu Mar 14 00:38:05 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: 47042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp137565pzb; Wed, 13 Mar 2024 17:38:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVtCpMRY7KzqirIxoOWsVT5wQRQiK//7T8jO/6UTvlbXh0TofNxDi682fZ7cZJR9sbdVIRCscQtii9XryIxxKu+VTUac3hvbZ/C7g== X-Google-Smtp-Source: AGHT+IE77mK8L/KKvlKui9emezLtsevI+J4PY7M2868xXT/zcJ9wFIhv/AuvqWAPSr/yZlsE61X+ X-Received: by 2002:a05:6402:914:b0:567:17df:6bed with SMTP id g20-20020a056402091400b0056717df6bedmr71864edz.25.1710376682946; Wed, 13 Mar 2024 17:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710376682; cv=none; d=google.com; s=arc-20160816; b=QNpnbxp71Pqag2H6fKUvmfF5q292H0mQ1qSEyS+UiWmD4NR1T0vi7i1gYDFNfxv1+s eCfZ0AbxQUovZci/zMz/1HNI3etEAklczTth6gcQKr8xWxsEYyd9urjg6Y2Mox2AExgb kd/JTzfDjuxWGbpbN0lcHtyPiH22y89FLELiVIYZsirkfBMxecLpWv6zrq5QX1Qx7w/B WcG5IDFbZlPzMqmwJ08P+xch+YuH4WCQEyCqbp2YTPR2DCmTbMjR8QDoDaFmAQ0zSHPK DXtL3WUTA4fH5EzU4GRVlzyxTFB6PFiGg5wPjyjpQdQ3GaCjbp4z42xVpTRcPs5465ZP XcBw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=ztfTXDQdLuisq/3crWCIj/4Lf0x2Zi+Twig0meeFjkg=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=ltjV86vu4k4o3WrmIvC9nkUDrNZiiHyDPx0AvU03F09DvsaOothdU6nv29bMZaghKs /4WSDSH3xF777YamuqiqagBFpBe+gGR2X0OcXqCCgLk63ciYCgj+gmcMOhJhuclyCsOF u5LDzlyo4oFoWBqOLN7f0JDrq8C5za7qS/I9KcIlldzVL3RN863jz2i/sr/JLNdlcYBH EKppMxhNkFyv6rc7RyAsVB+s0n3r/++iLadHLH2NnaHZBAc3n83+3EUSx2+CgfJbRAEN m04Lx1JlL+3ErX5rLZgdngF+fz9CkJvqkzcELjIy1G89u3WYG6lnx1iv/154bq5KzX5h CL4w==; 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=iNMo8l6v; 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 ck26-20020a0564021c1a00b0056830aaa058si174545edb.138.2024.03.13.17.38.02; Wed, 13 Mar 2024 17:38:02 -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=iNMo8l6v; 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 83BBB68D097; Thu, 14 Mar 2024 02:38:00 +0200 (EET) 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 510F668CC0A for ; Thu, 14 Mar 2024 02:37:53 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710376678; x=1741912678; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3AHgkSWD3+kOkG8qM5nuzSAB7KpUtKU0oXP76e5C7dM=; b=iNMo8l6vQl8F8kFT7Ab0/P0SQSndqm/d5Iz1/bJ/aezHZdWhC1OGYQ0z 9LaNlZxtymji7kXvzwSik/hZCFiGcRYpJ8DCnQRr+VyQJKA5vhWEUuXJA 9oALEuStCHM5fuE0VN9EMBBExCpXGAJhF9agqBGVLTkVxnUyqnp6JsW/S MB9M3tOpna1zVmAlLsEbFYfRQO3PlKQjD/4qhYlMGq79fqwIFpHb7BPMl 28H2YZXleo/+WIenjVPh+9eD86SDVFKd/iEQ3czZ6dLbtxwiKf4ZGD2F9 g6M0weVaHaju18ReknZpiyV+lyEwBhqrz9rpqFsdHYW1uNV/C5dfm494M A==; X-IronPort-AV: E=McAfee;i="6600,9927,11012"; a="16625822" X-IronPort-AV: E=Sophos;i="6.07,124,1708416000"; d="scan'208";a="16625822" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2024 17:37:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,124,1708416000"; d="scan'208";a="16799576" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orviesa004.jf.intel.com with ESMTP; 13 Mar 2024 17:37:50 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 08:38:05 +0800 Message-Id: <20240314003805.1022077-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] lavc/vaapi_decode: Don't update buffer number if allocataion fail 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: QLC1yP50ML/P From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_decode.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index ceac769c52..cca94b5336 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -72,17 +72,14 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx, av_assert0(pic->nb_slices <= pic->slices_allocated); if (pic->nb_slices == pic->slices_allocated) { - if (pic->slices_allocated > 0) - pic->slices_allocated *= 2; - else - pic->slices_allocated = 64; - pic->slice_buffers = av_realloc_array(pic->slice_buffers, - pic->slices_allocated, + pic->slices_allocated ? pic->slices_allocated * 2 : 64, 2 * sizeof(*pic->slice_buffers)); if (!pic->slice_buffers) return AVERROR(ENOMEM); + + pic->slices_allocated = pic->slices_allocated ? pic->slices_allocated * 2 : 64; } av_assert0(pic->nb_slices + 1 <= pic->slices_allocated);