From patchwork Mon Mar 20 23:33:58 2023 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: 40737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2165963pzb; Mon, 20 Mar 2023 16:35:01 -0700 (PDT) X-Google-Smtp-Source: AK7set9mBDABilO3IGL1/FvX4KZapbClxENH5j57wVQ65Cbcdc0LBXEQHckitmdEAumbtFGMwHqn X-Received: by 2002:a05:6402:44f:b0:500:4062:99f7 with SMTP id p15-20020a056402044f00b00500406299f7mr1269207edw.32.1679355301557; Mon, 20 Mar 2023 16:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679355301; cv=none; d=google.com; s=arc-20160816; b=m71BfaOU6397w/wblPdhrZNPDYIk20gkCIdDaEYbaTD07QpXyMphEDqyO3muKvhG1I mUdQc6UZnZQ93ZKzWASYEJZdm7hjZ6MA5Ha/wYnypmkawAQ0NOS4a4H8ZnXJENRZVxYS qcqxfBOfzHmOxO7WU8fHER3T8a3zgMKh28qypidd3rQltdPKZZWlGVCg6NvtWAIHIhkG owwSxD8eEOu4QaGqpZCNIfnHlg5zT/nbVHw277j8L2qElmZ8cDvJT2qrQ3iV4xyCcdD1 F+pN7PBbZQk0Wyqvy5DHqRUS+EoXzJrZoEOq1QD6v6c9dne/pgDqPXYvjaivxqEYGfW8 FJDQ== 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=LS47aM0TguAWhKDF1I/i5kWVI1wnYsjWG1QAG2WVlE0=; b=paATjXZSMU8uF1CIhOzP/xGMigPUu9AG/o+OJMl7gInM8jUA4QDgqTq982LNXSuxub w2vTTlV4jTckZdiL+qyzF4JdNQ+SVnVIEYp7Fyepd0wS7AG0rpEXanxUgINoMiE7/x7l Ux5QKaTQdWRhClRqtnznNvqr5qHJCG8pEvqdJRRB1BNrZVl9z/DNp7X0Nbgc1WK/CqYa yDpHkKVd/lxtHfFjMcNSzSTtHW/rI8MEfu8tM9w1PlHr8BeKLXvFnM1Ek+pT6f4loxBb 3zUwcvx3wty73vM0bw/yDTgA4CzUNt5e8m1wTqLtkO96ma0PkIeRSKg5tuK8pmz6IbF6 I61A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KMoAtxS7; 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 d4-20020a50fb04000000b004fef30e1027si11051463edq.621.2023.03.20.16.35.01; Mon, 20 Mar 2023 16:35:01 -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=20210112 header.b=KMoAtxS7; 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 DBE9A68C5BA; Tue, 21 Mar 2023 01:34:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 9C9F468C59F for ; Tue, 21 Mar 2023 01:34:17 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id y15so16988298lfa.7 for ; Mon, 20 Mar 2023 16:34:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679355257; 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=JWrL5L2Awwi8EyK5S5G0YfWizUrCXnEw0SdKnzbf4xA=; b=KMoAtxS71/0np/5kJ9z6206N52qNv0Ee0s0Zee5gmukGiIMuiaLoGhPEWlaXmNmZC8 vsji4Nu/BEEZU28HvumvwZSJhhmDEEnfD4xCDasenjGnSPNSsFK9fmPccMyme8407r2W l4p+Pbec7xF50EXXBFJwjwfQoo3wBJAIh34pfKmMLYEkEI1BN4fPjl+SFKDpevwzMP61 9Tdfn290g8+IVzPczzLOwZCtBGUwxEfwLBKkhKrVfUX1ZQCUNPIAj1akzxZe20Cov6Du 1ewhSCy/fcLmf0HAd4WL4GaI6IeFT+Mi/eL/q4udbryMCokg9sUStnEMBci0ZHdcK26O La+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679355257; 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=JWrL5L2Awwi8EyK5S5G0YfWizUrCXnEw0SdKnzbf4xA=; b=sB0h/MDPDuaFTkKOkuMVfYZEoED3jwRJHUXDxtdaJAoLYge2U5iUCudvsza5RynNzm iYdZARcLZCRbc6W7cnnfAd3Ud9td4aAe5DAqw9i1t/joyJeAFOGwhcI33vLz2Xkd/2BR p9/xOUxeP3Lcoykb6I34uIF7t9QM1XABDJgD8lSWAiuQ1DW2qd8K8hes/WT3hK1tZsVd nBf2B01d6ISN8qeLcC39VkK8giB2hl1vxGa0O5UfKaXOsIAwEdpW/vNZMWQRAPw6GVCM rYF0JT8Xtaf9DcwRAI3xq9W0k8gWiFfvWoYkHrFPcHWitxb4A0ffojHvJHKF9UP4T53G GuqQ== X-Gm-Message-State: AO0yUKWr7mL+m0BHj4a9Apz04ENMsLdvJQUVjwMFAkrDjq2ZCgbOVMJ5 cZjVkjVMxT3ggDEVT4e9jyJ56RITkiY= X-Received: by 2002:a05:6512:41b:b0:4e0:ce21:b92 with SMTP id u27-20020a056512041b00b004e0ce210b92mr200999lfk.16.1679355256740; Mon, 20 Mar 2023 16:34:16 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j19-20020a19f513000000b004e84b79de9bsm1900701lfb.254.2023.03.20.16.34.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 16:34:16 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 01:33:58 +0200 Message-Id: <20230320233408.134255-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320233408.134255-1-jeebjp@gmail.com> References: <20230320233408.134255-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v0 04/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: 5NXT06WTiM59 --- libavutil/frame.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index c905e8d611..019613e4d2 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -76,14 +76,18 @@ 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 wipe_side_data_from_frame(AVFrame *frame) { + wipe_side_data(&frame->side_data, &frame->nb_side_data); } AVFrame *av_frame_alloc(void) @@ -326,7 +330,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); + wipe_side_data_from_frame(dst); return AVERROR(ENOMEM); } memcpy(sd_dst->data, sd_src->data, sd_src->size); @@ -335,7 +339,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); + wipe_side_data_from_frame(dst); return AVERROR(ENOMEM); } } @@ -486,7 +490,7 @@ void av_frame_unref(AVFrame *frame) if (!frame) return; - wipe_side_data(frame); + wipe_side_data_from_frame(frame); for (int i = 0; i < FF_ARRAY_ELEMS(frame->buf); i++) av_buffer_unref(&frame->buf[i]);