From patchwork Thu Aug 17 21:48:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 43245 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2265424pzb; Thu, 17 Aug 2023 14:49:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH10sxZNPTC76YbLTuXsqvRiG71q55OhV+yrHB1kN+SZwVE2oO96F2OdVvOGUVU/NSqWjmC X-Received: by 2002:a17:907:2c6a:b0:96f:1f79:c0a6 with SMTP id ib10-20020a1709072c6a00b0096f1f79c0a6mr525238ejc.70.1692308985747; Thu, 17 Aug 2023 14:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692308985; cv=none; d=google.com; s=arc-20160816; b=MPxht7bQ/gfAItpg9hfYZUDeRij47pke9C4TVXa1Fe2j3xdIRovsT8Sun+sSm5EFiD qPJ41JfitMSl9eymdw14F8Ro5E9RAdgelE5lGvpGL5OfoZK/Z6hVGbwrlzRXZvJIwCYd aZ0nNXaVkWmrZ/FilkbuXuPwIltdG+Ce9S2Wzt3LYRBgau8Lq3H4f48YUhzH8B4eyWy5 gEG/C4lCJFyFHFdFPn1AFXylYze9xpUvHuzFrUVctX53bQ4WqcLXPDEuEAMpWMRVcOrN 4tOZGQb1a5I5nyzOBG2IU9uK8Ndfgu+jE5K9gz54UzEEYvorwi2VsDKIVG8uCsb+FKW0 UDDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=K3Bb0m5bQ0RdyOMdUrjIj4ciEPX3V5gUsXtmC0CYa5c=; fh=DpbP4OnC98Ct+zBdrpJgv1NgOvKTVLIsArQu/ER33Zc=; b=gfKJuSj1HEAjEp+BGypCnGFKUHnerpVR4tQ7IochC7L60XMFzWfv2Yadu0Vhtpd6mT eV94+XZ2M0l2G6GbeNMydwCbEq765moM8z1r+tMabST/U+qizjVy1L8TY5eDhq/1oQK4 YqR56p8MbzXhqYY1OHVXVxCR3JmvzMRDDI+ROgO8ffGb7Xw7YPmQbj+4arDvkf8d0X1J zWJTI7uoGjUhBVZvIF1BC/+qMUfnWBJFKlHsPeLtlUnj61BCmiaNCNbNzGe6axEGfbXh yShpEPpisqdziJq8SKZZO2RFnfC2rQdfEUYwd4GBtm++sI7NtTkXh4pIc4oORC585ATy kLLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=gj9585Lg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w4-20020a17090649c400b009920f18a5ebsi267488ejv.729.2023.08.17.14.49.45; Thu, 17 Aug 2023 14:49:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=gj9585Lg; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25DC468C757; Fri, 18 Aug 2023 00:49:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA9F768C685 for ; Fri, 18 Aug 2023 00:49:01 +0300 (EEST) Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-4fe0d5f719dso301424e87.2 for ; Thu, 17 Aug 2023 14:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692308941; x=1692913741; 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=aV/sZhjHox4A/PniE3h8jhYbWpyE/Kv+QlHl5UkGQ98=; b=gj9585Lg0Atr8EvyV/nB/RddLhwpfJY7lan9r0gA1ey/aY8vHkLzCorE36Na1twHaC k8r3Yfb+cw6cyQX9xI4Q0UClgV5Mxdz82O2/ekuGylH6E29DPbON2pMGUSuX8YBjRVSh 1d5c1kEc/x5+Sf/uqV0jsDgfPo4fisLZUfyKzXHYwNo3CEMbnI296pXKoF1BfpCGEvZT OYHlrUHGzOJNWhTfIPzQMY2yfjD+lmJhoDAENDJqNwAojtThOA+SM8cJlGKzYChhL8A5 ntUo3MDM+6KdWiaZORXzqypnBB8a/pX3P/+JpKOzigmtNWo6Ns5YxtO0Jc72X0QQwjdc uWBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692308941; x=1692913741; 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=aV/sZhjHox4A/PniE3h8jhYbWpyE/Kv+QlHl5UkGQ98=; b=GLPVpm8ltodsSZepGco+qXYEQtmTEzhccEqlKQRjtJ0m566+QUB5qf2RU/sJ/6CZX+ TeHFgSBWJmMiOQOSBnQEix/FLHyJdDb82YfnFqN8aGhzBXXsfun6HpVinYjBBphRY0Ev z0k7lWbLYBRwsKPJgFhcoqZ2o+2N7/Lyg+LaZgC/CUpWoF6tEOEnvDRQAFv1neXhqTvq Ntnlh9GdkzfWyEZWONCk2fIH5hex+roF+uw5rhnYd6w4OH7e5VV4MKARv0Mgm4gFu6Js eJMPrRGkLa7cVOZ9Oe9ThbvPR3KJyRovphQUrqT0H0nBM2VTna5MUUXm44LfzRGlS81d 5jgA== X-Gm-Message-State: AOJu0Yx/1S+L84Mixj7oOUHqREvJgICTstv/Pw/4Q7Q0vzN5ZPi7JLFR N0iQcsOs+TAfCzTIsaVRL2l+o7BdQeY= X-Received: by 2002:a19:6912:0:b0:4f8:5696:6bbc with SMTP id e18-20020a196912000000b004f856966bbcmr354721lfc.29.1692308940979; Thu, 17 Aug 2023 14:49:00 -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 w2-20020ac25982000000b004fe20d1b288sm62813lfn.159.2023.08.17.14.49.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 14:49:00 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Aug 2023 00:48:42 +0300 Message-ID: <20230817214858.184010-5-jeebjp@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230817214858.184010-1-jeebjp@gmail.com> References: <20230817214858.184010-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 04/12] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aUdTNUMwNcz2 --- libavutil/frame.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index c90bf5d9b1..46ea603511 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; }