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 C5B2746A4F for ; Fri, 1 Sep 2023 20:38:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A19468C717; Fri, 1 Sep 2023 23:38:39 +0300 (EEST) Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F25C68C580 for ; Fri, 1 Sep 2023 23:38:31 +0300 (EEST) Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2b974031aeaso43956441fa.0 for ; Fri, 01 Sep 2023 13:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693600711; x=1694205511; 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=ogFJWMZX6zIk/onVXKv1EFunUb8leAUJGxwZxJXW2Oc=; b=Z2O8F0lAfOLqRDMwtc113bS1wYJSsSIWcUEWV1ET0E1TZ7FDuwgekw1y35k5LwLIfU LrITQM7oXgKqjs4fUaJTgBNB6tKdeeNIN5S2UnkVrlt0J24kKz9bUBxvL7Qsnv6mhAzA IEQoEqsw4HcKCZV/6FwBtJPaT9xqjxsJYBPY40RwN5FtMSlPoVF2wa90qxJRGbJsIYmY wHm39izUbdArCRKggWLweXQK1O9s53/dm4upUnzCyn2IjUUyAT6WAmfspLxpUEc04mbf TzsXUJuDWNyFcbEapmfuSpyTX1Hy8hAg7geuwjequZ5XIuo+TstigUGq7sKBSAOgp82J djXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693600711; x=1694205511; 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=ogFJWMZX6zIk/onVXKv1EFunUb8leAUJGxwZxJXW2Oc=; b=HeBgUi5XLzcdepzpeAN9HO2NiK68BqLCGoZalpJ8q05pHOjlyeWZS2Zcgh/QN7Opel Poe3yfA6GYslHivgvQ3EonwBtCLabZM7eR3EMNX0o9e7SHHQes4wExnS0KjqK9WpTEJg 6kh/PXNX94U61X48oYPvpCi19fi5wzZ2oxJk2szALuh/rKqOTJuflId05iS9w+xE1h5X qF3HrMP4+bmmEmeoSwLl59h8OqreOxwmQQLyrDT/evUeNkkKMnQ9iL4AS1nd/8NPYIvQ OUjTTtNaQNhy9d85SpeKOUo7Jzvr1CkoIf/Q/Vav5HrDhHfiVzv/o7uB1GcslxVnCkSQ tFzg== X-Gm-Message-State: AOJu0YzycyN8xuJDPYsyoy5vMh/oLPFoWeW3pfo8hpcXzf1c1H6ecUjE 0akPJY4unJBXlsOsw92W4X5Dx3xieZie4w== X-Google-Smtp-Source: AGHT+IErFUKPiSIUc7ZJNMkCCSbOjyMfdnCr+xPCUbVvlUVKbV5yrFxfnSnKDaOgmYpezkWBP56ERw== X-Received: by 2002:a2e:82c3:0:b0:2bc:b70d:9cb5 with SMTP id n3-20020a2e82c3000000b002bcb70d9cb5mr2536337ljh.33.1693600710692; Fri, 01 Sep 2023 13:38:30 -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.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 13:38:30 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2023 23:38:12 +0300 Message-ID: <20230901203828.275197-3-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 02/13] avutil/frame: split side data list wiping 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 to reuse logic in further commits. --- libavutil/frame.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index b6cee2d886..4b8481b756 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -75,14 +75,19 @@ static void free_side_data(AVFrameSideData **ptr_sd) av_freep(ptr_sd); } -static void wipe_side_data(AVFrame *frame) +static void wipe_side_data(AVFrameSideData ***sd, int *nb_side_data) { - for (int i = 0; i < frame->nb_side_data; i++) { - free_side_data(&frame->side_data[i]); + for (int i = 0; i < *nb_side_data; i++) { + free_side_data(&((*sd)[i])); } - frame->nb_side_data = 0; + *nb_side_data = 0; + + av_freep(sd); +} - av_freep(&frame->side_data); +static void frame_side_data_wipe(AVFrame *frame) +{ + wipe_side_data(&frame->side_data, &frame->nb_side_data); } AVFrame *av_frame_alloc(void) @@ -337,7 +342,7 @@ FF_ENABLE_DEPRECATION_WARNINGS sd_dst = av_frame_new_side_data(dst, sd_src->type, sd_src->size); if (!sd_dst) { - wipe_side_data(dst); + frame_side_data_wipe(dst); return AVERROR(ENOMEM); } memcpy(sd_dst->data, sd_src->data, sd_src->size); @@ -346,7 +351,7 @@ FF_ENABLE_DEPRECATION_WARNINGS sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); if (!sd_dst) { av_buffer_unref(&ref); - wipe_side_data(dst); + frame_side_data_wipe(dst); return AVERROR(ENOMEM); } } @@ -525,7 +530,7 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - wipe_side_data(dst); + frame_side_data_wipe(dst); av_dict_free(&dst->metadata); ret = frame_copy_props(dst, src, 0); if (ret < 0) @@ -624,7 +629,7 @@ void av_frame_unref(AVFrame *frame) if (!frame) return; - wipe_side_data(frame); + frame_side_data_wipe(frame); for (int i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) av_buffer_unref(&frame->buf[i]); -- 2.41.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".