From patchwork Thu Feb 29 16:42:51 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: 46663 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp719778pzb; Thu, 29 Feb 2024 08:44:23 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWQgjSXV/HaBVtnLHtFs8cez345L7Ao51PaakTIC8iGWHKVsFA/QaZIZqGauFiMP5dqbLcY1uE/pIReprDVjWQX5oS0r6a1Um7o3Q== X-Google-Smtp-Source: AGHT+IHdCP9mVKK9332Zo9t7NlIsjbs3JuT5tn78tKKQfpJjwoJp1UW8LPtHhUMr06IXHwsy2hv1 X-Received: by 2002:a17:906:6b92:b0:a44:4866:20ad with SMTP id l18-20020a1709066b9200b00a44486620admr1482198ejr.23.1709225062820; Thu, 29 Feb 2024 08:44:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709225062; cv=none; d=google.com; s=arc-20160816; b=PKirg7q9/1BW+JFIoeJlhEm2+BLJvcbX7YYdTNezJXWMMfLNPuxnFZRWJc4iPLWvLK IIrIz/iFhi0RKIXrZAlWyWkY3TBJIv/WzzPYWtqe2aer05grndbduX3Tk1XK/zXGx4oq 37gqVK+toZUZOjNBeMGFlAMTbc5W1dBfw6lAWH2czXCVjH51A4bIsRbWCN42JQKcSZR4 xfjMruzRzuUI5tLod6kzTvKc9Unf11v91myHoVdOAPb4jhnli7f20T98E70P7ktDqljT uiG5LvFItULyKWIZA2hINEaHJmCCYvJYz5nc0/eMDFcrh0quk7mESnIGm1wMbFnnxQO4 wfXQ== 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=bO9jRQaSzFQ9+rRB00ClbBTl4EtOk/KBK4Znnqtv770=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=K5+04rroLeBCe2842iZZTdAqgzla7gxTjmty33lFeDbyLhq6BjiRL4XFG9HV/3fxxU peHybx+l46rDVaV5wdPke2RRqP3VsBi2oK8+k3FpLuUqIpRh3gMEJRLRc7ZF5BeHPY1P D9FhB0+BWigT+wcwy+XCKRJKNSCYpFANxsOOwFZRZrO2IALbTRvj87oczfMVAr9oTyaV v4ioeBL7gXLe4E/ANOpKDaRCh3tUM1FXowLsTIbHePKdAmou+KO9zaRqUsZxJkysWLEi cdYQ2CUaU3DZUKVB4a2bJHeJo7HttcjgWcugVCHF6Nte+FAujeFM/iHDd89V7GElYlWL W7Mg==; 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=dMd0OzcJ; 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 oy29-20020a170907105d00b00a3eac92955csi681672ejb.668.2024.02.29.08.44.07; Thu, 29 Feb 2024 08:44:22 -0800 (PST) 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=dMd0OzcJ; 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 1B15D68D1E4; Thu, 29 Feb 2024 18:43:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 8380F68D1A8 for ; Thu, 29 Feb 2024 18:43:18 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-513298d6859so804414e87.3 for ; Thu, 29 Feb 2024 08:43:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709224998; x=1709829798; 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=2ZtGj2emDeP0kR9grAYMFk630A1S214zepeJGFF9DKk=; b=dMd0OzcJdyFS4z79a5wCwZBeHk1f9DViREj3IYHsbeBKxuOUkkV7AXnSOpBsXvmFjX Hl7pXP7AJ6A6CQBUm0VKi50UsDjR3c9rLsQj6SGBjbvPbN0T0No9GH7mYvIn5dSS3jyV kIPR1NNnF/IAwzw7BshFDjb0VC3mTPdL6PT026L2YBsOVqJc7Z3r18X9Fg+eSf6fJBCG o5kxwBnLAxXPfYwSZxKDiRFQGZi2eLz/XspPWUd8hDYtDIi29+LcFyi6/hQY/bJrnuUB C84gZk0x5fFFK8IsYUouoLkFoXPRQJ74qS3ajpoxMZ9J6ZmRrhvbIkwQMVtVBfQr4RO9 XLVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709224998; x=1709829798; 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=2ZtGj2emDeP0kR9grAYMFk630A1S214zepeJGFF9DKk=; b=YocSU6rGaNlzB2NHV7Gev+4ZYfL4kicLfz8admw4glB07+fee/4ucWkBA3uUmT/r0V gZDTYu5WxqdhnZdp/XUs2IT9s0KTwB6fNM+fWDNUGh7qZeldHysOg22tOD+ll5tZj8Ed p8zZzrhu4H2CrXrlafjqRXwDLzHFHECrs9Ide+9WDQtybgSVHPlo8fP82YtNyqKbo9XE zLNJcb3uFG+ikwLEWGHj2ix9aOnqTzKwP0IH+QafYTNr2vsyxOxfYuzIT5ynZh2+GXEJ mnChT5dtkk5f155kKUraMg5g+rB5IBuUsh8uz2B2+A/zUevbd4CB5+zOBk90tUHLtN4J HXug== X-Gm-Message-State: AOJu0YzXFoCvHp/H5Sjenq61KhwG3bVrQ8R9biWeY4FoQY+FYUmMVscj YN3+15B1XuzETLrGMeDqP8mU5IpgLTHoMY5QmMtm+1xYcR2X4wVounPz1iar X-Received: by 2002:a05:6512:3d1d:b0:512:af50:8290 with SMTP id d29-20020a0565123d1d00b00512af508290mr2643086lfv.8.1709224997720; Thu, 29 Feb 2024 08:43:17 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k6-20020ac24566000000b00513290734cbsm206248lfm.292.2024.02.29.08.43.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 08:43:17 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 18:42:51 +0200 Message-ID: <20240229164307.3535613-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240229164307.3535613-1-jeebjp@gmail.com> References: <20240229164307.3535613-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lmeLPL6TANrJ 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 5d30887ec9..788999bdeb 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -95,6 +95,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)); @@ -937,14 +952,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)