From patchwork Mon Oct 30 15:23:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 44440 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp1501522pzb; Mon, 30 Oct 2023 08:24:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6veatPMl1sMlnu8tNqwoRL6UnAyVZ+LvgZ+bAo6H2FbUdAS5wBBkguFx7Ss7VAt4/dopz X-Received: by 2002:a17:907:3e1a:b0:9bf:32c8:3106 with SMTP id hp26-20020a1709073e1a00b009bf32c83106mr10119210ejc.2.1698679497147; Mon, 30 Oct 2023 08:24:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698679497; cv=none; d=google.com; s=arc-20160816; b=kbKHnR/eEo2enyQ8rguusWQ+2v8YUJUZDDnWE2E8Sd/Rml3KlhdrtY6jIrUU3k/iAF 4wspTvOazYpP3BeexBoEKkMi8IbJEsrcAS9uOelpL9PjxUx0vTJ+NijDYYvHpMh0CMTF CN4bEvitRkrfyHY/TIEAn1Tskv/PMypWOtfntobfuewyO04BMFRn2RK1hPznE/QDNsM9 4g2uH3IWGvxcPgzmjNYRmChgOaQqNInM/qzPaTqKxKaWaR5vAnJWBJkzWbflfVP6y4bp kxM6ebTVwVy1aXJ63o9Gtmg82R9kzNnH++W0uqqasgYMuUTPxADUeF5aidQcvipW/kpO q1LA== 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=mPOtUmiCM/Fm7BnF5RMWGHp/N5UdwVu8yYE/uvfvPI0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VYT9SkZ4jFgNbsWemIkiRvmkp/0XusIfDeRcNhDhFoeXoLT7d8uO7FIYETvM3gPcU+ FTbFQzNxRNt6OxP41+iWgBYk6sVdjRVNOf6fj2mWqmDk5cWHgBE6MaCOKkUVuFtSn456 Wh/7OSaKGq0BE4hc19tTUCwrFI9mLLERw9BArr8zUCE2BSSZVGyaxvp/KsreaQZsDDQF shMT6NMk2IoflkDMWELrluxu2TcQP48bMmw7d/a8FleOu0D7BXG7ceoZtUUM1iA18qcM NXHBBsNY2B/lp9jpnVBmMTJ4wAOrGGfuH771/o/BPrUaawOgdwCRQ6zB/bfPm9A0EEM8 Re4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JuB62R+G; 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 gn36-20020a1709070d2400b009c3c26561cesi3424265ejc.441.2023.10.30.08.24.52; Mon, 30 Oct 2023 08:24:57 -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=20230601 header.b=JuB62R+G; 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 5D6A968CC94; Mon, 30 Oct 2023 17:24:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C59A68CAE7 for ; Mon, 30 Oct 2023 17:24:37 +0200 (EET) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-5ac376d311aso42955367b3.1 for ; Mon, 30 Oct 2023 08:24:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698679475; x=1699284275; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rgbMRvMKjz6hNeioKKfLLUDgn4VAmflzUeGjlrubHjo=; b=JuB62R+GVQh7wF+cwO+gXv7xmjhFz2tmpp8W9VjGqo3J8XGY0ML4cNGr5BBDEXB/Ch Gcc5fKFnGDv4kBcdrLsuDCC+BZE7A8UKFf9z5ZlnciZjWlp9MczmZWZ0YEx9hMGNpBHb Ng28o407BTwnTbayfdo7eLaEQuRwN1kzeKaQ/Gb5AFoMzMqSiw8JhPqtK7UnOcOlznW6 ydzKJUUguSynGlI+gJhfwEg+NFvn1FZtcGbVD7hGz4ELDIIC2wK/9nVXTjllU44Gu5xb kOEz63ZI/dP/3Nwac4nn0aj/NxlbjX9cipH5f64A3lAE+2FJ+IB7P4rhFL0BUF1Wi5AY xGNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698679475; x=1699284275; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rgbMRvMKjz6hNeioKKfLLUDgn4VAmflzUeGjlrubHjo=; b=AlBLvYey1AkxuuWGr8rNH/TaXRKJ1VDKA4sBl94HQ4kQru9/jcFRtJaLFagRaKI3Wh kSoO3aSAFckD7iptLQg03j6fvWMvwOXSDkzj91QrG/bqck7o6MD18rHLOi3e6vSKI7ef dgyEcGtxTOy1i5UvyYR/9dYgI9DTMIUBTmrRyfAlrpsFF6lpPbqCXaGMlE9R7ZvoA/LZ r3Hm4iG037SNGGHGf++FFxADzm0T5kw/BjZzqIv3eL5uehLKr026oOCMLTslWjafqcI/ fJbBMZrHPEVcizZxGY5+rYJ0MGzSiDH+GuIjBsJAX3TUft41P6nUGxPJFKoUYlhu3SLD bWbg== X-Gm-Message-State: AOJu0Yz8D9jAjAAEJqQR0ETn4Vl31PMlAqjyxEDX55025r8MpGlnKTxj nteWisM3cu+DyuONNFLVn4U+qsPlARs= X-Received: by 2002:a0d:cc91:0:b0:5a7:dda8:f291 with SMTP id o139-20020a0dcc91000000b005a7dda8f291mr9658891ywd.33.1698679475240; Mon, 30 Oct 2023 08:24:35 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m137-20020a0dca8f000000b005a23a62a25csm4434445ywd.9.2023.10.30.08.24.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 08:24:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Oct 2023 12:23:53 -0300 Message-ID: <20231030152354.2818-2-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231030152354.2818-1-jamrial@gmail.com> References: <20231030152354.2818-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] avutil/mem: add av_dynarray2_add_nofree 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: LCmfPiTmmoZr Signed-off-by: James Almer --- No changes since last version. libavutil/mem.c | 17 +++++++++++++++++ libavutil/mem.h | 32 +++++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index 36b8940a0c..bd37710968 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -356,6 +356,23 @@ void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, return tab_elem_data; } +void *av_dynarray2_add_nofree(void **tab_ptr, int *nb_ptr, size_t elem_size, + const uint8_t *elem_data) +{ + uint8_t *tab_elem_data = NULL; + + FF_DYNARRAY_ADD(INT_MAX, elem_size, *tab_ptr, *nb_ptr, { + tab_elem_data = (uint8_t *)*tab_ptr + (*nb_ptr) * elem_size; + if (elem_data) + memcpy(tab_elem_data, elem_data, elem_size); + else if (CONFIG_MEMORY_POISONING) + memset(tab_elem_data, FF_MEMORY_POISON, elem_size); + }, { + return NULL; + }); + return tab_elem_data; +} + static void fill16(uint8_t *dst, int len) { uint32_t v = AV_RN16(dst - 2); diff --git a/libavutil/mem.h b/libavutil/mem.h index ab7648ac57..c0161be243 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -519,7 +519,7 @@ void av_memcpy_backptr(uint8_t *dst, int back, int cnt); * @param[in,out] tab_ptr Pointer to the array to grow * @param[in,out] nb_ptr Pointer to the number of elements in the array * @param[in] elem Element to add - * @see av_dynarray_add_nofree(), av_dynarray2_add() + * @see av_dynarray_add_nofree(), av_dynarray2_add(), av_dynarray2_add_nofree() */ void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem); @@ -531,7 +531,7 @@ void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem); * instead and leave current buffer untouched. * * @return >=0 on success, negative otherwise - * @see av_dynarray_add(), av_dynarray2_add() + * @see av_dynarray_add(), av_dynarray2_add(), av_dynarray2_add_nofree() */ av_warn_unused_result int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem); @@ -557,11 +557,37 @@ int av_dynarray_add_nofree(void *tab_ptr, int *nb_ptr, void *elem); * * @return Pointer to the data of the element to copy in the newly allocated * space - * @see av_dynarray_add(), av_dynarray_add_nofree() + * @see av_dynarray2_add_nofree(), av_dynarray_add(), av_dynarray_add_nofree() */ void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size, const uint8_t *elem_data); +/** + * Add an element of size `elem_size` to a dynamic array. + * + * The array is reallocated when its number of elements reaches powers of 2. + * Therefore, the amortized cost of adding an element is constant. + * + * In case of success, the pointer to the array is updated in order to + * point to the new grown array, and the number pointed to by `nb_ptr` + * is incremented. + * In case of failure, the array and `nb_ptr` are left untouched, and NULL + * is returned. + * + * @param[in,out] tab_ptr Pointer to the array to grow + * @param[in,out] nb_ptr Pointer to the number of elements in the array + * @param[in] elem_size Size in bytes of an element in the array + * @param[in] elem_data Pointer to the data of the element to add. If + * `NULL`, the space of the newly added element is + * allocated but left uninitialized. + * + * @return Pointer to the data of the element to copy in the newly allocated + * space on success, NULL otherwise. + * @see av_dynarray2_add(), av_dynarray_add(), av_dynarray_add_nofree() + */ +void *av_dynarray2_add_nofree(void **tab_ptr, int *nb_ptr, size_t elem_size, + const uint8_t *elem_data); + /** * @} */