From patchwork Tue Feb 8 05:47:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 34162 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp495675iov; Mon, 7 Feb 2022 21:48:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJztEx1ZEwtSesxA40X3vdxl0qrh4iNgKzQe1lES8lyBP3xJvbS+NIuYB8G4mJlN97aDs5om X-Received: by 2002:a17:907:7d8e:: with SMTP id oz14mr2445883ejc.230.1644299303278; Mon, 07 Feb 2022 21:48:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644299303; cv=none; d=google.com; s=arc-20160816; b=N0potkApDy0cksdl/QqaBONPvp1OC1GTpIrqOPHV7N0l3DFBLoou53WfzBMYZvbPau WgyumXQJQ8LzuGgrDP9OsxAyOQOanFcS3cBMg4K+JuvqgByf07a3BirVV3L494H3Tp33 pefZXJFysKabZvwyk6xXeRVVjO2WFW/wfhnfQUyjpbUZB5yqz4qcJCAF4inLj149CON6 YpNI3NxC241tBjM1mlvr8EZQ2NDnt3qVh+V8g5XgdkCKlWObsgyP95eod0yalnvRNHl6 YksF+FaddGtVyvVddRJgfU6zBLzDzJqEIckh4d2sz9oE6shh+RaNMZlsK6uMZH7r0pwb BreA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=+vQfuw5nx9SbLCsIXveRm7Z4Y13OESfO/pYnrALQNZE=; b=lhneSjErS265f4qFSKUU6AnTykCn3mWcvtAmmNBKsl4gons2BIs4djEoo79CJTf39f +ZcDG3pEFgZzzZ7TIZD1MUk7SnJZs+1EK/T3oV3si6dXb+WunB1asZfl0S+9zuvjOms1 czhGRFoSyJE23RlzpGrzo4e1gXdQreILrES29iAnL0KTJIY6cDFCBtqUBbHxW4R2PeOA 6UIrl91hqft1ShRl9WPhoWxUuoTzMkmXJqROuqHcN9yQYVQ36UBRiIkgICuKfTGKWY7K mfzG4KYyYRbDmDF7fJlL9V6qK9q04LE6JL6zS/WTPcteSYsyt3ieSs8UrcjqUw80ex9f Ap/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=mPPfCw7w; 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 cs17si5122909ejc.426.2022.02.07.21.48.22; Mon, 07 Feb 2022 21:48:23 -0800 (PST) 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=mPPfCw7w; 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 2EC5468AF36; Tue, 8 Feb 2022 07:48:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 86A6168AEC9 for ; Tue, 8 Feb 2022 07:48:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644299296; x=1675835296; h=from:to:cc:subject:date:message-id; bh=3aN0DKxY9lEPrpyGCyC6BrtCr2KcTN8Jj4pGWdNw+94=; b=mPPfCw7wMxQdq9JWB7XOh340W9gA4JRdW/6gwgtCwRjRKfbKHEvAjr+b 0JUfmp0Tk7VXGSM5+qT3i/FykvZ8HR1mZE9tY5u+H8gdJceiLS6RGCFLD 4wjTkimH2MCLybuQ/7sVKOFoedz0yL/2DelpILMsdoUMi19Z/LcdvGcEK sH5YqMlYpEm0RjxAe3xqqpsctIGG+73JQniGrdPwIKDMfxn3i1oRYTjtL OeKUakKzxbP2zv0corZPDCRUucr2PHEtam6uiH194k9TW9anwGUq3MFAm WvUhUCzW2xjhqw30Ez6t26h5PrIg8HJ8c9Nfahod+e1MGpm7pE2TWxdIc A==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="248642496" X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="248642496" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 21:48:09 -0800 X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="540451075" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 21:48:08 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 13:47:34 +0800 Message-Id: <20220208054734.14166-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] lavu/fifo: fix regression 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: Haihao Xiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ciZZoPwlmvgP From: Haihao Xiang offset_w might be updated after growing the FIFO Fix ticket #9630 Tested-by: U. Artie Eoff Reviewed-by: mkver Reviewed-by: U. Artie Eoff Signed-off-by: Haihao Xiang --- libavutil/fifo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 0af0154945..02e0ec3f0d 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -147,13 +147,15 @@ static int fifo_write_common(AVFifo *f, const uint8_t *buf, size_t *nb_elems, AVFifoCB read_cb, void *opaque) { size_t to_write = *nb_elems; - size_t offset_w = f->offset_w; + size_t offset_w; int ret = 0; ret = fifo_check_space(f, to_write); if (ret < 0) return ret; + offset_w = f->offset_w; + while (to_write > 0) { size_t len = FFMIN(f->nb_elems - offset_w, to_write); uint8_t *wptr = f->buffer + offset_w * f->elem_size;