From patchwork Tue Feb 27 22:12:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 46600 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:aea4:b0:19e:cdac:8cce with SMTP id do36csp11515pzb; Tue, 27 Feb 2024 14:13:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUGCwr2RZJCJcEfaFuKB5lnFrm/CTRN6oss+aI1Cx7rcTgCpbZUyVvZ74cTsqT6DLFauHQx5Vhn/CcamDhFFVotHXJ0V7SN6o4Z8A== X-Google-Smtp-Source: AGHT+IFrihhT8zKrSsNOluxFLe4mrKO4J498Wz8rWNKkamsaRrSHZ5+7/ezhNgtOoW9lj/sS59no X-Received: by 2002:a17:907:7797:b0:a3f:79e2:49f3 with SMTP id ky23-20020a170907779700b00a3f79e249f3mr7016734ejc.7.1709072002708; Tue, 27 Feb 2024 14:13:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709072002; cv=none; d=google.com; s=arc-20160816; b=DV7oJxPEcEKxgeY8aCvTzM3+PObqr53e882CooBICnpyfPlAbufwYGqTFKHRLULlxr 4a7vkYzMHYTPGfsqJlTHlZvX7O3TaRJMRcIHwddvsOcmAZUiitAzh08blK6tJTx0UgXQ FACowJSMygOAP5lGoFpwU+sr7OBYq8z9cr+CjgwKMwxsqAYZSmh5u8IuT4o2zeC0zCY1 9mt9FQ5eiKlIZky008294fMhcYeoc/GlfIPrF/AlL9m25kNrHWL7omgvlYkdDRQMdiEo qRcSYNMJuT1KPNizegoCN2W/WD9ds2R6oUWu8VPvsKAa45CvK/eMhkCBzbfSZskjfS/k vz5w== 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=/bGklkXrUyTjVl2w+BuThn8qXDeHnynN8rfNCzwBA90=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=dGfkT/+36FXSQ6NsUD67N2Zva5vLNkvrJANPpsJRrmtLcJ8CDPUhoJyDkIkZflkSiM qjAlmCbo/7qemKkk20rvX7OwxUNnFDB+ZiSB+Igd/8PTifJ+gOmzMiTlMHP6JQJKvEKc 7MQpNZHq9+IE40G3gxdHv/JZpkcKNr3p24uDXWuMZryQbW6dMBfcq3S7/14rY8fZsxOW W6JFsrRpLrRC4y2G64tDHAbI7jHnzaBTZRxt9wCaIZh2LwvNUlopBjvQKGnVYFMNxveb m8J3/IVWLvxHNOl0jjr9d8cvticcEhJ7ofucEXZS2chkzKv2Q6oGzCWl7S8BmwGat4KY F3iw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=DTfaOnB5; 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 q16-20020a1709066b1000b00a432149ff40si1067610ejr.108.2024.02.27.14.13.22; Tue, 27 Feb 2024 14:13:22 -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=@gmail.com header.s=20230601 header.b=DTfaOnB5; 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 2934168CCFE; Wed, 28 Feb 2024 00:12:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E8E568C7DF for ; Wed, 28 Feb 2024 00:12:38 +0200 (EET) Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2d180d6bd32so68830091fa.1 for ; Tue, 27 Feb 2024 14:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709071957; x=1709676757; 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=Dn+4UEHGNEyBz7sjUlV1HmM4IFv1exSCYMnSbYygO34=; b=DTfaOnB5GRcHPgOG5YmS5Tynmrd9JS6l2WjaSjNCZDImhZ/wd2gAQ16i6lA+QRJNJJ RVieXnq2EZwPqot1IPK8KpVByyUYlH5fbjRjNPxqrjTX6+vOiCs1QtdpPJXQct2eUw8N 4fIraZUHLwB0DebegQ3TLkiXCMZnVIAeWhDdDYre2lBJ0ckekvjiwiXqkZMBJ40FZvol 1QtHxJWg251tSPl5KAHrf4pIBibmX5vvcUwSoLnUmPNQglnbedY4iB+aTB8X9LAjAq3d apqng6BkxPQZ7m0qZYHny4tal8UcRickM+RFI/0TUzK/42n6eO/lat6WsYHQVnW60ll4 U/Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709071957; x=1709676757; 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=Dn+4UEHGNEyBz7sjUlV1HmM4IFv1exSCYMnSbYygO34=; b=uAMNx8acBxlSLW81PNBof2gyO12dWi/em0X24DPV3a0XC36MHAJY3iKYIAXT3VDXTs s7oY3a/oCASfVBP7MNc0pkg9DDyoUSJT8IuCp/DWcB4dQXWvAfxBKTbRsYnzJKJ/P0Hg 25JiTRS7HLhs2/omD0yNJszHUgyUArjVJdOibiatGMcFjp+ozkR0RJaBLI1SlKoPa7h0 Juj9bxBiq/QcouueNAR6GeP4fW/2IImUGH6SURm5QOvlz1b2BJz22Fj+Lg1v7hbhlWLO e40twt6VELYGScWbgZ2A5ggTdVEEJuIfLRxrDBykYgseHytcWPAbhUCvwHwTx9UgJg7w Tl/Q== X-Gm-Message-State: AOJu0YxqN/sxjz8OfLTvdO9bkXqBHOALfkfqxK+0AFfw+aKKdMeMwAiJ xN3w04/A4qPnvLv9Sax+sGl8/BRtgggCotf30KEKzOzs/aMFCQfgko26gmk5 X-Received: by 2002:a2e:a724:0:b0:2d2:b915:e073 with SMTP id s36-20020a2ea724000000b002d2b915e073mr308823lje.27.1709071957250; Tue, 27 Feb 2024 14:12:37 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j9-20020a2e8009000000b002d09bc941e8sm1373564ljg.139.2024.02.27.14.12.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 14:12:36 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 00:12:07 +0200 Message-ID: <20240227221226.1377758-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227221226.1377758-1-jeebjp@gmail.com> References: <20240227221226.1377758-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 04/13] avutil/frame: split side data removal out to non-AVFrame function 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: jcGkZnANZuj0 This will make it possible to reuse logic in further commits. --- libavutil/frame.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 5d30887ec9..788999bdeb 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -95,6 +95,21 @@ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd) wipe_side_data(sd, nb_sd); } +static void remove_side_data(AVFrameSideData ***sd, int *nb_side_data, + const enum AVFrameSideDataType type) +{ + for (int i = *nb_side_data - 1; i >= 0; i--) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry->type != type) + continue; + + free_side_data(&entry); + + ((*sd)[i]) = ((*sd)[*nb_side_data - 1]); + (*nb_side_data)--; + } +} + AVFrame *av_frame_alloc(void) { AVFrame *frame = av_malloc(sizeof(*frame)); @@ -937,14 +952,7 @@ FF_ENABLE_DEPRECATION_WARNINGS void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type) { - for (int i = frame->nb_side_data - 1; i >= 0; i--) { - AVFrameSideData *sd = frame->side_data[i]; - if (sd->type == type) { - free_side_data(&frame->side_data[i]); - frame->side_data[i] = frame->side_data[frame->nb_side_data - 1]; - frame->nb_side_data--; - } - } + remove_side_data(&frame->side_data, &frame->nb_side_data, type); } const char *av_frame_side_data_name(enum AVFrameSideDataType type)