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 5575D478F7 for ; Sun, 26 Nov 2023 19:59:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 994E668CF8C; Sun, 26 Nov 2023 21:58:59 +0200 (EET) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E305868CF5C for ; Sun, 26 Nov 2023 21:58:49 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50baa1ca01cso1682037e87.2 for ; Sun, 26 Nov 2023 11:58:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701028729; x=1701633529; 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=PgmyVlYYyIivdE/nimvzUXR2H8VOwyzRs/bk94pKtx0=; b=Z/qUUDCQ7LQ1AeQFK9JaBLW0g/TdJpy6HfGpgudXTh9SCJaMX/E6maVzWbRg+yiDju XmP6Apd31Cw+M9LTnySRlJj8V5lGOc28mxLfNdwClmKzklx1EQs6cEP4yh2Kx86nE3oH iE9NLxm/w5HmxyqrUzr7WRdejcR7KWI7PQMz6pvbKfyvJBTReIklv6Xma+qCfAc0wkgK zW8WWyCjDV+/itApJx46oOmp9HWo4i+Jv61HYmlzYa+rRtCeO8jTecNoBXz0L2nZXX5Q l5K2dqI1XakitszvQZhYJPq7v0IRXWW4Vr7jEeThR/YTabPmzPeHVfb7POno7a+bkBEF GNpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701028729; x=1701633529; 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=PgmyVlYYyIivdE/nimvzUXR2H8VOwyzRs/bk94pKtx0=; b=rXRFRGZqYGwl426W7URdtRMlKTeGHsGqVyGoGMyx0HtxBbZTY7iZMZ3+Aa2yrFzEl1 UjeMRC3JSnqGzeoqieL9NSd5zpzL3xtAtcy7wsKDsRk4CZRw2FhEinTzT+7ESEO2Pbaw qY9b162Ty1yBwunCveUcuuujErvxvAL6pXVZ+3Ljl75Raih4YDZ/MfcSz9VJ646bc27r KqWICvKTFn6xJxTmNZD9Ep4s06mYhOnW9wBLwLGvieKZXGV6oil3ljaBIjFo2+IRD3PR usl9JjNJmdwFyNTwi64q1uR2oSu5jJrS/9Mb/44kROaw8xB4xaKREwymKZcGNIXcRVOI 3iPQ== X-Gm-Message-State: AOJu0YyGK7VcAp761XNOKScteZrcVaBv5EgaiGt50RteLSOX1Pwo3Moj BsfIuW+HvEggPn+N0wNT52h/3PnoMdE= X-Google-Smtp-Source: AGHT+IH5v3UQYAr6whuQmt0wWLKI61YPv2FLd9LBO4l2rDelG5IWfPEXk2B1+xiCq0h7eih9fddnCg== X-Received: by 2002:ac2:5df9:0:b0:50a:a9a1:212e with SMTP id z25-20020ac25df9000000b0050aa9a1212emr6048005lfq.60.1701028729007; Sun, 26 Nov 2023 11:58:49 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k16-20020ac24f10000000b00500d1a72734sm1281833lfr.130.2023.11.26.11.58.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 11:58:48 -0800 (PST) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Nov 2023 21:58:24 +0200 Message-ID: <20231126195838.392467-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231126195838.392467-1-jeebjp@gmail.com> References: <20231126195838.392467-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 05/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 49da452fa5..587e212d1a 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)); @@ -943,14 +958,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) -- 2.43.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".