From patchwork Sat May 22 22:09:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1696246iof; Sat, 22 May 2021 15:10:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfomR9E8nF8CdcLIBiHFAZn4q0aB3xJ8W75Fv0ghREdyUoMhJ96N1NZje2FPjEptLq+TRF X-Received: by 2002:aa7:db57:: with SMTP id n23mr18254073edt.229.1621721416773; Sat, 22 May 2021 15:10:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621721416; cv=none; d=google.com; s=arc-20160816; b=jnnlY5SU+5a0C9lt4OtTNCM9zOYjfUAG4KjCbpB6VvMkLmsVgL+GOuETMx2wzohKCn XIghxpe42ebigag7x4DEptadR62BZcYjtU8dp8i+aNtlm9tLZgonz90E7zzOx9DRR9bc Le35agVpqrLwHwD95d5Rl5V9kdNVEsdKJFTWrXYHHIIAUs2QyP0h2p23+eorFUlZ27iy BDSQs9uBgz13bUW3jZMusmtSj/s+A7wFw5R/rfWyFayqV/ttDh+3dgPkbm5qoBp/4BtW iUgaHANal3pMQeUYogK8lkQ/djiyGWFg0HjHHk4vbapDLt967/2skU0E2IMaImnStW7S jTLA== 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:dkim-signature:delivered-to; bh=WOqnS+lY2L2ekOboNZxuIp8lNa6b+lspCa6VZvFet7M=; b=k2vhatKp/P+duz7kIKeklMr58XVX6WzCPAkvvez6zV7aZItFjnVgKzRUdaQsp9JgKQ LlKbmwhwZOg+ATs2VmEozoDWHOpvhfdAMSBTOpi5lIs8B/HZv+ddlgx+OKiGZ8ZeHZPi VCzVepMK7OpAEWec79bC/nr6w2Z2mSIhJWejTNBei677F2rxavoiHJpjqArT3dao96qq YMFnzNpKoHEFThIf48qQGiaQlWimzQ6OZxDC4f1wXzzhlZZuEbpqBtrMdUTXwjnE+GdL aJ8N4wqLXCxcviyOw+a//O4Jvo9kqX9RR35FhY7A/yjvjaOvZM1PycqxYLt/WJv/mUsj wUbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=O5e6dKOm; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n15si2047719eje.4.2021.05.22.15.10.16; Sat, 22 May 2021 15:10:16 -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=@gmail.com header.s=20161025 header.b=O5e6dKOm; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02C036883DD; Sun, 23 May 2021 01:10:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD5C2687FFA for ; Sun, 23 May 2021 01:09:58 +0300 (EEST) Received: by mail-qk1-f176.google.com with SMTP id f18so23487891qko.7 for ; Sat, 22 May 2021 15:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZzQKzSUOr2C0BNmqKrUBLqk5bxiYYzq8i6+6xUXr3nI=; b=O5e6dKOmhaZJf7AKVkKHLx9Lwtqia7tKWRGTfRlatNWuGK9oO+9TDMXAt0mv2p8qIJ wChXSnWYyM0wJr04JZ2s6E9Ztsiytgcr1Syn6No/0jGGQaipUAZsnXJTIjf1gHi/3PY2 4JnGe4UBIsn49MKZaK0L3W0LsiTkOke7Wj2Cg93EGG2hzaGSL+WWe7DlfC+jOPhPUQJt x2kldWpsa/ATi60U+8y92y5Oh3QYAVTGjZQkNOraWVIZcF67yzfkNMiITANxdxTuOuv7 6INecclXnUiCiHSr/G+Pwm/OnzrV58ARmUjZy4FGmcc1MwXmJaytjRg3u1AUT91EsQv5 E9wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZzQKzSUOr2C0BNmqKrUBLqk5bxiYYzq8i6+6xUXr3nI=; b=kEYOEQGjK4olWKKjTtsoYBj0yzdhF9HBu8rTyiW9LbKdNhiiIfqdD8evTp7pvsyW5z D7ypWOazYbH1VowD4YR3X79Vegmsy128Pl9nXUr/iWMvgN2PxKgDu3jOLkTWeYiCiEG7 MUBlysnf+eCqfCtxKW6f518JyzaGYFkBUVfgD5/eqv/SMjaMLE75K49RvV9n77J01Jyw 4/nkazN2T3YsZXGnPpsSEiExb1udSlHrhcCDzaQ6e8fmWsCl4yAU91JCz9moAq9MLjAX GhWh0W59Ip+5tLCqi2zmdsiUTZtASMTVw3Fn/Vfq/2mms+GY6zwLzHZ0ApBqTOScbhV8 dY/g== X-Gm-Message-State: AOAM533qRv0eqjXCOwB3FZL6CAfFNGVC8ThotT5ElYPnaKrmkzj4swH5 UGQ7byueIzliIq/tTml5nVt61R2aRLA= X-Received: by 2002:a05:620a:112d:: with SMTP id p13mr20603810qkk.375.1621721397289; Sat, 22 May 2021 15:09:57 -0700 (PDT) Received: from localhost.localdomain ([191.83.214.167]) by smtp.gmail.com with ESMTPSA id 20sm8007327qks.64.2021.05.22.15.09.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 May 2021 15:09:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 May 2021 19:09:04 -0300 Message-Id: <20210522220904.7012-3-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210522220904.7012-1-jamrial@gmail.com> References: <20210522220904.7012-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avutil/mem_internal: use av_max_alloc_get() in ff_fast_malloc() 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: pPeaBXjwgZYl This puts ff_fast_malloc() and av_fast_malloc() in line with ff_fast_realloc() Signed-off-by: James Almer --- The alternative to this set would be to move av_fast_padded_malloc() from avcodec to avutil, and moving ff_fast_malloc() from mem_internal.h to mem.c, in which case it will no longer be inlined for easy use. libavutil/mem_internal.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h index ee2575c85f..76277d3fe4 100644 --- a/libavutil/mem_internal.h +++ b/libavutil/mem_internal.h @@ -24,6 +24,7 @@ #include "config.h" #include +#include #include "avassert.h" #include "mem.h" @@ -138,14 +139,21 @@ static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) { + size_t max_size; void *val; + av_max_alloc_get(&max_size); + memcpy(&val, ptr, sizeof(val)); if (min_size <= *size) { av_assert0(val || !min_size); return 0; } - min_size = FFMAX(min_size + min_size / 16 + 32, min_size); + if (min_size > max_size) { + *size = 0; + return 1; + } + min_size = FFMIN(max_size, FFMAX(min_size + min_size / 16 + 32, min_size)); av_freep(ptr); val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); memcpy(ptr, &val, sizeof(val));