From patchwork Wed Mar 27 19:16:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47546 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp846631pzb; Wed, 27 Mar 2024 12:17:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUhc0E/YZjvPIr596A3oQURGr2vt9vfDvMS8a1BZ2wGZKD0ZylEnpKnLpLNxcbE/fghZlQx1j7mCS378fauu4Y1RsNnfxeF4U0unQ== X-Google-Smtp-Source: AGHT+IH1aJ5EnHgUCPzyK2zi189674SpGdTOqWoT0zIHReDZu7Qq+T/RG+VnARkB7izmAZmFVz8u X-Received: by 2002:a17:906:e2d4:b0:a4e:146c:fef9 with SMTP id gr20-20020a170906e2d400b00a4e146cfef9mr164584ejb.8.1711567031194; Wed, 27 Mar 2024 12:17:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711567031; cv=none; d=google.com; s=arc-20160816; b=RoWGuxt/4YaxSK2TurIfek2Q0rJdYRv6WoWYhawGuBiKrWgM8kpmX3xGQreHNgwHQ7 EYYRb03nVsr651syrhtxOfa775ig1NshyKdc2Hany26StrEVjPDQE71LiYJynQREEkjs 9MPCJUvqI+xRIrjfUaq76JxEw5p1xWNwTTzJwQybkNi5wV4OQh2qnFwmJiM2ja0fZwdO leQhaCvbSqd+ezhSgG2yCT1j1wsyky23th1D66WjG57ncBuBLQnMsVLDbYdrO1z2fu/i AH91vUUl6hmBFvxHkGjujN5BbCab+BMO72M4NAYwhyEksKyGTTQXJoNgr91qcU3QkdOd wBaw== 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=Dgqw9mH4e6dCpj6rew8943759hOCNdk05bpDDE8Jzno=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=j607V8TBJW1DVu49B07umN2UlLXZKE3ur78S++gqeiS6vULccuk1sJrLGXsCzFhboX y/LNDF1IW58sSPd0K/KAwDZ4wA7IXwht9E+KOGf0GjM32jeWpIeLMdlkoEOuuBkvTtXs sPSybB9dj8QjmCTrYd5KwU48laFrTPfhP0Av1XuUtLQzs4DOvCjbGh5QLHqgJcxoG7Iy lBXf13rF8nu8RU0bszKfm/jRE1N9eMRLcXA//jds56Yq8m/1WU1FUyP7CUQb8m4LZ8s+ 7S5ZoNbas8tNL4pLrrlPhe5zMAihTmvYz+i0RRKIHPNHQBl7D0Bnz+m29qcS7gTtokyY T+aQ==; 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=bW8ztyBl; 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 14-20020a170906308e00b00a471bc13618si4924928ejv.1012.2024.03.27.12.17.10; Wed, 27 Mar 2024 12:17:11 -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=bW8ztyBl; 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 B186F68D69F; Wed, 27 Mar 2024 21:17:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00D9D68C6BD for ; Wed, 27 Mar 2024 21:17:00 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1e0f3052145so1903845ad.2 for ; Wed, 27 Mar 2024 12:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711567018; x=1712171818; 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=ASSC9v2x8yiITSbg83+6wR0/CJBOmcuIkZXvd8Urqto=; b=bW8ztyBleJwfm3V3LZ9wRNAOZmMYzGn8yDjKXTTHL8zksSp6vP4Bnn96OkQUSuRhDI 8pwcuvL/4VtnvkmqBGca4I2zvNps0MPk3o3kD4t6bq8wClbk9PB+L7NuxonZJNfJEmAs er7VS+JKa7CCnPY7c+uXWcvmVCT1ptOx5uN2vNHh1vEeCeciL3bH19Wh5JNStLW8MbSt 26p5gwJRYlUVhbPAV5sildzSRMW/PMWh8EVkWztXsQ1X2ru3Kss55d7LGDjdAdo4WOSR Bhs0ncz36xSbIAT7UXpqGQyY+nNuCFK9+r3gX8Q1RkUdCF54Uc3Ug1KmxcvLpnP++tyw CRCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711567018; x=1712171818; 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=ASSC9v2x8yiITSbg83+6wR0/CJBOmcuIkZXvd8Urqto=; b=pzznT9Y3PQwWzz7JHZljPDtbY54zH9RMuUGaaSExEpB7fsQILbXdf47NLZz/DomvkB UnK1xgDH1HBymPY6+MopEa8GUD52Bsv6gP5Hl+Mjv/fuB/Jzc7wgiTgFQi/OVfmiaV4L xBSJw/VIIvMpCiLfhJ6nLz81er3F5vUsJ46pzGIgYSjCvF3vKY8VDXCVgmMM3qJLG14S 8796mN/YuMLZuXfGfij+cKxoP5vn+7O/l7BMb0ZDD6kJjnGm1v69rgXkLeh8rSoR2QWV 3tdzujIQOqwWgR/X5OfJ3CGzgh7+JE/FOsnertaU8uEO47/P9uFmhWKtK8AMB3m2ZKdy +uAw== X-Gm-Message-State: AOJu0YxhjQ6znAtd0+SpclOD0CXBlTPn4f15lCiBKcCMX1oR6cPdrMpM jCVbt5CWZFWPgJLVZ/1AflFQYh7Xi5rUrv0YRODKVVW0sSSwToLntZklyr5F X-Received: by 2002:a17:902:c409:b0:1e0:b574:421c with SMTP id k9-20020a170902c40900b001e0b574421cmr471594plk.44.1711567018393; Wed, 27 Mar 2024 12:16:58 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id c2-20020a170903234200b001e20afa1038sm94806plh.8.2024.03.27.12.16.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 12:16:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2024 16:16:48 -0300 Message-ID: <20240327191648.5017-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240325200602.63020-2-jamrial@gmail.com> References: <20240325200602.63020-2-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10] 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: KCPJscu3s0nv 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 2e40018b83..08b6475cc2 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 0; + } + } + + 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);