From patchwork Thu Mar 28 03:12:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47569 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1049022pzb; Wed, 27 Mar 2024 20:13:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+OQgZ34BxfLmYzg7dLJ9f0UeYO/t+Aiz31EAxhEhbC9iuHo5NXoTD9l/pOdYsZiGkBmArSNET0qBtgAVQyUw7SjeCqt+0WO3u1g== X-Google-Smtp-Source: AGHT+IF2w7Euz7PLSPqRkEbXdBBDidpGXTs33GOZyW0qyA7L1hrx5sVOVR89G/bBzc754jJy+/Y5 X-Received: by 2002:a50:d688:0:b0:56b:b8c8:53e4 with SMTP id r8-20020a50d688000000b0056bb8c853e4mr876420edi.4.1711595581602; Wed, 27 Mar 2024 20:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711595581; cv=none; d=google.com; s=arc-20160816; b=pts+Bi99wWgCvUD9dbxGSGp7ItQmeAtB4zIUK3H/666vc6U7n7v0DNttaFkww1XZQl R3fjYiO82Ind3M9iVXySONbotPkXDZAzp0eT399JqLiRY3DUWwZP0V9eiersihQgq3oB AKX1mDb2fFHwuk4KeJzo04GVFL78Bg2Kw+Db+BUomexMjGchcmsRSyeL3Tc1kjsOUh6g fi/xiYrd7QqIhrf4ydOT9eBxi03URGZYFVahC7XyCPobPRozD+Tsb4/UEbGV8h3dMDqP IrygSYreBudHQ66U/+jI3vX6vvvCvMlJtHgs0X+62j6tYglrq70+8i4fN/pH+NJBg4ox KmYw== 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=PmAC9Wq/Yoc5dn0oPQh9HngM7HPEWLIZWwO7cNu1R9w=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=IYGqTQXERs399JHiG/2Aml6XwSDSyPk+avtogHfd13JOB1wvQL6RKXmrYU2NzZTqC0 Gj1ocR7dwgKrInNrZEzZNurwfCYgzn8N7Ds5DsTaFUVCdO7otBApLz70JcqbUx1Ogzgm ZqH9BpqJ8zbkTZYLCYHl8KMCZ2TCwUxUbII2qO9x8cRw/5CCdOvAaAK+jgT4nq1SD2B9 PPFpPxY/f5/FZRAAE3G0FyuXlxo7j9fQmSkcBcph0SogSeiJrRG+B2haxNRGY1Eg9x0p pOW3GjTWQ6WQueRhgtPPUCwAhNpg0n0kgKwb7WUd9uXZIRdWU4rC6VJK93KO5F1A6j0w vxPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=P9CErzNP; 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 x29-20020a50d61d000000b00568d32672f2si272642edi.403.2024.03.27.20.13.01; Wed, 27 Mar 2024 20:13:01 -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=20230601 header.b=P9CErzNP; 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 68A2E68D6EB; Thu, 28 Mar 2024 05:12:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1B5668D5C6 for ; Thu, 28 Mar 2024 05:12:40 +0200 (EET) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6e6ee9e3cffso384524b3a.1 for ; Wed, 27 Mar 2024 20:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711595558; x=1712200358; 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=/lU0TfGjvAvrwrx7lGE12oA1DkVyxyyMMwXWC+zBpZA=; b=P9CErzNPjzbEnAlNys8MAvC2X+2fnWgxOukSrGN4wSXBR9hKiqW7d6Ilyzp6lCGDbv kJ2q0/yeQFBCgeh8Nk2rb/O5uDPQBO38fP06tNqtwqqWI+WCFF86Y5Gh1/qq8TZsu/Jq Z8eaAuZPOjUH0tLhC/Dtq4vPs2fuEtd+yfqF3RwKXeFiPMzngeckCgo0DsY+hT4gZeiX yKny7fGc+K0Z7ZL2t/1FqjBUc+plCXFZK7rYu1SMlbLxz6pV6XPWLRYv9uzP53PlE5zk QLBrs7F0d6djCy7OPRJof74l4iJHIFILVIn+ubv7GvK4IbU+0pYjzN484wBiVcbm3K2q nOeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711595558; x=1712200358; 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=/lU0TfGjvAvrwrx7lGE12oA1DkVyxyyMMwXWC+zBpZA=; b=cAJ6x0IfQpyMdkYdLNAb4jQZXetgJ8Wi5RmzO5K0ereq5/4dpBl8dhA7oQgUuvODaR 6aKyMx2eW4nIyc0fJt+QsbPUnHdOIbose318OynMmIqsro257vNUhXtNJ3sSH37TMelr Wtp3sm+TSS9AyyJt0ewMXjn7Ue25vQHFcDJHe+BY4keohhD+lU4FlmbH+/b60RLrs/RI nN02mHHDjqGvIhiCy2giSFBGNSq08mWPjE+BDnSor1XKdROJMO+l5PgAkZI1agZv2t0X tfnj1LmPgB5j4rPtsibUTI2Vpone9V/1qbhyT8ZNluyhFjeF9hEsnYccbWIMiU1QVuIU ul4w== X-Gm-Message-State: AOJu0YwUdrbnkG/s0voWM6s8HttNwXO6m19RbyfHq+4lKodGAcHCG3Qo IGmRLkbmoG+PzioeAbgGjPbDdlD34iJrfWfql59mEc/ts42hYToVhM2HWywY X-Received: by 2002:a05:6a20:5489:b0:1a3:5920:ae9f with SMTP id i9-20020a056a20548900b001a35920ae9fmr1604848pzk.2.1711595557605; Wed, 27 Mar 2024 20:12:37 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id q20-20020a635054000000b005dc120fa3b2sm249964pgl.18.2024.03.27.20.12.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 20:12:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 00:12:05 -0300 Message-ID: <20240328031210.21407-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240328031210.21407-1-jamrial@gmail.com> References: <20240328031210.21407-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/7 v4] avutil/frame: add helper for adding side data w/ AVBufferRef to array 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: G3GANNNGj95D Signed-off-by: James Almer --- libavutil/frame.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 34 ++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index d9bd19b2aa..a165e56a64 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -834,6 +834,59 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, return ret; } +AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type, + AVBufferRef **pbuf, unsigned int flags) +{ + const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); + AVFrameSideData *sd_dst = NULL; + AVBufferRef *buf; + + if (!sd || !pbuf || !*pbuf || !nb_sd || (*nb_sd && !*sd)) + return NULL; + + if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) + remove_side_data(sd, nb_sd, type); + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_MULTI)) { + for (int i = 0; i < *nb_sd; i++) { + AVFrameSideData *entry = ((*sd)[i]); + + if (entry->type != type) + continue; + if (!(flags & AV_FRAME_SIDE_DATA_FLAG_REPLACE)) + return NULL; + + buf = *pbuf; + if (flags & AV_FRAME_SIDE_DATA_FLAG_NEW_REF) { + int ret = av_buffer_replace(&entry->buf, buf); + if (ret < 0) + return NULL; + } else + *pbuf = NULL; + + av_dict_free(&entry->metadata); + entry->data = buf->data; + entry->size = buf->size; + return entry; + } + } + + buf = (flags & AV_FRAME_SIDE_DATA_FLAG_NEW_REF) ? + av_buffer_ref(*pbuf) : *pbuf; + + sd_dst = add_side_data_from_buf(sd, nb_sd, type, buf); + if (!sd_dst) { + if (flags & AV_FRAME_SIDE_DATA_FLAG_NEW_REF) + av_buffer_unref(&buf); + return NULL; + } + + if (!(flags & AV_FRAME_SIDE_DATA_FLAG_NEW_REF)) + *pbuf = NULL; + + return sd_dst; +} + int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 2ea129888e..3e5d170a5b 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1048,6 +1048,10 @@ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd); * Don't add a new entry if another of the same type exists. */ #define AV_FRAME_SIDE_DATA_FLAG_REPLACE (1 << 1) +/** + * Create a new reference instead of taking ownership of the passed in one. + */ +#define AV_FRAME_SIDE_DATA_FLAG_NEW_REF (1 << 2) /** * Add new side data entry to an array. @@ -1066,11 +1070,40 @@ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd); * is attempted. * @note In case of AV_FRAME_SIDE_DATA_FLAG_REPLACE being set, if an * entry of the same type already exists, it will be replaced instead. + * @note AV_FRAME_SIDE_DATA_FLAG_NEW_REF has no effect in this function. */ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, size_t size, unsigned int flags); +/** + * Add a new side data entry to an array from an existing AVBufferRef. + * + * @param sd pointer to array of side data to which to add another entry, + * or to NULL in order to start a new array. + * @param nb_sd pointer to an integer containing the number of entries in + * the array. + * @param type type of the added side data + * @param buf Pointer to AVBufferRef to add to the array. On success, + * the function takes ownership of the AVBufferRef and *buf is + * set to NULL, unless AV_FRAME_SIDE_DATA_FLAG_NEW_REF is set + * in which case the ownership will remain with the caller. + * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. + * + * @return newly added side data on success, NULL on error. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of + * matching AVFrameSideDataType will be removed before the addition + * is attempted. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_REPLACE being set, if an + * entry of the same type already exists, it will be replaced instead. + * @note In case of AV_FRAME_SIDE_DATA_FLAG_NEW_REF being set, the ownership + * of *buf will remain with the caller. + * + */ +AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type, + AVBufferRef **buf, unsigned int flags); + /** * Add a new side data entry to an array based on existing side data, taking * a reference towards the contained AVBufferRef. @@ -1089,6 +1122,7 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, * is attempted. * @note In case of AV_FRAME_SIDE_DATA_FLAG_REPLACE being set, if an * entry of the same type already exists, it will be replaced instead. + * @note AV_FRAME_SIDE_DATA_FLAG_NEW_REF has no effect in this function. */ int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags);