From patchwork Thu Aug 17 21:48:45 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: 43248 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2265598pzb; Thu, 17 Aug 2023 14:50:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFSMFelee3VZmCReupadVXpZoAZrrp4miG4V2WDne7iIsC6Ii0ZUAF0GcYJB4Qf8fHqa0St X-Received: by 2002:a05:6402:11c9:b0:51e:5bd5:fe7e with SMTP id j9-20020a05640211c900b0051e5bd5fe7emr4379063edw.17.1692309013210; Thu, 17 Aug 2023 14:50:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692309013; cv=none; d=google.com; s=arc-20160816; b=tQ/Fu00+ZNHcCOuLOHcK64jSbQ229kvBRYt/ou1UA19NMnxwUeGGI84bjgYJbbMUiT QTO/APXKYpnnTcGo8U/UFnkOyHf+1WS4BGok55sDNClJer2ywNifSzZHHiQsgPH/+vk2 6y2jUqKMT32WRWn6NzrfjwZwAiCXlX/pjbNjdci1WPLZbp5rqDuftNB+m8ur0nqpAfW9 oT/QqTnbYSTBCxOPnFIaWBO/G3QezPHIPQklilpFNj1i+mOTr7mzb6bO+l/yyOceBbHV O6VXtqVpJFcrGfQGrbl8juAR1B6vnz36aohJR1kvRkNzfv2otlyYR0TAKoN475Y8sREf kOWw== 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=7n7PChBFOTu7gP/R9J77YVJyN91Sm2sogMYnw7Ts9Bc=; fh=DpbP4OnC98Ct+zBdrpJgv1NgOvKTVLIsArQu/ER33Zc=; b=1LCbB5z8cj5+gc3HRjif5b1YNxUCQ5+7uxc6jOriaxloCf6oIRqhLvZIB4DAMOhJBa DhC6enVRj3y5hq+hniiCrzX6NWnnIJqZ/q9em9c2FIfBNQpiHvPULr+IbC03XGUvMLh0 U4lUGLzYjCeYTVBbNt/TPqn9enm9ab076H/1C1deNsHXlvDbTAnV17roNHzZF1DJzF55 9fM4QBbz2SmLSwiXD1UArlD3XICvngH2CgCP3XNWqlb8XHRE95JJV3STndSD0N5C8Z6N zbOIPiZIfdgZovkmKrQVxCUsnugv71bFkgByPq/wYvVmSxoyWv07AjyWu8mra6hu65ic aZpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=PaZIO3BT; 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 c14-20020aa7d60e000000b005236af69812si308048edr.342.2023.08.17.14.50.12; Thu, 17 Aug 2023 14:50:13 -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=PaZIO3BT; 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 3473868C79C; Fri, 18 Aug 2023 00:49:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C1C768C6E4 for ; Fri, 18 Aug 2023 00:49:03 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-4fe55d70973so350214e87.0 for ; Thu, 17 Aug 2023 14:49:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692308942; x=1692913742; 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=jG+SX6vnemrsHRRXJTRAI3sw7AhiTjIjowdPZd07Rnc=; b=PaZIO3BTwz/EsDm8XTsVXDo3EBtM2GMehiroOqSA6446dCVZrygFhbzjachizfBwB6 XE6OAFjcP/H9umlRO4SLSzsmLAoVm3Hn/Nwae2Zez5GTtDK3zipN1yh/Sr1X0Vu7BlOX sek+xNrISPQ5lBkHtf+eXNbE0Nmlqc7owyKBSg8aKwf292wRcQWb7EgswMfF3sFW8jGL r706cPMWNReSwCSJWzG9NqrFYOhw0Uryjy88gfh1j5/9dFdADHl/3jaDObOnphMOJxi0 0ugB+R0GkfFueCgJ8qHGYWo4dNOyGZ3VDlb8v9iFIK5ybcNGbS/eacb2F48+WsJpacTA lAJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692308942; x=1692913742; 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=jG+SX6vnemrsHRRXJTRAI3sw7AhiTjIjowdPZd07Rnc=; b=ZByrZgNPYvFMDWQ4BsZXA0pHQCUs6Pzmk5y+Cc5sRDMlcDHUDjW8A1+Icjbui52R0T Um8pZFz7KNyhliq2weQLZwXzzmB7ISXLNg8L4ZO06HcHJ6a+Y0QbuHhqSJ0jb0SJj6DZ P2YqU4R9A2ojCOvm+CxXmRmxL6j04xV5QQiCOtSljj3w5/3p1WXQjp51XxnmyjpwsRyT h0aEDkB5cqiSVcgo6UkaVuTRdOMiE4nebvaU7uHiyvelaLYUc9E86EMCgHUMWMp8opvX 2qDWm0bib+4F7eBZg7VNPj0c+Gv7JqdqIAl+7dIZC5dJ8XRSShiM4Td61qLastQssHxv jSBg== X-Gm-Message-State: AOJu0YxslbF37I/qNKfNJVZsKvn1tqeNWXlqC9w8ZJQx/ssPLMiTjnq2 DMGh2lxwynrXxlGfIKcWT9Pd5GLcLro= X-Received: by 2002:ac2:44b0:0:b0:4fd:c8fb:eb71 with SMTP id c16-20020ac244b0000000b004fdc8fbeb71mr181028lfm.11.1692308942207; Thu, 17 Aug 2023 14:49:02 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 14:49:01 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Aug 2023 00:48:45 +0300 Message-ID: <20230817214858.184010-8-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 07/12] avutil/frame: add helper for extending a set of side data 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: 8RS0eAlFEDqo --- libavutil/frame.c | 23 +++++++++++++++++++++++ libavutil/frame.h | 16 ++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index d8910a2120..04d56853f0 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -880,6 +880,29 @@ AVFrameSideData *av_side_data_set_new_item(AVFrameSideDataSet *set, return ret; } +int av_side_data_set_extend(AVFrameSideDataSet *dst, + const AVFrameSideDataSet src, + unsigned int allow_duplicates) +{ + for (int i = 0; i < src.nb_sd; i++) { + const AVFrameSideData *sd_src = src.sd[i]; + AVFrameSideData *sd_dst = + av_side_data_set_new_item(dst, sd_src->type, + sd_src->size, + allow_duplicates); + if (!sd_dst) { + av_side_data_set_uninit(dst); + return AVERROR(ENOMEM); + } + + memcpy(sd_dst->data, sd_src->data, sd_src->size); + + av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); + } + + return 0; +} + AVFrameSideData *av_side_data_set_get_item(const AVFrameSideDataSet set, enum AVFrameSideDataType type) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 0cafc9c51f..2413000c9a 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1083,6 +1083,22 @@ AVFrameSideData *av_side_data_set_new_item(AVFrameSideDataSet *set, size_t size, unsigned int allow_duplicates); +/** + * Add multiple side data entries to a set in one go. + * + * @param dst a set to which the side data should be added + * @param src a set from which the side data should be copied from + * @param allow_duplicates an unsigned integer noting whether duplicates are + * allowed or not. If duplicates are not allowed, all + * entries of the same side data type are first removed + * and freed before the new entry is added. + * + * @return negative error code on failure, >=0 on success. + */ +int av_side_data_set_extend(AVFrameSideDataSet *dst, + const AVFrameSideDataSet src, + unsigned int allow_duplicates); + /** * Get a side data entry of a specific type from a set. *