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 A8A6E48ACB for ; Thu, 29 Feb 2024 16:43:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 133CA68D1D2; Thu, 29 Feb 2024 18:43:28 +0200 (EET) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FDA368D1A8 for ; Thu, 29 Feb 2024 18:43:18 +0200 (EET) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2d28e465655so15610231fa.0 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=1709224997; x=1709829797; 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=JyLrmFcdPLmzUkeWV4yLaICj7bQyHMvN/Ewwdm182WA=; b=f2I4kYUKAy7UP+BC7+thvR1SRbUwI9WAUAHsBYRVNOP9Ijv2wto3pB0fh2my8azduY +xxEAP4UCPTNOvpbf8v3D9IAzYqjAZOVIcco/VE1o7gl26JLQiF2oX+SvTvfwai+g6N2 OYgXf5rEZNvU672NuHTePet9K5SggpuZpnZy+ubw1biKISsR8AD6xEtmztGhclp9sLgG 7iH1cJYaq9D4uYyXgqwJxoD+/4+PKpnNjb+809Q9CPoaDFCIpZaZWis5NtDi4skwQbm6 O+yWnO1k/DQw+oi9jTEKUGgC260++oNt5kqoO6fAnG+jMXHHL8AbI4KodRi4dujORyNW MGBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709224997; x=1709829797; 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=JyLrmFcdPLmzUkeWV4yLaICj7bQyHMvN/Ewwdm182WA=; b=oZsp5n7aCg7QxdzKajgwMa1WmGZiHqksTxXKKUAww0g1RCH/6Xo6VDyXWImy+7ocIe 1rwp/zw4lPkgMH5+pMc9NyNxkJ0qNjQMJ/XbMq6r3ciHjkkFO8P065GLxUdZNv0DYCrC O4wimnFamvi180Fns7kiK09t/eiwHRte4bx5P+/8NLvJBPb/7K9cYQ9l3qpk6wQTQfOD sg9L/sqKzc3Ju9DAUCGsBDbiTjhC/81XL3Se092eXtPn5hiHejBzzpzWo6EvmNSxzKb7 fosojKUpZXABtrQBwNH6WnwouqByJOW1+9DYX2YSNmT5KGGoUiqb8kkb6nbKvYFkzSp+ D0Vw== X-Gm-Message-State: AOJu0YwaTIvNi2Gnv81uKRNgE0NNi3Jytbqa1SrHKjIA6L49nWMZ/lrU kzZyEe0eVlceLY1DV0ahBvr/g+wLmCdwHrss4HojCZF976OYahLdF+zCBuU7 X-Google-Smtp-Source: AGHT+IHZo3ULItavRBfycATSk8Y5i3hTzaop0kI60mwH4/qUU2g29qDyrwDazssC5pt/kGwcy+LQPA== X-Received: by 2002:a05:6512:618:b0:513:1c47:5381 with SMTP id b24-20020a056512061800b005131c475381mr1768675lfe.2.1709224997342; 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=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 18:42:50 +0200 Message-ID: <20240229164307.3535613-4-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 03/14] avutil/frame: split side_data_from_buf to base and AVFrame func 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: --- libavutil/frame.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 615dcb1b83..5d30887ec9 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -787,23 +787,23 @@ FF_ENABLE_DEPRECATION_WARNINGS return NULL; } -AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, - enum AVFrameSideDataType type, - AVBufferRef *buf) +static AVFrameSideData *add_side_data_to_set_from_buf(AVFrameSideData ***sd, + int *nb_sd, + enum AVFrameSideDataType type, + AVBufferRef *buf) { AVFrameSideData *ret, **tmp; if (!buf) return NULL; - if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1) + if (*nb_sd > INT_MAX / sizeof(*sd) - 1) return NULL; - tmp = av_realloc(frame->side_data, - (frame->nb_side_data + 1) * sizeof(*frame->side_data)); + tmp = av_realloc(*sd, (*nb_sd + 1) * sizeof(*sd)); if (!tmp) return NULL; - frame->side_data = tmp; + *sd = tmp; ret = av_mallocz(sizeof(*ret)); if (!ret) @@ -814,11 +814,20 @@ AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, ret->size = buf->size; ret->type = type; - frame->side_data[frame->nb_side_data++] = ret; + (*sd)[(*nb_sd)++] = ret; return ret; } +AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, + enum AVFrameSideDataType type, + AVBufferRef *buf) +{ + return + add_side_data_to_set_from_buf(&frame->side_data, &frame->nb_side_data, + type, buf); +} + AVFrameSideData *av_frame_new_side_data(AVFrame *frame, enum AVFrameSideDataType type, size_t size) -- 2.44.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".