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 769AC46A6E for ; Fri, 1 Sep 2023 20:39:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B18A68C7A7; Fri, 1 Sep 2023 23:38:41 +0300 (EEST) 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 94A7668C731 for ; Fri, 1 Sep 2023 23:38:32 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2bcc14ea414so41569561fa.0 for ; Fri, 01 Sep 2023 13:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693600712; x=1694205512; 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=4l+4JqINwmw0tywYDIU4NN6FFosZ9InM+XuEwt65kkM=; b=IFgsMvZ2D/OpaZibSmVsqY9eCvyBY9uPp88ltrAUkhHuX+cw0JXGK3lUlivbHWnZSD QphTBbwfQi37tKtXaiU7pajzlkwWtqWCIEyHUqlFLzSwzBfsfFKcjdUUMMQ0l7NlNjgM enGMS+kBYRdpRzBbiV5te9kwWUV8s5yJigXPNIKy5ZNVyMTf0wujccz0F2z5muLw0rtQ pjJSYCALI1/EvZrZ2BgW1h6ZsPRIrMvtDn8ohazYOdvoF6P071YCE8XsxinRHsSQcAGs MzzfPNeA7BH5QXEoqsfjy6YAvdNlD4IKw7WKFw5ae9aERU3NvlYG0/H6ie86miDb/U2i h2OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693600712; x=1694205512; 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=4l+4JqINwmw0tywYDIU4NN6FFosZ9InM+XuEwt65kkM=; b=bFUdZdoF97LVDTLJPWQIWQvX5KQo/MPacHjV20+skL75KmzppkgX38pbkarJdW1l6f 7jtBR6DsbDusJif/vLq2gcglvyvK/WTbdyItGyu47u94lt5I2cffU8lM3f4F19eRp45k qy0GI5Yon87dOUV69YNDpxPx8qWgALIP8StKTQ/So9j5FU1/bveCNoEtjFHpTMmowrVL osdJpqhY6dBFgJxasdT3O+0rzk/bLdxoaDh14iULmfPIBg3gKOIgUm/GwhX3uzvT2XJO 0uSfVZ30s/wdw6fhd66rPeYRnrQxF/AdTrUla7Azol4nTHgpU+hTVk6DILS8IzCCtxeq 8yOA== X-Gm-Message-State: AOJu0YwnNNjCzRZYax3PlMzD12BqcUoMvLfoPUKZVoWdQO0JeCv1npCY xCTiW5LYhg01Xl5yjgeSlkk0BZnyDBb18A== X-Google-Smtp-Source: AGHT+IGTU3KjzDVN/iZWvTGyVsR93aEmrXTVcTnuLB/uooX4du1x7IYaUSqfEf0xVRt2+7JuNcYw8A== X-Received: by 2002:a2e:6e10:0:b0:2bb:b528:87b1 with SMTP id j16-20020a2e6e10000000b002bbb52887b1mr2196508ljc.50.1693600711629; Fri, 01 Sep 2023 13:38:31 -0700 (PDT) Received: from hifumi.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k17-20020a2e9211000000b002b9a1e9ba68sm907954ljg.136.2023.09.01.13.38.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 13:38:31 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2023 23:38:14 +0300 Message-ID: <20230901203828.275197-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230901203828.275197-1-jeebjp@gmail.com> References: <20230901203828.275197-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 04/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 | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index b03f8d6c73..9eff851d64 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -787,23 +787,22 @@ 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(AVFrameSideDataSet *set, + 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 (set->nb_sd > INT_MAX / sizeof(*set->sd) - 1) return NULL; - tmp = av_realloc(frame->side_data, - (frame->nb_side_data + 1) * sizeof(*frame->side_data)); + tmp = av_realloc(set->sd, (set->nb_sd + 1) * sizeof(*set->sd)); if (!tmp) return NULL; - frame->side_data = tmp; + set->sd = tmp; ret = av_mallocz(sizeof(*ret)); if (!ret) @@ -814,7 +813,23 @@ 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; + set->sd[set->nb_sd++] = ret; + + return ret; +} + +AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, + enum AVFrameSideDataType type, + AVBufferRef *buf) +{ + AVFrameSideDataSet set = { + .sd = frame->side_data, + .nb_sd = frame->nb_side_data, + }; + AVFrameSideData *ret = add_side_data_to_set_from_buf(&set, type, buf); + + frame->side_data = set.sd; + frame->nb_side_data = set.nb_sd; return ret; } -- 2.41.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".