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 0D50649DD6 for ; Mon, 11 Mar 2024 20:59:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC54268D10E; Mon, 11 Mar 2024 22:58:55 +0200 (EET) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49AF268C27A for ; Mon, 11 Mar 2024 22:58:47 +0200 (EET) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5135486cfccso4375431e87.0 for ; Mon, 11 Mar 2024 13:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710190726; x=1710795526; 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=AotvT5w3UgblKqo5Lgu2NSe5ikU6BGlHNWc1J4yWfrU=; b=IPDcgdF6kV46THmHQ/n/SA7wIQyfCO/zazupVpv+lH4lE+VbvdYHymbpwPViE7aiAS AW7o2C8gd7jkOeIZaDl4Y6V8o5pvDhGmEACSNp0Mkp+ZgBI33vwUS4sOeMA1WcPxEVuL a+aKfQt/PAmV9m9LS3bVtVH8WoeO3YHnngoWQ3F+j0yUI/tDy9EXe0rBVq4VRwkRIS90 i6za07fleOvd2TSvDv24tD1ZMPXF86gmWKHZmKprUqGLdASN4TER/sZJmxDiuJ/bwpqD 4CAmZD2GceH/i5EJaGCmTx4OY+BYML6PYlq63m/i0kEGPTEpkdEkImTffQJK3ja9A3zy 5vuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710190726; x=1710795526; 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=AotvT5w3UgblKqo5Lgu2NSe5ikU6BGlHNWc1J4yWfrU=; b=R+dDI8VjfGQNMT6SLFaRMAiQymmFLCPaGNe1+BEJEkGjq+AVO51XIisQ92tplzeYm/ MwIWUSYk8uvyKbO8AkohWRLqoeGMh7vRQWFiHJj74jAcPBqJo3Kk9mOp0QriVxrEsjWd yvs6tqEudtveLUpiNo9BBKLEwpp3OXH1C2hkvPcqhUIvIopt7JG7Hhl+6vAHqazYTvwK d6BuKZ6hhLPFU6KV8Az9QkZ35ut2USyeUOMgI+auwcSXrnOzdzpELc/TqyZ2vG19k3XJ asgWN3Ju5ugOmg8I3+m/1Rwuwkdq3IOj+HArGzHus0g7sA1yMPQyrNBK0dteY253ZwwL G0HA== X-Gm-Message-State: AOJu0YxIBXmgPHR027ElgDZSUVRyfK/ND+Qp0iFI0GD05TJdM9Yx5PhY liN8xOx8wWNIsKgRY2PItHlfOBUVu3mjfpU3ctYtmDsAKR4t5VcLYFTeCfEz X-Google-Smtp-Source: AGHT+IHYnsDXdfKlmu/WcXpxj8h54guLI0vzSKNbAchf7aQ7TIb5T4XN2hlDG660lJV6zmi0mfI2/w== X-Received: by 2002:ac2:57c2:0:b0:513:54df:9573 with SMTP id k2-20020ac257c2000000b0051354df9573mr5171152lfo.26.1710190726330; Mon, 11 Mar 2024 13:58:46 -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.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 13:58:46 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 22:58:26 +0200 Message-ID: <20240311205844.3569895-4-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 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 baac0706db..9ebe830c5c 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -679,23 +679,23 @@ AVBufferRef *av_frame_get_plane_buffer(const AVFrame *frame, int plane) 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) @@ -706,11 +706,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".