From patchwork Mon Mar 11 20:58:24 2024 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: 46965 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1469293pzb; Mon, 11 Mar 2024 13:59:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXF/bUyGionedb6SXhZVJPsZUmoOI1EJ4BKR16dxGTgB/6gQHKicfhhP99BKevgckblhkzuTzQOxZi93BZN5nWtQTmKKFnMJ0LKfg== X-Google-Smtp-Source: AGHT+IFtJAQ8JvpCs5HM1/5/oxbMTQFRF2MUkJgPr1n1RZnKdLMYjq95ZoEmvOU1L3hGZGu7Hrki X-Received: by 2002:a17:907:a707:b0:a46:31e:e308 with SMTP id vw7-20020a170907a70700b00a46031ee308mr5087611ejc.31.1710190746425; Mon, 11 Mar 2024 13:59:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710190746; cv=none; d=google.com; s=arc-20160816; b=B92CSw373t1sHr+nDl+zCzK22r38S4Nf3sNx7EH/EXtYf/v0jELia/57kyGZzn5J5r XwDFM3rDkz68jqFrwOH7BekmONQtcXcml44XILZL2ciSseHXU9fSfRpR2ySiD3ogDmAa 1XpOEy6nL2RLbKGa6dYzhIctVXLrWu1Tf08iX8g1IPpJp9TpIJy0ljbRAVk+Boe2OoAF 0tsJOzDq12WF8zip/eEAHokpccuHcpdaucK+YfxsoX7F8AaUNxKsB7zK0awlrwwxeDDa yNGBEEBLa4mcqCqRnlpRpWtxvkFSKyjBIFQZSBnSq0rT9KGjHAemJtco/YSR4WO9YAk/ 1oBw== 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=XD6SVcMziRDuJWZ+IjEMa2fRlOxXqona5bajt4cKboM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=qcY66QHGaFyZweZT+EzApNMiIGdY/FalgArsK83IPOmowh70LQvbxa6Wxt1HF2lMCG Yc214nqinmP1Jm6iauz2sKlSl5VhtWTvoINs+O8HeJ87IWOtV1p0BVmkReTe4HlycmvP 2AjZHLxeGVs+IQiTG9J8uHpKEVreUyCEXYdQ31XRpog0Tyy1TFEe1shfhxQvqej7OKZ7 1yTboZr9hVkASKxvOdArJPk9glVNT+xl62LVGsAEG3qU7saUAYWV/5ok06AQVkd2R4Zz oljaelpExkE/eJ5+fTM/8+qe/2NjSnfIivjgh6lCbicrQNmDrffLHuGcAw7k7TN4GWPG pWKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=LYNaFsQF; 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 qk14-20020a1709077f8e00b00a4436bb5e11si2870957ejc.107.2024.03.11.13.59.06; Mon, 11 Mar 2024 13:59:06 -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=20230601 header.b=LYNaFsQF; 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 C8FFA68D0DD; Mon, 11 Mar 2024 22:58:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6092D68CC87 for ; Mon, 11 Mar 2024 22:58:46 +0200 (EET) Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-51381021af1so4529101e87.0 for ; Mon, 11 Mar 2024 13:58:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710190725; x=1710795525; 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=fUiSfTg77PKxwGlt5i3KDYZDuzE5HlYxtvwdcZx5qco=; b=LYNaFsQFD21gsvYKGNGvoFi7pOAVGDCOZSTaZNRMzZLrobgnUYvs+SmH28jkM3xLlU BqWdzAMDMU95PB29URX2kW2yQoBqebpFDnpFkURhaFKNfr042nMzIu4c33JrZk8EHtQG 94MqXwtUf1FhrHrZEmeOd9osnmh0jGWtPbhoqgtaKm3mGknrdjk/onQE7nrz7LsnQhJc tUcYLdX9poBJe4ubFv1SSrUuk3XfRc2Oh1tKIv4yJehUx0OuY8aobCsVYPYPIvzH15FY YpBWzdQ+RbxggRrdVmt3HMJzW1D9in76aNkRnfSoM9V6nSy+NN0FtvEszaS2+Z+d72+3 GF2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710190725; x=1710795525; 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=fUiSfTg77PKxwGlt5i3KDYZDuzE5HlYxtvwdcZx5qco=; b=cvBI5Q/0hTgX5Pa4G/WpCd7xDF1mYjXs34SAs2Xtf29iJegjwSI04+BnE+pa2N31q/ KWA4DLDyFIu3hrMN/fpoiZl+bhKdEFCFPvbm8ptOkOgJDstHHSNAEVm4NcrPbKCTWK6D MiNnHciyQwVN4BWmOt8GqH57NoDX3HiCdURiOqv29jRH2yZ2L85QAQwYD6qXJuAY0bLr LW83+t5Qhdkd1lOjE8kQtnw66Yid43blDUL1QfD7SBXB8qlGyIXxABkJeZ4BroLwrQu0 jnUZ8CBjmLqnKbYUHHnQb3TwUPDI68IYC4k0USdgQsDeIk/pVp0LM/2AH/hr736OI4V4 7YCA== X-Gm-Message-State: AOJu0Yx7QDJeCvQ39aYDdfpnzPcOy70MPWRAx1uIbZIPOnB/FDjynUeV uJvfirrL/cL7hRqJJfpQThskmeWHaPoz06bQ0329KVoogsHNsjaHOCEbbhvr X-Received: by 2002:ac2:4241:0:b0:513:b9ab:6e99 with SMTP id m1-20020ac24241000000b00513b9ab6e99mr31017lfl.50.1710190725512; Mon, 11 Mar 2024 13:58:45 -0700 (PDT) Received: from maomao.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c17-20020ac25f71000000b0051333104075sm1249247lfc.259.2024.03.11.13.58.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 13:58:45 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 22:58:24 +0200 Message-ID: <20240311205844.3569895-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311205844.3569895-1-jeebjp@gmail.com> References: <20240311205844.3569895-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 01/14] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8qdCYQe6OfZj 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 079cf6595b..ab425b2235 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -63,14 +63,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) @@ -288,7 +293,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); @@ -297,7 +302,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); } } @@ -437,7 +442,7 @@ int av_frame_replace(AVFrame *dst, const AVFrame *src) if (ret < 0) goto fail; - wipe_side_data(dst); + frame_side_data_wipe(dst); av_dict_free(&dst->metadata); ret = frame_copy_props(dst, src, 0); if (ret < 0) @@ -536,7 +541,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]);