From patchwork Tue Apr 11 21:20:47 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: 41098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:907:3203:b0:94c:9d7a:e065 with SMTP id xg3csp1125956ejb; Tue, 11 Apr 2023 14:22:22 -0700 (PDT) X-Google-Smtp-Source: AKy350ZT5kPEfsNURn79mp7RqwDZd9KgkLsTnmre1OmQOO4YoWHdPhcsy0GwE9RoJYxpUkK80tlq X-Received: by 2002:a17:907:d489:b0:908:6a98:5b48 with SMTP id vj9-20020a170907d48900b009086a985b48mr10789168ejc.40.1681248141998; Tue, 11 Apr 2023 14:22:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681248141; cv=none; d=google.com; s=arc-20160816; b=JJvi+mmHk4V4wVSrsn1KaLqimM0HMUVujCyERdUBor1bObT58md/huumDbYwUhQqPo UycTNM8DG6tP9Nk07QX+LqChnykSiJBXIlHDlq1PnN7pj8eK1Jyq1Kxb74jk3qTsOtxK zyqJQLLyKKzP/JbYH8i36/ojSKuk8pMiFIIBqPZ9q637Dxk0weZsrHLTlpjM5wZL5Fc/ SeCPLBipHZ67cKxaAcfdWr9NJEyzh0UfJPr6YL9bEeDjynzzmEiH1PhsMc9Pyk9EyiwT 2rYRgnWpHcfMm8pG5v823eNXyrmOjR+4I4cVmBZrFcbsvobI0VrmGP7rMzoMhCzvpbPb 9J4A== 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=NKK5thtfCn7hpz6kETmGUtqaa9iAn4YabijEoaTvhyE=; b=ylx7Qg99ImVDge9A6FKRoU4EoZpbVQfXaoy86HBopKi5HdwwIsGkSROnLlRo/q9YEZ OxkY363enraiQ0SnbyjN34+mdypFZ5gFbEsttumHQtbNKnlEHbUCcQo9XW9BiTOwUidI 7S9InjyCF4WJytGDC1ysCTZ0QUs4fx3sPGb0RCBDYrbhOnliafZ8sq2jFpWz+DSBOLBx JbKM/HhLMFtNELkmnQ0Ov3gmgKx9o0BinqXwhKQ94uPOoQ/PHhTfvYGsBUpUSBB2zZGp IqqrfzE+wQ1YE1+omHxYZ1w/rbYH40uXh9wCh/QsFUi+w46RiwAJv9AORh/7TQoTOUl7 ZrXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=axWsqiCD; 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 r5-20020a170906a20500b0094a9d6cdfbdsi3380462ejy.757.2023.04.11.14.22.21; Tue, 11 Apr 2023 14:22:21 -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=axWsqiCD; 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 0F76268BCA6; Wed, 12 Apr 2023 00:21:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28CC068924F for ; Wed, 12 Apr 2023 00:21:05 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id be27so10016695ljb.12 for ; Tue, 11 Apr 2023 14:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681248064; 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=+Ym/c7834lmkKijUaa7c+4OR4VqdHHXbn1Iz+9BVi70=; b=axWsqiCDLf0uJVBRWZibhgmwsw6jrT7QXIF801kiAAMBdslu9ID3LRMCjqT+Lm4pCp ZJNgeVGFO3Y0zbvWd2Tlpt8O16VIRqaz98W/btVS+j/hidmY8BVvS+6H3mdaS+s2hDIw QrbJGtcFReiVDsJ4R6Gsoc/epTY3+ut1rPYyrJgrmjkWPvevdRevEKROG3CX4zoazqK7 R9IThKkkJLVBskZgq7+f5zT+soUrIzwBdoFBk3tCi689LhG01pC6/ypISsMAZZ76o/7o tT5PCQYNPiWGpN9sjC8vXC6ZUO/oH1iZLrpjHZlqcCi3x+N/WPS1SutBhEu0Kccl2BIU EUUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681248064; 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=+Ym/c7834lmkKijUaa7c+4OR4VqdHHXbn1Iz+9BVi70=; b=ztPZtP9o/quvVJm6xvNjlHkMUOLLcDbNFt8GQVxTNJK4FJ1XhutRJBzEOfQ2TFm6XV MJMnG99OT+pjGZB9KMSsFrhGFY9/gDKFF5Hsa7uPO/q13MjJ6L4iEBHpIv3BO5kldmdD 5q09+PQhPp7Tg/4rqF3B+tgiWdBpBEjKr2XVemSMxO+KUwWOz3Cz2dAo4cmXdR8lP8JV SZE0aprzXBZHqcqZNwnu9LJXlZlfIIPwo69JgcEdhd8ppanz0hS3XxUp6F8svgNbajv+ 2IepyHhcaqvlBfB198apOjWya5Zm/vjSt7pAmAcHS3VkRDROrk7tCChJPrKMJLzanKQP iZ+g== X-Gm-Message-State: AAQBX9e7KhcV1lQ86cgRYatUJKcEr7hvBlPBKh/dLdlxKShbe/G2A19v CTW+l7/tiV0fb6eHFsrpX7076i092is= X-Received: by 2002:a2e:9b12:0:b0:2a7:7218:c3b1 with SMTP id u18-20020a2e9b12000000b002a77218c3b1mr2918291lji.29.1681248064233; Tue, 11 Apr 2023 14:21:04 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id w21-20020a2e9995000000b002a7778bd271sm1195055lji.20.2023.04.11.14.21.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 14:21:03 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Apr 2023 00:20:47 +0300 Message-Id: <20230411212052.159889-8-jeebjp@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230411212052.159889-1-jeebjp@gmail.com> References: <20230411212052.159889-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: lR096lH38zr0 --- libavutil/frame.c | 21 +++++++++++++++++++++ libavutil/frame.h | 11 +++++++++++ 2 files changed, 32 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 3386cda627..ec4e44a11f 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -720,6 +720,27 @@ AVFrameSideData *av_new_side_data_to_set(AVFrameSideDataSet *set, return ret; } +int av_extend_side_data_set(AVFrameSideDataSet *dst, + const AVFrameSideDataSet src) +{ + for (int i = 0; i < src.nb_side_data; i++) { + const AVFrameSideData *sd_src = src.side_data[i]; + AVFrameSideData *sd_dst = + av_new_side_data_to_set(dst, sd_src->type, + sd_src->size); + if (!sd_dst) { + av_side_data_set_wipe(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_get_side_data_from_set(const AVFrameSideDataSet set, enum AVFrameSideDataType type) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 8aa50e3ad8..da8ac3237b 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1011,6 +1011,17 @@ AVFrameSideData *av_new_side_data_to_set(AVFrameSideDataSet *set, enum AVFrameSideDataType type, size_t size); +/** + * 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 + * + * @return negative error code on failure, >=0 on success. + */ +int av_extend_side_data_set(AVFrameSideDataSet *dst, + const AVFrameSideDataSet src); + /** * @param set a set to which the side data should be added * @param type type of the added side data