From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8DF3A49FB2 for ; Sun, 17 Mar 2024 20:01:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED20368D1AE; Sun, 17 Mar 2024 22:01:20 +0200 (EET) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69DB568D1AC for ; Sun, 17 Mar 2024 22:01:11 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-513d247e3c4so2944842e87.0 for ; Sun, 17 Mar 2024 13:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710705670; x=1711310470; 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=SX/5t3OnNyyrTjUoUgECAvlHZbTTCZv0dEnzDbr+2vY=; b=T/YAl/iuTe8wnfrB7HjhwGgBEgd6Wjbx6n8TpzUzauE0TQpE7sZ4o4vFvnYXN6rIWf 7JZmDixjadBzh2cvkw/lRpqXQ///7pgvAzwAkKp54PBZ0RYKkjhV1VDBNtLUXj/LBIHJ nuetpb6NrP5y9OZCEwJzJyLLXqb0RBB19QwQh4Qt5X/zmKLosZqGf35OzZOSoCAHjX79 rSBvfyU51cn57nWpv8+ODM9Oci0OWFjHpHQpPSfmYeC4YmG2WrIX9u7eWsWyj7GiPAli Yfn28iLsFuMkTPOuSJEOXN4gbu6OY7MiyteYjCpCo+R7+cWotzYvxXf4D8ka+cMR5j0k hB2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710705670; x=1711310470; 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=SX/5t3OnNyyrTjUoUgECAvlHZbTTCZv0dEnzDbr+2vY=; b=WlLExgMK0ZigiBb/4ekoimpE7mt3Icn/eZu5RFsZKP1SvKUbUfVJkoMq0+5u7EyiLW /Mswb65JOT8cv8tCTJyeMBXsc9ZR5kJ8gjYky/ePqt9um/ipMnR14h6QC1bjV+pUwiQB rxN9DLb2CGpu6fcHXvXy1e1jUpqbtNbeooAupjyJvgEvHoIu22cnVWaeRoeMuJyS1u6j oo2+1M0lqaMIgpeEBdc9V0jVjF0P0gFR+0rRWu/lWH5WIRF/0PVttSb0elto4na9ATuZ 2iPeUTZ1uybSuz0GZO699c8v7DYTjGpezCJAq7p3BiLRbrNYEJDo9EUEgQS+P2HO4y0d 1Y+A== X-Gm-Message-State: AOJu0YyL1MudefKZi3ceNcKOWkbQ4BoTJ5QPre0ZjEsh5Q/UOyBr3lB3 Ar8v/dBe//zsrJ7jLIQHS/h0qLVrvAUtQSxA0uECsZMjk1JN1yTcvi08xdHB X-Google-Smtp-Source: AGHT+IGVvyNiHud9e9ZuHcEXyU7whQCmIUdoFZbATgIcRrg36imdPYxM+5xaPxWncMq7gSi/VWY9Ow== X-Received: by 2002:a19:5e4f:0:b0:513:d3ea:ec5f with SMTP id z15-20020a195e4f000000b00513d3eaec5fmr3285246lfi.34.1710705670550; Sun, 17 Mar 2024 13:01:10 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id y3-20020a056512044300b00513c844603fsm1340462lfk.41.2024.03.17.13.01.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Mar 2024 13:01:10 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Mar 2024 22:00:41 +0200 Message-ID: <20240317200100.152097-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240317200100.152097-1-jeebjp@gmail.com> References: <20240317200100.152097-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 04/14] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 9ebe830c5c..dd27456031 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -83,6 +83,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)); @@ -801,14 +816,7 @@ int av_frame_copy(AVFrame *dst, const AVFrame *src) 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) -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".