From patchwork Fri Dec 31 10:53:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 32955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13864279iog; Fri, 31 Dec 2021 02:53:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUZDKMh1If1wzY/7q3U6JdJJqWVNkplDpdpUPMJ/BQ1Nma5dTjDxOS0tWl859x3OgveR33 X-Received: by 2002:a17:907:2cc4:: with SMTP id hg4mr27398227ejc.150.1640948013718; Fri, 31 Dec 2021 02:53:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640948013; cv=none; d=google.com; s=arc-20160816; b=wSfvzQ61caU5zJ7zl1jJNWceEVpH458ngr7kipu2sDp4Rzpk4J+W1AHyThtvqJHjgO Dv9nzBnJ4louGr4hAzHoq8HViCwoaN7Q3A3ne9FdFMYrBr9NJYQENJjZpg5Nd51uBM2p XC5/2tf/ovw7rDM8E34zvDApQsqeocvIqQjRV88cOJc/PkXLwMQTS8tuKprhrU1AlyZu 7kHmBkfF9U/Fx8ImojF7hgYhLOo9JzTOHNdYgX0rXYDtqxUXL9rEJCBLeN8NPbYLkbDL NZKTFkO2Fyq1eCUSL5iKgJ5asquoj3JdDMokIEgUoHAUzw2ETCNHwO3Jq/2aEcnKDjiC OrjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=G0wwQbY4G4nzKtfm6g+oQiGbofTtPo0Ukwm6Qa16t5g=; b=yXTkDCjRycaJf9vfvK5FGsCcp1+sWpev/FhhSnh2O9rx4+4CMg8za0Rahg4WnB9oGj Mzonlx8/+bw+oXb0S8z3JIWUfHpPQfUpcm8uPzt17xEMzOY+tUmU2mn1EN04PRESo4kg TGDoGaY0AKtAnTD36zQtx6PV1R9QN1IlJUt/Hjz2cGI9BUyLTEJEV10u9srU6MznpRu6 PcNEwgjNeP5G2dhvBMu3R3luMpB0CQL1iDFzbL5n1P6DKvpn4/J/rqz3V8vVroA3YCo0 tpCt9PDE53OPw1TZgINO0HniOrVLWBPVTH0jW906Z1Wj7eTY0BNoPbkIxt58cUrxPcn0 Cy7w== ARC-Authentication-Results: i=1; mx.google.com; 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 dm13si15067611ejc.579.2021.12.31.02.53.32; Fri, 31 Dec 2021 02:53:33 -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; 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 D2EDC68AFD1; Fri, 31 Dec 2021 12:53:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0CAC680044 for ; Fri, 31 Dec 2021 12:53:21 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 897F4240511 for ; Fri, 31 Dec 2021 11:53:20 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id PLaOrf_8AtBB for ; Fri, 31 Dec 2021 11:53:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 97B622404FE for ; Fri, 31 Dec 2021 11:53:19 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id A10013A0743; Fri, 31 Dec 2021 11:53:19 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Dec 2021 11:53:04 +0100 Message-Id: <20211231105307.30946-4-anton@khirnov.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211231105307.30946-1-anton@khirnov.net> References: <20211231105307.30946-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] lavu/fifo: simplify av_fifo_alloc() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9EedPtJC2z74 Turn it into a wrapper around av_fifo_alloc_array(). --- libavutil/fifo.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 1060aedf13..5eee18a8c8 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -24,9 +24,10 @@ #include "common.h" #include "fifo.h" -static AVFifoBuffer *fifo_alloc_common(void *buffer, size_t size) +AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size) { AVFifoBuffer *f; + void *buffer = av_malloc_array(nmemb, size); if (!buffer) return NULL; f = av_mallocz(sizeof(AVFifoBuffer)); @@ -35,21 +36,14 @@ static AVFifoBuffer *fifo_alloc_common(void *buffer, size_t size) return NULL; } f->buffer = buffer; - f->end = f->buffer + size; + f->end = f->buffer + nmemb * size; av_fifo_reset(f); return f; } AVFifoBuffer *av_fifo_alloc(unsigned int size) { - void *buffer = av_malloc(size); - return fifo_alloc_common(buffer, size); -} - -AVFifoBuffer *av_fifo_alloc_array(size_t nmemb, size_t size) -{ - void *buffer = av_malloc_array(nmemb, size); - return fifo_alloc_common(buffer, nmemb * size); + return av_fifo_alloc_array(size, 1); } void av_fifo_free(AVFifoBuffer *f)