From patchwork Fri Sep 1 20:38:15 2023 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: 43440 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a81:b0:149:dfde:5c0a with SMTP id ci1csp578789pzb; Fri, 1 Sep 2023 13:39:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSV3x8pq6QYLYWIYHBm6IiLwvWXZU3Mo/nB85zZ5CFyAIpHYQ1/jsYkDKLHKAY9dhVJeDZ X-Received: by 2002:a19:690f:0:b0:500:bddc:56d5 with SMTP id e15-20020a19690f000000b00500bddc56d5mr2021317lfc.37.1693600768817; Fri, 01 Sep 2023 13:39:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693600768; cv=none; d=google.com; s=arc-20160816; b=RoieH2ZgR71h/KMv6UhyORpi2uRi+/po4o2WXZs9zF/nHCqTenWR9r7kZxdswa/QQT dFuvnzjmMRP2JrZT0YYMMYFUJ0FaWQ5QXG69Hfyl55Rjl0v3JF8mPw6rzkSP8i7AeXbX 2p6xPlPJqHWRFQZkkAGa3Z8hJ/ZAG8iWmucxKVfYL+8HjiPwLuRxiBtBbhXrKRjFK5NO kWBz8EJs/cvbM5G2Yb3hv+7rZFt5mY3CiZoObVd/SWIA9pM5KiI0gdJdpftPC95NQ8sE L5/dzr25muMI26OTW3qdYWXqUxLD3MiK2wtRX4F14BRDNryQXBc5Ap50CcD1pXVKm+EI 4X7w== 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=JcVKDMP/zJ3uCmFFKtzzRmx+uZ3Pau3m3bOsnXVbLI4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hzgaVhAxmSuhfFrgHZU14Q0UFR6cThoXQixDAZJp6IOF5toN3TQF9vnIsKz5d2Jku0 IzjRDEww/90bL25ifry8ujoueZy0YRfSoTUWikdf8aOO7zqdllulf60mWKMMYfJjLVmd olmH9lhRmwuak9rAB5zZ74kje8HfhDEKL48xBnyn1VWnNgKyOqTU98rGi1Z/3Gv3LTZj ZEWB+iUXlNHsAGm3/XDEuBbU1+FuvXMzOh6LNkJGUjyJsaW3xKDtoteXmDvb7G5Hghco FE3KKyLrt9aCwmZ3FIvJl31BVLmj+NGInp3QDdiWZEmOW0jGqVs/N+k8g1gwaZ20Ca0C F8OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=mO2oDw8J; 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 o20-20020aa7d3d4000000b00523409dcaabsi3231351edr.617.2023.09.01.13.39.28; Fri, 01 Sep 2023 13:39:28 -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=20221208 header.b=mO2oDw8J; 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 C176468C7AE; Fri, 1 Sep 2023 23:38:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7BCF68C705 for ; Fri, 1 Sep 2023 23:38:32 +0300 (EEST) Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2bb9a063f26so42420751fa.2 for ; Fri, 01 Sep 2023 13:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693600712; x=1694205512; 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=wRgSt3iB2xo4i7BvrW+oUQgwY6uZjn9t/OXUoXPUdsA=; b=mO2oDw8J8PjeuPfuqiZ1Bp3QA2sOg9trQkK1oCGB9waLQgqeOfhYFAjKtwJr3sPtiD GQYSWDTrEE2m/tS2YTIOzdB92rPtcCS2BDMAnnoekSo3rPYY1km/tVaNDq0WnsAuo86s t+kq6VA+JWzqsiUS7rPXaEHrOVJUVBoQalgRJRxFLnoqFS2IQU0WY9Cr50rnuM+yRwrf FjYho73WjvA2fIFY+E84DMgGFACDAhfUv2kaxTBpKvL9mrzQKmAZjrc7n4UDKgd/rcTf Ix9lqd2o4V0e9aagsROHpwAppXHhGq/NfOG8hTXTN79akq5Kirgxk89N/AngyaGjIHsm 3zbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693600712; x=1694205512; 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=wRgSt3iB2xo4i7BvrW+oUQgwY6uZjn9t/OXUoXPUdsA=; b=j3xR+Aw0Ukfm7a3lwKV/XN9WU8oPJkUb6r0khaas53uunGHosIDAK/ovyFC7ng8EuH UJo4+dzCTPVXdxkmWZOJjdeCqyllu2/q2/rYsRGdwCAnAq5ngUZYWZyYghqDTJ9MrgSO NfEnWJWUI0D0OlMUUTzbYvk8j1jVDLmnCcnHvcHBrZAewgPb895yXhWEmd5sSIs7n3MA ZsRGgizc0sRpSP2FA20ENDfv22UJIyJkxqX9/oF1uLC4aPbStkouaVCF4wLOoYILz1n4 1E88/YIM5qQpch5h/JEteaDWxrUa5/FmfzqFFkuW+D+lufb1C2u/VAdSBKWpn8R7Sor5 ABTA== X-Gm-Message-State: AOJu0YyA6yVfpiwj9VvGLcjlF+hnCazVG0UOLSzF0pwSUcjm63H/oxlP 6WXQpI3nh2c6YYL9jR9S72Bx4g4bRktb4Q== X-Received: by 2002:a2e:9194:0:b0:2bd:2240:8376 with SMTP id f20-20020a2e9194000000b002bd22408376mr2628789ljg.14.1693600712076; Fri, 01 Sep 2023 13:38:32 -0700 (PDT) Received: from hifumi.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k17-20020a2e9211000000b002b9a1e9ba68sm907954ljg.136.2023.09.01.13.38.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 13:38:31 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2023 23:38:15 +0300 Message-ID: <20230901203828.275197-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230901203828.275197-1-jeebjp@gmail.com> References: <20230901203828.275197-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 05/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: yHGIQTCtO0K4 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 9eff851d64..0b1a8e5244 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -95,6 +95,21 @@ void av_frame_side_data_set_uninit(AVFrameSideDataSet *set) wipe_side_data(&set->sd, &set->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)); @@ -945,14 +960,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)