From patchwork Fri Sep 1 20:38:18 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: 43443 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a81:b0:149:dfde:5c0a with SMTP id ci1csp579004pzb; Fri, 1 Sep 2023 13:39:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEKsNod1PGl/Eesp52n1TSX2JMNwh83A/aV8OlycQQ27ReU1DqfQ1cGR1nYpaBYcTAAUYde X-Received: by 2002:a17:906:30d9:b0:9a1:f96c:4baf with SMTP id b25-20020a17090630d900b009a1f96c4bafmr2079471ejb.5.1693600795768; Fri, 01 Sep 2023 13:39:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693600795; cv=none; d=google.com; s=arc-20160816; b=CCRdeuauTEGrRR7WmCnc622pasAOqXS6ZYBBwZYdrS9Qa5gsOBuV5W8JyKp+atVQPs Yfxupc8D2n67R3dbjN82ev7t3YPEHBKi23G86tqLQd01XJJH/MBLpZ+rFszsVTDXeGGQ DB5ytNjtvegWk1QyVakuBKwyU1woF+oN8WvVO3+WAYL1cIHyuaym60/KlQygYlptBTAO wSisrezdC3OYLJthXKsYyWHhXd4AbpwOqUBtCprjGsu357d0/JP+f/4qceFmQGdZX1Vk JD9ATggzKP5SSuPusZzJ9rK0IUN0depgLIqG0000Z3StxX+e+Vqt9a8XSQjSaZoMpItq LvTw== 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=FHPX4Z63NffYRMqhCE+dbb1Yr0xotuFM1aRlW+iGkw0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=MtFMM1PTZHZu2sBRGp1Fkgo6p0EFAEEDHCEmUDhUbOi8gaMddi4EXTjoW/iDLvn/Ye x175cEOKNq/rt0bEKl+AiGHGIJ+ZI1xOZOFcMh28I5zj2pdM+roWDI/BJJGCG1aNkSrX cp7+jDIuITL8v4A5x8x8+1OKgtixUA3pgliVcEthBQ22D8rMqVBkXCM6ho9iWmrq0kQv T82IAJV0HzWByzyWRmhu7+gaqB3aYpyvypSX2x7my4Z6amR65XrdNhYbiSU/tPoOAxJy mmLjzrwLwX1EOmPHod22u4APN5hEWRPz6fhBYzMq/pdNirek6Hmqc+Y5sXSWjTGJmsv2 tpZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ctNUCCMQ; 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 f9-20020a1709062c4900b00992f45c9350si2846018ejh.1018.2023.09.01.13.39.55; Fri, 01 Sep 2023 13:39:55 -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=ctNUCCMQ; 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 F01F068C7F6; Fri, 1 Sep 2023 23:38:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A26268C717 for ; Fri, 1 Sep 2023 23:38:34 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2bcc14ea414so41569811fa.0 for ; Fri, 01 Sep 2023 13:38:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693600713; x=1694205513; 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=Pl9fn19vRJwoPm3d7pSncDTPrtwww01HG7nGRkiF9jg=; b=ctNUCCMQ3mzHImEY5K8MQrhaZacFx67+gmAkSl2KV7Ml4a8P4ZxUWz5YM7lxvYpGTg 3/31r6VbzV1flv9X/hEzYnwlYF/wjoDXJUjuR0aeuyG+N1qFoNjPTns1KK5QXqZhA0nP RGHvSUPjAPr4XfOoEqAO2Uo6OVXP75ZoU1+75ZTET7zyhf0Gu+zY95WnycON8w3grcF6 reWjMfa5of4eLo/pJzj50Jruww8Rqzf37SYAyVU0qlAHMjWjJzxOXqLvBJrCNJmunbQU pTlVUyR+HMxP1z4wHn8pCJm2QbPG1akZv2RR712Leiav4XFyFwYtFUYsYjLevKAURSv9 GJzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693600713; x=1694205513; 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=Pl9fn19vRJwoPm3d7pSncDTPrtwww01HG7nGRkiF9jg=; b=ieo+L7FiBQEyFsa1H+P92WWFF4uiHVF9lyiZMw/qdgTL7TPwgY3pe281kxVzRly5Ug yoHuMfdF5gTAsi2h7Ux494419xCCcTydgIt2s65hUVkBGB+NYH2TpfNLQOtlG/PdRZ8I LDwSsh44gWl7pHsq0l2k/2M5nrhiiJP5Ydtvc+q39eKekVUJo/uLftYd3X5VZddfiZns vI2CrTPLpzjU5boRAlP+JIZLxKJZQFrYnuQsE2aqnbJkKTy4yfV17bBPzOFndteA+2zI ZT5Q9CGd9olDFCP/F8eP+97OmBn8925qYGgIwOk1ZbGXBV7emTvxkIKXlDIortB18++Q rfNg== X-Gm-Message-State: AOJu0YzrqEXqhUpD+tIHFJn9xwkrYFYaQKnVuhX2g7tzO4TU10oGoPZS A2UT+ei7Nl4sOQUOQrgvri9H+2CfMtnFHg== X-Received: by 2002:a2e:7207:0:b0:2b6:9fdf:d8f4 with SMTP id n7-20020a2e7207000000b002b69fdfd8f4mr2497445ljc.29.1693600713386; Fri, 01 Sep 2023 13:38:33 -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 k17-20020a2e9211000000b002b9a1e9ba68sm907954ljg.136.2023.09.01.13.38.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 13:38:33 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2023 23:38:18 +0300 Message-ID: <20230901203828.275197-9-jeebjp@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230901203828.275197-1-jeebjp@gmail.com> References: <20230901203828.275197-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 08/13] 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: jTWuLOTHVf1q Additionally, extend the side data set FATE test to check for the invalid use case of extending a set by itself. --- libavutil/frame.c | 32 ++++++++++++++++++++++++++++++++ libavutil/frame.h | 15 +++++++++++++++ libavutil/tests/side_data_set.c | 16 ++++++++++++++++ tests/ref/fate/side_data_set | 7 +++++++ 4 files changed, 70 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 5f74e0172b..898c749631 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -879,6 +879,38 @@ AVFrameSideData *av_frame_side_data_set_new_item(AVFrameSideDataSet *set, return ret; } +int av_frame_side_data_set_extend(AVFrameSideDataSet *dst, + const AVFrameSideDataSet src, + unsigned int flags) +{ + if (src.nb_sd > 0 && src.nb_sd == dst->nb_sd && + src.sd == dst->sd) + return AVERROR(EINVAL); + + for (int i = 0; i < src.nb_sd; i++) { + const AVFrameSideData *sd_src = src.sd[i]; + AVBufferRef *buf = av_buffer_ref(sd_src->buf); + AVFrameSideData *sd_dst = + add_side_data_to_set_from_buf(dst, sd_src->type, buf); + if (!sd_dst) { + av_buffer_unref(&buf); + av_frame_side_data_set_uninit(dst); + return AVERROR(ENOMEM); + } + + { + int ret = av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); + if (ret < 0) { + av_frame_side_data_set_uninit(dst); + return ret; + } + } + + } + + return 0; +} + AVFrameSideData *av_frame_side_data_set_get_item(const AVFrameSideDataSet set, enum AVFrameSideDataType type) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 8ecdf82f33..e16941c5a5 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1085,6 +1085,21 @@ AVFrameSideData *av_frame_side_data_set_new_item(AVFrameSideDataSet *set, size_t size, unsigned int flags); +/** + * 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 flags Some combination of AV_FRAME_SIDE_DATA_SET_FLAG_* flags, or 0. + * + * @return negative error code on failure, >=0 on success. + * + * @see av_frame_side_data_set_new_item regarding the flags. + */ +int av_frame_side_data_set_extend(AVFrameSideDataSet *dst, + const AVFrameSideDataSet src, + unsigned int flags); + /** * Get a side data entry of a specific type from a set. * diff --git a/libavutil/tests/side_data_set.c b/libavutil/tests/side_data_set.c index 056d79f655..0c9ceed962 100644 --- a/libavutil/tests/side_data_set.c +++ b/libavutil/tests/side_data_set.c @@ -91,6 +91,22 @@ int main(void) puts("\nFinal state after a single 'no-duplicates' addition:"); print_clls(set); + { + AVFrameSideDataSet dst_set = { 0 }; + av_assert0(av_frame_side_data_set_extend(&dst_set, set, 0) >= 0); + + puts("\nState of the copied set:"); + print_clls(dst_set); + + av_frame_side_data_set_uninit(&dst_set); + } + + { + int ret = av_frame_side_data_set_extend(&set, set, 0); + printf("\nResult of trying to extend a set by itself: %s\n", + av_err2str(ret)); + } + av_frame_side_data_set_uninit(&set); return 0; diff --git a/tests/ref/fate/side_data_set b/tests/ref/fate/side_data_set index 7d8c684d8f..3050b31014 100644 --- a/tests/ref/fate/side_data_set +++ b/tests/ref/fate/side_data_set @@ -12,3 +12,10 @@ Final state after a single 'no-duplicates' addition: sd 0, Ambient viewing environment sd 1, Spherical Mapping sd 2, Content light level metadata: MaxCLL: 1337 + +State of the copied set: +sd 0, Ambient viewing environment +sd 1, Spherical Mapping +sd 2, Content light level metadata: MaxCLL: 1337 + +Result of trying to extend a set by itself: Invalid argument