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 F2ADC49AC6 for ; Tue, 27 Feb 2024 22:13:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5F6868CC28; Wed, 28 Feb 2024 00:12:47 +0200 (EET) Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C373068C119 for ; Wed, 28 Feb 2024 00:12:37 +0200 (EET) Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2d269b2ff48so58657001fa.3 for ; Tue, 27 Feb 2024 14:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709071957; x=1709676757; 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=o4HmPy+3N5aTYfhtK5ObOOjk40D1vqdjnDK3IUfS5dQ=; b=Lnp99LwuINpck1tZC3H8XJJqVKrSdUPwwFwgcf0XFMHPt4H3OtebX4wqkSRhsh+Ixg ZERkcmBgIjgN9ZZLJ+WLK05d5iAV5ndlsd+UPPkOMLCG8yuZ47ohBme7E6vCOe3tE0lo RxZgOeLGudhPqj1LyFnlVhZ2NXpr0DRm8uhG0TAGT5KmSl7CkwQCJTCDsPRVm4d8Ee+r mxQ7xBo/OwxIwh2Ud0+76/OlMg36ehskLYBjuqdT7cyPE6Qr/5mxrajilNzB7x7vMsC5 14gfM5dPmftBp1M30ZhRNhKIeTEp0rSp1MRxQnjk9Q9BGaF35Lj06ONmnd+AkT27uN8n wsYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709071957; x=1709676757; 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=o4HmPy+3N5aTYfhtK5ObOOjk40D1vqdjnDK3IUfS5dQ=; b=sMTfZ0Hcxf3wpVno9x/K/2UJpIv9ihxFZozBwYKw1LG5j9/wXDv1ucfbEDD2Qg/aaB 31RngI3urebZF29Ez7k3OWba6MItEpq963Xu+R8OzMfJJlACDqrkKliDWeCzZxqRzjVW K0UIRYg/EUBq2wQ3Bzwd1PXAnRBMv3+fmBt2l7lHgKkH+YcI7cbhcBbhlvFSFVRRG5M8 9qMq6eTsjvzbZbKs5+hF040RA84XWLkyNGwXA5idGM89jvxHE5tHVkuCDnWDsi/eRPV/ rdd3HJ6jfrGpVPl8rHb8MHTaqzcYf6G3G6y0MOaKU7rynQ18Obg534W0tyln+MkvBR05 upqA== X-Gm-Message-State: AOJu0Yx7hzqs/noN/Bt60WGSPjIR7auESMIj5QYYo82785JB/Sqki3uw CRi4EUEYCMrHq/AdT6UlQyTf/8JrHzTgT0e5bfJk3LwFvUzZLFUbbW+7BNPw X-Google-Smtp-Source: AGHT+IGjli2Dqm1rUGnvKjZMtLAJ6dTFBlSr8pi9YQJNsA4X9dgbCCz3d/LOEcG72jIkRoH5L6eFCw== X-Received: by 2002:a2e:994c:0:b0:2d2:3017:c144 with SMTP id r12-20020a2e994c000000b002d23017c144mr6964202ljj.39.1709071956829; Tue, 27 Feb 2024 14:12:36 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j9-20020a2e8009000000b002d09bc941e8sm1373564ljg.139.2024.02.27.14.12.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 14:12:36 -0800 (PST) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 00:12:06 +0200 Message-ID: <20240227221226.1377758-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227221226.1377758-1-jeebjp@gmail.com> References: <20240227221226.1377758-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 03/13] 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.43.2 _______________________________________________ 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".