From patchwork Tue Feb 27 22:12:08 2024 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: 46601 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:aea4:b0:19e:cdac:8cce with SMTP id do36csp11576pzb; Tue, 27 Feb 2024 14:13:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV9Z0tlx2V6iK+F9LXBoaCW2fjGF3/xVXzPqhfgcPzr1ftp3ETgBnZSWiMBrPfgmXooUAN9IjW3afvg984jd8naVDH9D7LYNpWA/Q== X-Google-Smtp-Source: AGHT+IGFcSw54fit3DwFOsVg/G4BoEl8ArflFOmJcHRWkHQfz3ituY65QPAGYaQCR8SI/mKDHUhT X-Received: by 2002:a17:906:a05a:b0:a3e:69ff:141f with SMTP id bg26-20020a170906a05a00b00a3e69ff141fmr588664ejb.33.1709072011563; Tue, 27 Feb 2024 14:13:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709072011; cv=none; d=google.com; s=arc-20160816; b=bHvFEQOb4FpxAr9AZEpfvpMPHSMs1hJSEXHeIfNMRbv7QZOT6NqTSHGJw/ALbaL+G+ ySMehdBMnMHqnj4G5P+Yy0Ygsiz8nq2D1x4FZJpYyhZYiRW0qX75R6WMybTAeM+wHtxn URxoE0vZLcSLwGabnWbkgYY2W16TsIqGo5AmmUKrlwTcYTX0Io/vLqz1lhsXJiVIEXJt oenso/U5T95L2wPBo+Ve5F47R0DRBboXBZjjQnUXyrdK4tTMY2dHRElP91qTdKdu+nYH NIENzSnxpg+P9C0wVt924Y5sC28OrWEkwbT/AO8TpCBfPGhyYnEEgCtkgF2rXKeCfeAH /6ag== 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=KtjYYRcD7BNsofjq+6VIt1QgQBCMUvmIx0vsz6gAST8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=uPOmQmVXzVPgsCiVdWdWp15kzQDFQMBnIslg3e+lGQ9C38yUWJeVn6HQhvX3E3FOJ9 eQbk364iwCApNeY4n/vxV4+IamsborGM881Y4ICtxlQQsm0UyrxqfffvC3zLz9zN2h9e bhot8tQldwY9kxhIRBH9aGhzhegKzD3/tmzjpM60tc7tJlIzlYzMnUNof9zuQ7eb7yo6 dZZHLcMpgCqTtJqZ/CZkrkDO0ym+2BpT/xXYFXKUWNbZDaLO4np/CiV1O5NFZ1nAZp92 iqCryyfMyYMiaj9tkthaH8A+H8N0wqZgJ6Vv7GbpkIefKsT6NfwTPvIE+w4V4UW+qHFV dogg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="emMyu/bG"; 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 cf13-20020a170906b2cd00b00a3d01994ccasi1076564ejb.268.2024.02.27.14.13.31; Tue, 27 Feb 2024 14:13:31 -0800 (PST) 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=20230601 header.b="emMyu/bG"; 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 1F7C668CD66; Wed, 28 Feb 2024 00:12:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB57768C8A3 for ; Wed, 28 Feb 2024 00:12:38 +0200 (EET) Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2d2991e8c12so2546951fa.0 for ; Tue, 27 Feb 2024 14:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709071958; x=1709676758; 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=kLLYRtWVJDOXVKfBSwXv52sKZJrznINFeVr+gr/G+a4=; b=emMyu/bGlKjzxOD7MBgeYnflNvoqbBmN7A1TvSYspLEIcicmpp/VMFmnwELtBaMHDp dNgXo5iKNaVd/6PnUeKJaJNPTOsNZfrAwNtgsbwwbEVftuOTDQwGdxPsnH/pc5xuZfE+ 7kiln45JSrnZme8ItMGiAoyneUTFO5SXfjiFjMv1riqOSj3kPLp8C8qt7cjCf9CjAjSB MtYZFax+Lyc0TlT2I5HboPm0LODxOOGc73MD5NDTAxL+NaRe3lgE4gs10w0613ELgxSR y4PZSGVRnxId3Act0JmtXus8gwUSXuErZr/4N3UkvNVTExAJ+2osGeX/WcXU9lpKC9mB /WRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709071958; x=1709676758; 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=kLLYRtWVJDOXVKfBSwXv52sKZJrznINFeVr+gr/G+a4=; b=URbLCL/Esas5xNHyOWy/vcknpFoy/r294oFbxiGmOzaxKsXWRYRkZ8a1os/kvIYLdP 6VdfKEnbKVJuIJ1fQXwdGcIHfB8eYKDNiohyREaGgnjG5xfKQ1pqMshBEg+V7T6dh6rh 4udDVKyuDPYxpXhPZsm0GAHfZU0N2eeeiPpxS9e/X8rMbBisehDRbacI+nb4TI0C0CZL D8dKqtmqWFcXXkt4H7hFcZIjMRmKrl79Us/Zg5mHcKJyipjM08k9kz/ipv6jtqKFgtUE rilqlKV9Nz1ULMJ55teM9XByQBg5Kb2zdJYONuruaUwnJ8FCAmKcStpF5fu/b+ThlVju CWRA== X-Gm-Message-State: AOJu0YyV+owLCVxTDlkZlX8VwFI67K90opICQqneQW6LSk1Pa0WX72Yc oGXRW+anV7vG49oFs9okPmfmNLWk86FD1XYzWRKzfO80xSl8wxoJ9ERPewG3 X-Received: by 2002:a2e:91d5:0:b0:2d2:3c72:f67d with SMTP id u21-20020a2e91d5000000b002d23c72f67dmr244935ljg.1.1709071957721; Tue, 27 Feb 2024 14:12:37 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j9-20020a2e8009000000b002d09bc941e8sm1373564ljg.139.2024.02.27.14.12.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 14:12:37 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 00:12:08 +0200 Message-ID: <20240227221226.1377758-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227221226.1377758-1-jeebjp@gmail.com> References: <20240227221226.1377758-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 05/13] avutil/frame: add helper for adding side data to array 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: Velt6pJ4Xqqb Additionally, add an API test to check that the no-duplicates addition works after duplicates have been inserted. --- libavutil/Makefile | 1 + libavutil/frame.c | 17 ++++++ libavutil/frame.h | 21 +++++++ libavutil/tests/side_data_set.c | 103 ++++++++++++++++++++++++++++++++ tests/fate/libavutil.mak | 4 ++ tests/ref/fate/side_data_set | 14 +++++ 6 files changed, 160 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 e7709b97d0..4415c913a1 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -271,6 +271,7 @@ TESTPROGS = adler32 \ ripemd \ sha \ sha512 \ + side_data_set \ softfloat \ tree \ twofish \ diff --git a/libavutil/frame.c b/libavutil/frame.c index 788999bdeb..d9741240e7 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -855,6 +855,23 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame, return ret; } +AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, + 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(sd, nb_sd, type); + + ret = add_side_data_to_set_from_buf(sd, nb_sd, 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 921f2212cf..726ca19a03 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1060,6 +1060,27 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type); */ void av_frame_side_data_free(AVFrameSideData ***sd, int *nb_sd); +#define AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES (1 << 0) + +/** + * Add a new side data entry to a set. + * + * @param sd pointer to array of side data to which to add another entry. + * @param nb_sd pointer to an integer containing the number of entries in + * the array. + * @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_new(AVFrameSideData ***sd, int *nb_sd, + 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..7ef99db3d2 --- /dev/null +++ b/libavutil/tests/side_data_set.c @@ -0,0 +1,103 @@ +/* + * 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 AVFrameSideData **sd, const int nb_sd) +{ + for (int i = 0; i < nb_sd; i++) { + const AVFrameSideData *entry = sd[i]; + + printf("sd %d, %s", + i, av_frame_side_data_name(entry->type)); + + if (entry->type != AV_FRAME_DATA_CONTENT_LIGHT_LEVEL) { + putchar('\n'); + continue; + } + + printf(": MaxCLL: %u\n", + ((AVContentLightMetadata *)entry->data)->MaxCLL); + } +} + +typedef struct FrameSideDataSet { + AVFrameSideData **sd; + int nb_sd; +} FrameSideDataSet; + +int main(void) +{ + FrameSideDataSet set = { 0 }; + + av_assert0( + av_frame_side_data_new(&set.sd, &set.nb_sd, + 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_new( + &set.sd, &set.nb_sd, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + sizeof(AVContentLightMetadata), 0); + + av_assert0(sd); + + ((AVContentLightMetadata *)sd->data)->MaxCLL = value; + } + + av_assert0( + av_frame_side_data_new( + &set.sd, &set.nb_sd, AV_FRAME_DATA_SPHERICAL, 0, 0)); + + // test entries at the end + for (int value = 1; value < 4; value++) { + AVFrameSideData *sd = av_frame_side_data_new( + &set.sd, &set.nb_sd, 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((const AVFrameSideData **)set.sd, set.nb_sd); + + { + AVFrameSideData *sd = av_frame_side_data_new( + &set.sd, &set.nb_sd, 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((const AVFrameSideData **)set.sd, set.nb_sd); + + av_frame_side_data_free(&set.sd, &set.nb_sd); + + 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