From patchwork Thu Aug 17 21:48:43 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: 43246 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2265480pzb; Thu, 17 Aug 2023 14:49:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHW6ZQtt5gLn0OHvp79bkqIyZDaA9A44IkDOGZfs6HjvuXyZU10AKvnWPhTCX2ULxZtYnuW X-Received: by 2002:a05:6512:477:b0:4f8:5cde:a44f with SMTP id x23-20020a056512047700b004f85cdea44fmr402276lfd.10.1692308995235; Thu, 17 Aug 2023 14:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692308995; cv=none; d=google.com; s=arc-20160816; b=z4zA77YV0IJDBeJ2PA5DmuyGQgsJAsULClTZT9b/UJm1ol9L0zJGLn1Hgt3LqUNUcm aQYxcFmGCnFbOWr3nUtIdej3rkn2nVkrmXBNd1MRMJgImtSRA1fHyPc/qYnBJ/ScvxA4 Sjgl8QyK1FHdQ4w4wt4SB1h0uATQ5A/qcNJ8uzxfM9LQeckzC/hvpm8mqVrCEQYxV77R Ozs+pw25tWjUpAvamNh/tNbfOUrPOyOEOnvf6Yk4RAqcq0XoAr+muUU3/4839vdYqb6x BH8cH6qXmrcQPmawjpz6sbDWuMx0DAnCIDAuWFGz/y/BDmOf9APHbuU42nUf/iYXVWJ4 eSUA== 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=8fQdy6/I6RtxNK0kfMIU/zx8rnlOqXD2mlodxPbz6CA=; fh=DpbP4OnC98Ct+zBdrpJgv1NgOvKTVLIsArQu/ER33Zc=; b=PopONUC+hc5x4/HMIP72vDGRRnNSRIPV4ygF5DRebrRcjQGP5vaVJAJy9yrwV4DxN5 WIUKnYg0eW8yuXVA0JQ8vBk8rskrzeuigxjcGQAyWf4Az5DNmtU6OmbvldiJXHEieo2a q8fvByqNTMA+kKjp3iBvflrJXmE6kylS+mNldNneL08tBG0vnZ6xGExF+3BvMTewjAlb kjfIaSLHzWn11rVRyRSJFOCuNmqGAA4/b3gfMXMVDto7GGzBNtskU+/eSEojY1ctZgOC xCK5DSdkbwrLqjWyqQoNxUjLgbY3LhQwSJPybIld3L/iqN6aU7zJYWYQ162Iww7BB3A3 yj/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=S5YszypZ; 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 g22-20020aa7d1d6000000b005233ef72dc0si307197edp.677.2023.08.17.14.49.54; Thu, 17 Aug 2023 14:49: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=S5YszypZ; 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 3605A68C788; Fri, 18 Aug 2023 00:49:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F3BA68C70C for ; Fri, 18 Aug 2023 00:49:02 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-4ff88239785so312821e87.0 for ; Thu, 17 Aug 2023 14:49:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692308941; x=1692913741; 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=G7nMUbYJHKvZWQdA4zTIkFP2iLKKNBoStwpLq2toVos=; b=S5YszypZWxIBrSdaNrmaIyhEYQupNZ8ttuvb4JTNHord/3/SskAg1Om3WzRjcdiEHB I2Uym8jRivLLvOzl6lyo4mRHb3W0GHjrbhDLuBM9pXf6Kxb934QNqrc9VaZy7LgbE/56 /Amr3uPWAuJYndhMVipubiB1B+LEbASgpfCQw9dZgTXbGZlEVXapyGasJv3UbXfIk8Uk ViUXmgUzn4q8Dc41nd6J/TYYq/SnhY6740l7vNsoYsO4Agg4tWFHj6Ldv36vJoiDhNj1 izaxSWQ8wNBjdorWdk01SaalVmj22xHk+BC1iGR5JaD6qxkrr1mBqyIhcB2Y5iT6atxF RZZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692308941; x=1692913741; 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=G7nMUbYJHKvZWQdA4zTIkFP2iLKKNBoStwpLq2toVos=; b=QR4jEz3iyIJYfE+I4DjrpEkzgjFG86F15hQ6jYlX/x+99J64FNHA4q/BeooVTb6CIK vdO93oTx5cyB2AChMyAC2vEBxJOVan1CuWayA4EhIf6esa5a84aw7XnSyR/mcx8dNr+E pjXX8abpYXKkxedmGOp17BFWlE6ExKEPVTLyo/k4IwVPQO7B5zPTfsT1QXW5wGoveCtm 1CnUJcOVq2bZf9NPz9Na7LQFrg17Di4KrZPy8uAw5SNSAfMul/Z63gucjGq+m3h+RN6K JMBIVhgEQZw2C20uibXbAQ9i4ukvJ6RIwutfDqpsyWIFRwAVdqYFv7ltOFtJqPso2smR /ERw== X-Gm-Message-State: AOJu0Yz0lJuYjQYJ3jpPNryTxTUSrkaY1SEmHTyfLHMMzLgSFcUnaAfa 5phyObMLX5+v/9QpaV8CG7vlfX0og1Y= X-Received: by 2002:a19:5019:0:b0:4f9:556b:93c4 with SMTP id e25-20020a195019000000b004f9556b93c4mr346110lfb.31.1692308941433; Thu, 17 Aug 2023 14:49:01 -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:43 +0300 Message-ID: <20230817214858.184010-6-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 05/12] 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: d0coJuDeolhO Additionally, add an API test to check that the no-duplicates addition works after duplicates have been inserted. --- libavutil/Makefile | 1 + libavutil/frame.c | 34 ++++++++++++++++ libavutil/frame.h | 18 +++++++++ libavutil/tests/side_data_set.c | 71 +++++++++++++++++++++++++++++++++ tests/fate/libavutil.mak | 4 ++ tests/ref/fate/side_data_set | 7 ++++ 6 files changed, 135 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 46ea603511..27ccbc52c7 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -846,6 +846,40 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame, return ret; } + +AVFrameSideData *av_side_data_set_new_item(AVFrameSideDataSet *set, + enum AVFrameSideDataType type, + size_t size, + unsigned int allow_duplicates) +{ + AVBufferRef *buf = av_buffer_alloc(size); + AVFrameSideData *ret = NULL; + + if (!allow_duplicates) { + for (int i = 0; i < set->nb_sd; i++) { + if (set->sd[i]->type != type) + continue; + + free_side_data(&set->sd[i]); + + for (int j = i + 1; j < set->nb_sd; j++) { + set->sd[j - 1] = set->sd[j]; + } + + // finally, cause a retry of the same index and update state + // regarding there being one less side data item in the set. + i--; + set->nb_sd--; + } + } + + 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 e5ca7af651..b9d7c76461 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1065,6 +1065,24 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type); */ void av_side_data_set_uninit(AVFrameSideDataSet *set); +/** + * 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 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 newly added side data on success, NULL on error + */ +AVFrameSideData *av_side_data_set_new_item(AVFrameSideDataSet *set, + enum AVFrameSideDataType type, + size_t size, + unsigned int allow_duplicates); + /** * @} */ diff --git a/libavutil/tests/side_data_set.c b/libavutil/tests/side_data_set.c new file mode 100644 index 0000000000..ad420440d5 --- /dev/null +++ b/libavutil/tests/side_data_set.c @@ -0,0 +1,71 @@ +/* + * 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]; + + if (sd->type != AV_FRAME_DATA_CONTENT_LIGHT_LEVEL) + continue; + + printf("sd %d, MaxCLL: %u\n", + i, ((AVContentLightMetadata *)sd->data)->MaxCLL); + } +} + +int main(void) +{ + AVFrameSideDataSet set = { 0 }; + + for (int value = 1; value < 4; value++) { + AVFrameSideData *sd = av_side_data_set_new_item( + &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + sizeof(AVContentLightMetadata), 1); + + av_assert0(sd); + + ((AVContentLightMetadata *)sd->data)->MaxCLL = value; + } + + puts("Initial addition results with duplicates:"); + print_clls(set); + + { + AVFrameSideData *sd = av_side_data_set_new_item( + &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + sizeof(AVContentLightMetadata), 0); + + av_assert0(sd); + + ((AVContentLightMetadata *)sd->data)->MaxCLL = 1337; + } + + puts("\nFinal state after a single 'no-duplicates' addition:"); + print_clls(set); + + av_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..6fb95d3f7c --- /dev/null +++ b/tests/ref/fate/side_data_set @@ -0,0 +1,7 @@ +Initial addition results with duplicates: +sd 0, MaxCLL: 1 +sd 1, MaxCLL: 2 +sd 2, MaxCLL: 3 + +Final state after a single 'no-duplicates' addition: +sd 0, MaxCLL: 1337