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 3DF7D4A06C for ; Mon, 18 Mar 2024 21:32:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FB0C68D3AF; Mon, 18 Mar 2024 23:32:02 +0200 (EET) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DA4F68D357 for ; Mon, 18 Mar 2024 23:31:52 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-513d3e57518so5141171e87.3 for ; Mon, 18 Mar 2024 14:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710797511; x=1711402311; 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=74QHhn+PPxQwezestUYulJDGivjcLa8Mmm+Qf/jAOPE=; b=YskVgWnDgiaPUJ4jVt5u0CudklXHVimvCg2axhlDOTkRkUxvdGa2ncgoOxVh4UwH5K fpVn6fCw99XpH1VS0JsrwLlJbxervqq4+bjZeXjMDYcUo/uSeo8iNxz4xE8FFXaJptVL Fbu3AJw8oLN2HO6FSAXxtj9wt8ez5kCk8ZaIh5UUZ4aHXjqEmkWA0wQK6QEOWzOxAPGI T72kKud/EHAO5XZJ6Vs2W+/4X6MLKfQ5twzF5koUn5tZPcbmTX5KVeXs5iaK+x+8ob6M EfqibrD3GxtZRWaL+6I65AiG3bHfmr0eEpjcfqO4CQLWHCh5Wc3FSPSdXcmH8zHStvEo 42Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710797511; x=1711402311; 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=74QHhn+PPxQwezestUYulJDGivjcLa8Mmm+Qf/jAOPE=; b=KmefwnFSxjnsz5GvPhQ/+/ziCRdD4Dh+zvqsT/PjxI/Xu45c2eyw+URCq03jqU29xU l34sk7iKN5YChYX4ReWlmon3U5AsYZ73b9pHdX+EY5E99+bCwZgKEju0U5RECEZWZUix 2a6KkoOhOq787A4xsFtBjewnI4S5peVr4gplzI4P0gdtPT4S50i5N7Mq+caiLd9Qkz7G VRwdsvodgTQmXrpd8YcTaja4btDx6uBn21GKTGO6QfjakDx4kAowmZFwF1Xg83cuvqEz BCv1pNIUAUd1Uxpp7HKiiwgqZOO1kssyzjERv8wL8uruWX3sRntYhih4k6/Mec6/MT58 tOEA== X-Gm-Message-State: AOJu0YxzkuAFZpqYH1wxR+qaP5SdR0yW+X66jdUM9QCfD7YZGUfs/yNx jRvwirlPTxHtMKc70P7QKpKoTvtlqP6cAwjPxb34l0rBGTkV4wQ16/uRPqb+ X-Google-Smtp-Source: AGHT+IGeoMFFtJNcNXM9Nnhui8hWR+wnoPJvjEJntcjqdd/gSfFN86OHtd1POAXnfhA3/DKVpZWUBQ== X-Received: by 2002:a19:6406:0:b0:513:d8e3:fe3d with SMTP id y6-20020a196406000000b00513d8e3fe3dmr7727676lfb.26.1710797511514; Mon, 18 Mar 2024 14:31:51 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c13-20020a056512324d00b00514b5462dc7sm186929lfr.56.2024.03.18.14.31.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 14:31:51 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 23:31:27 +0200 Message-ID: <20240318213141.1376789-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318213141.1376789-1-jeebjp@gmail.com> References: <20240318213141.1376789-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 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 382e1f6d58..2a319adb86 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".