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 4417C456B1 for ; Mon, 20 Mar 2023 23:35:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6B5968C5EA; Tue, 21 Mar 2023 01:34:28 +0200 (EET) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FFC468C5AD for ; Tue, 21 Mar 2023 01:34:18 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id i13so1317635lfe.9 for ; Mon, 20 Mar 2023 16:34:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679355257; 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=oGm3z9HAZvdROOvpvc/CCFyByzV9Mm1Tc8AJQSIbiRc=; b=aZLZO/r/QD3QpWHDqj968BTCPj9KfL0ZMKjNBCHecgQL/jAgNHodsaLsQeTMiuBkxF fkbhOOM3KySjE9d6jyOHmAhT874tfwXcXMWkbkEBXqJGR55iivuXLs73UmRdgY42wp/B bcwVwZ3iIkQY3CCAyu8hUjl8JuXIr4spZVJp0yciiTVNYLXukHRypqfkejlCKUnxadt8 +X+KZLoZRsV2MYbQ+hY10L13BlYTQc/GISMjQkM4COIqzNmS9BQgeubloEZ2a+/SN9w0 YIgw6WTrQ5hfOnTIBsm6MK8YjYqJ62ZAdrqlZC4cm9l0E3OYQjH72vaVNIuOlDhlv/Uc kjww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679355257; 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=oGm3z9HAZvdROOvpvc/CCFyByzV9Mm1Tc8AJQSIbiRc=; b=sqHLMVub20tywIT+tVU3hY2BoKZb04p1mg20UlFf+AHwGz/YHGybvB+mDYDMlowzNd wgHUtZTlD/TPUVmlKhk7qsyclDijtDQZTIymW3x6L1JX8SFlYwZ1YPgavr1Igwi6IYlu XKeDd1kxw/+oBVuM42fIk7kBvUA8AY2EOhtyNkeRiOLp+U3LweNnzKs42DGObmQkQ8Lj WSERPIrMF1ag2NRX21uc0LQqfGKlTeQhsCCbPX+K0mU8zSjxmDbCRMwdeeoCwhcH9cGS yQbWIlAQPfa/KyabQaMk/V8AL+MvjDoo2ot5xcYqii047Fu5lRuLooOnfZBCQMBG8UcS h+hg== X-Gm-Message-State: AO0yUKVI3IcCENO4RWanXZWC7jkfcF9Ww89iNGpMZ+aXV+kga2GXwLds wN4StkdiLinzYEgCumBbToN/qiu/4uI= X-Google-Smtp-Source: AK7set/GBWIcwdqeYcfMGrsfYecoPL/T9RRfPm/R2RNuIOfQUY069Db2elEDado8YQdN+HEtk67UaA== X-Received: by 2002:a05:6512:21ca:b0:4e7:dd1e:e521 with SMTP id d10-20020a05651221ca00b004e7dd1ee521mr206597lft.9.1679355257575; Mon, 20 Mar 2023 16:34:17 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j19-20020a19f513000000b004e84b79de9bsm1900701lfb.254.2023.03.20.16.34.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 16:34:17 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 01:34:00 +0200 Message-Id: <20230320233408.134255-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320233408.134255-1-jeebjp@gmail.com> References: <20230320233408.134255-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v0 06/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 | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 24038cc0fa..ab1a4e7f6a 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -648,23 +648,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(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_side_data > INT_MAX / sizeof(*set->side_data) - 1) return NULL; - tmp = av_realloc(frame->side_data, - (frame->nb_side_data + 1) * sizeof(*frame->side_data)); + tmp = av_realloc(set->side_data, + (set->nb_side_data + 1) * sizeof(*set->side_data)); if (!tmp) return NULL; - frame->side_data = tmp; + set->side_data = tmp; ret = av_mallocz(sizeof(*ret)); if (!ret) @@ -675,7 +675,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->side_data[set->nb_side_data++] = ret; + + return ret; +} + +AVFrameSideData *av_frame_new_side_data_from_buf(AVFrame *frame, + enum AVFrameSideDataType type, + AVBufferRef *buf) +{ + AVFrameSideDataSet set = { + .side_data = frame->side_data, + .nb_side_data = frame->nb_side_data, + }; + AVFrameSideData *ret = add_side_data_to_set_from_buf(&set, type, buf); + + frame->side_data = set.side_data; + frame->nb_side_data = set.nb_side_data; return ret; } -- 2.39.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".