From patchwork Fri Sep 1 20:38:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 43441 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a81:b0:149:dfde:5c0a with SMTP id ci1csp578867pzb; Fri, 1 Sep 2023 13:39:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE75I6bIiFLDxnqRQ6X3dvBGmiZ3mr8bhS+ughyekGjre0eMcxM5pQfMdLt2jnS1Off8d4R X-Received: by 2002:a17:906:53:b0:9a1:649b:46f9 with SMTP id 19-20020a170906005300b009a1649b46f9mr2583946ejg.74.1693600778198; Fri, 01 Sep 2023 13:39:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693600778; cv=none; d=google.com; s=arc-20160816; b=WiqCOEhBepM1a+J1WYw/Uy6S/WAiaUJETcoGJarutUtlLXURZQ3vMd8tBtaEfTlRf3 ZO1A52ICO5VllBexrotvihHszSk/hWqDo1RYoBmKxtKHx1xRCx9n49hbqW/+zatwwBYS HagVouekuLmFEEQ7z+vKw0tP/jsA46v7jt7WxHkkNTO66WXZ1IcvXNx7w7HOqU17E9FG 140usO15Le4vWLBzO2wzmpwGplvojbx3five5QQrmrGwO7/kN2o+ndGPet/9QGPinbcp TWJABH88eCABXdZLPq4UjyURm4oJoabGfKOISWhUEhbVOBpGbM8t7Fm1x3j6mIeRyxKC mC5g== 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=liTSvswBrPI/gEh9HFSBj/p096QJka5kXQGTWlkFLkI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=s0yBuWXTAx7VynDwC5vrbvp1Cco0TqRE5p3G1VmggmZpgBaOSZpLYd2HgOixf7xTkv vj907kd7xANy3mTUDZlDRzBUoSxipVuILGTvayx7N/Ibty/eMIM0Intc3+VYcaiP1SU/ DUrSz4B49snWvkSerzyTrMZKJUiRaGyReMXeAtvyooKOw0gJ89m1Wf73/0CWHF3loY6n dJ8XcFpC2nMkW1ZDeu7vjHDQ+9aYwyect/hQf1zcFL9e4bYHee3IaLtv1E5X+6cW0kia bbkCics8s9Myv/EhWgaSFB5aRc5Iz/m4T35eyW60ZdytP0KalO071q3txli0NtyEzRof uruQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=HQTkyflg; 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 ti8-20020a170907c20800b00991df86ac0fsi3010802ejc.290.2023.09.01.13.39.37; Fri, 01 Sep 2023 13:39:38 -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=HQTkyflg; 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 C6D3268C7CA; Fri, 1 Sep 2023 23:38:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C99968C743 for ; Fri, 1 Sep 2023 23:38:33 +0300 (EEST) Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2bcbfb3705dso41200511fa.1 for ; Fri, 01 Sep 2023 13:38:33 -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=x4UYZZcAkf1ZY5qzjG+700nlJDAWr7q0cKTnViAK6ZI=; b=HQTkyflgx9UvOrACQQ+5j58die5RQOc62cprFeMLr+YAmJ55xvd+6mKU53cyO4FFDw vnQjvdiPgR2N9jxo4RhpcKlNqAfD3bdZydOUm88uffTudKjjlyY4wGvrLVFV3m1s6Hn3 DB8m4z7LQYPFbUIDLaNxDq+iznn1lvFUOA/guKNZEAnKg3htNU772KVe1rwUPX6ie7nF K0BDxmZP2yi972d6fTE+EU2w6nv3dgWz4VjTQ68O6SH46UNGDNtHoR1MBouugvYE0vGk OMSun5axWITpI/LdbaFix/abUslW3GocEPOTRJ+Bs6+/CMpAiQnA3yecG5cPKpadVAdw LeqA== 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=x4UYZZcAkf1ZY5qzjG+700nlJDAWr7q0cKTnViAK6ZI=; b=jYl6n9McB6Di0O1BzeodeDpi8PpV5wZJXlTf767kVHGn4peC+b7zmw1usIGnvV3H+w WwgqIt6GyRO01sORN3oagcD4ICTxT6FMoBLLByugli/xeJL3HIwf60p2eQGMDLZOtUjM RRi8f0vlSpLMl9HjGDSkNH4MQfgLZnh+tMCDXx0VMqix+ReKHj4mD6s/47DE/bxgAnLM TYvSiuhKtXnM17oupQfEiZkYA0bpqwFgKUool4Wajk4Tv425gX1ZLLcVY86zTg4jlgH8 cE6fqV+KHMXSrRAN7oDSKQJ9RNkftZFMe6ETdJveX/dhHaWTROK6rKKZ6yeCI4s2CiNM R+Gg== X-Gm-Message-State: AOJu0YzYcymsEoYfVPjHljPCYaEdBT4X3HlyoDVXc4z8ZCGWJanC/xqY oExdmAFycxIgkhmW4HrN5McAZMMG7I/mdA== X-Received: by 2002:a05:651c:210:b0:2b9:5fd2:763a with SMTP id y16-20020a05651c021000b002b95fd2763amr2448708ljn.35.1693600712513; Fri, 01 Sep 2023 13:38:32 -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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 13:38:32 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2023 23:38:16 +0300 Message-ID: <20230901203828.275197-7-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 06/13] avutil/frame: add helper for adding side data to set 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: fRbLufNgOc4b Additionally, add an API test to check that the no-duplicates addition works after duplicates have been inserted. --- libavutil/Makefile | 1 + libavutil/frame.c | 18 ++++++ libavutil/frame.h | 20 +++++++ libavutil/tests/side_data_set.c | 97 +++++++++++++++++++++++++++++++++ tests/fate/libavutil.mak | 4 ++ tests/ref/fate/side_data_set | 14 +++++ 6 files changed, 154 insertions(+) create mode 100644 libavutil/tests/side_data_set.c create mode 100644 tests/ref/fate/side_data_set diff --git a/libavutil/Makefile b/libavutil/Makefile index 7828c94dc5..339eaf3539 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -264,6 +264,7 @@ TESTPROGS = adler32 \ ripemd \ sha \ sha512 \ + side_data_set \ softfloat \ tree \ twofish \ diff --git a/libavutil/frame.c b/libavutil/frame.c index 0b1a8e5244..f64ddb3645 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -861,6 +861,24 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame, return ret; } +AVFrameSideData *av_frame_side_data_set_new_item(AVFrameSideDataSet *set, + enum AVFrameSideDataType type, + size_t size, + unsigned int flags) +{ + AVBufferRef *buf = av_buffer_alloc(size); + AVFrameSideData *ret = NULL; + + if (flags & AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES) + remove_side_data(&set->sd, &set->nb_sd, type); + + ret = add_side_data_to_set_from_buf(set, type, buf); + if (!ret) + av_buffer_unref(&buf); + + return ret; +} + AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, enum AVFrameSideDataType type) { diff --git a/libavutil/frame.h b/libavutil/frame.h index dc87d38adc..5aed08b796 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1065,6 +1065,26 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type); */ void av_frame_side_data_set_uninit(AVFrameSideDataSet *set); +#define AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES (1 << 0) + +/** + * Add a new side data entry to a set. + * + * @param set a set to which the side data should be added + * @param type type of the added side data + * @param size size of the side data + * @param flags Some combination of AV_FRAME_SIDE_DATA_SET_FLAG_* flags, or 0. + * + * @return newly added side data on success, NULL on error. In case of + * AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES being set, entries + * of matching AVFrameSideDataType will be removed before the + * addition is attempted. + */ +AVFrameSideData *av_frame_side_data_set_new_item(AVFrameSideDataSet *set, + enum AVFrameSideDataType type, + size_t size, + unsigned int flags); + /** * @} */ diff --git a/libavutil/tests/side_data_set.c b/libavutil/tests/side_data_set.c new file mode 100644 index 0000000000..056d79f655 --- /dev/null +++ b/libavutil/tests/side_data_set.c @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2023 Jan Ekström + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include "libavutil/frame.c" +#include "libavutil/mastering_display_metadata.h" + +static void print_clls(const AVFrameSideDataSet set) +{ + for (int i = 0; i < set.nb_sd; i++) { + AVFrameSideData *sd = set.sd[i]; + + printf("sd %d, %s", + i, av_frame_side_data_name(sd->type)); + + if (sd->type != AV_FRAME_DATA_CONTENT_LIGHT_LEVEL) { + putchar('\n'); + continue; + } + + printf(": MaxCLL: %u\n", + ((AVContentLightMetadata *)sd->data)->MaxCLL); + } +} + +int main(void) +{ + AVFrameSideDataSet set = { 0 }; + + av_assert0( + av_frame_side_data_set_new_item( + &set, AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT, 0, 0)); + + // test entries in the middle + for (int value = 1; value < 4; value++) { + AVFrameSideData *sd = av_frame_side_data_set_new_item( + &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + sizeof(AVContentLightMetadata), 0); + + av_assert0(sd); + + ((AVContentLightMetadata *)sd->data)->MaxCLL = value; + } + + av_assert0( + av_frame_side_data_set_new_item( + &set, AV_FRAME_DATA_SPHERICAL, 0, 0)); + + // test entries at the end + for (int value = 1; value < 4; value++) { + AVFrameSideData *sd = av_frame_side_data_set_new_item( + &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + sizeof(AVContentLightMetadata), 0); + + av_assert0(sd); + + ((AVContentLightMetadata *)sd->data)->MaxCLL = value + 3; + } + + puts("Initial addition results with duplicates:"); + print_clls(set); + + { + AVFrameSideData *sd = av_frame_side_data_set_new_item( + &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + sizeof(AVContentLightMetadata), + AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES); + + av_assert0(sd); + + ((AVContentLightMetadata *)sd->data)->MaxCLL = 1337; + } + + puts("\nFinal state after a single 'no-duplicates' addition:"); + print_clls(set); + + av_frame_side_data_set_uninit(&set); + + return 0; +} diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 80153f4395..6864ea9c03 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -148,6 +148,10 @@ FATE_LIBAVUTIL += fate-sha512 fate-sha512: libavutil/tests/sha512$(EXESUF) fate-sha512: CMD = run libavutil/tests/sha512$(EXESUF) +FATE_LIBAVUTIL += fate-side_data_set +fate-side_data_set: libavutil/tests/side_data_set$(EXESUF) +fate-side_data_set: CMD = run libavutil/tests/side_data_set$(EXESUF) + FATE_LIBAVUTIL += fate-tree fate-tree: libavutil/tests/tree$(EXESUF) fate-tree: CMD = run libavutil/tests/tree$(EXESUF) diff --git a/tests/ref/fate/side_data_set b/tests/ref/fate/side_data_set new file mode 100644 index 0000000000..7d8c684d8f --- /dev/null +++ b/tests/ref/fate/side_data_set @@ -0,0 +1,14 @@ +Initial addition results with duplicates: +sd 0, Ambient viewing environment +sd 1, Content light level metadata: MaxCLL: 1 +sd 2, Content light level metadata: MaxCLL: 2 +sd 3, Content light level metadata: MaxCLL: 3 +sd 4, Spherical Mapping +sd 5, Content light level metadata: MaxCLL: 4 +sd 6, Content light level metadata: MaxCLL: 5 +sd 7, Content light level metadata: MaxCLL: 6 + +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