From patchwork Sun Mar 17 20:00:42 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: 47134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp656443pzb; Sun, 17 Mar 2024 13:02:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU2OdCZs5sfy/lRV6E4/2vGee9M7IAxkNDiSqQMFe9pTfS8R0sGN6KZVLPngqE88tSJbxSqHXRtdasDhS58fFhb/SEePVDlCleSLA== X-Google-Smtp-Source: AGHT+IE8NX50MVhYhhVMb0ZaDeirAs//6i771SHqW5P4b6MVd+x6OqyuBr3m/JomMoLLdDYXckIm X-Received: by 2002:a05:6402:43c8:b0:568:93e1:76d3 with SMTP id p8-20020a05640243c800b0056893e176d3mr6327486edc.2.1710705724092; Sun, 17 Mar 2024 13:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710705724; cv=none; d=google.com; s=arc-20160816; b=u6ZrOFla5/kUz54/uWQu1DRRy4kH73lULv5QUsFZagMJrQWmcHRlgoBSwFLC+oEc9d iW1U1fSthvMme7kuwa2mL+Lh3JpJL+gWxCUauZWyAGm45ev+scaMRNTW37y5n8JWwd+W gVL6rIcxl+8RVP5tqXpQ80eH3A9Mu00Fpv1wDT/gcDxRTb0yv6rl6sYt41tHmT4V+5z7 0M7o+u80OZ35wLn9gTJuON3L8er6dgoGxX8HsB3wzIdH278egoaaVs3tNnoI03fwh85+ C5LqhWXrqiVwOsszx3wlht20r4Ia9brTaEpLJhLUZP1irMZBjGT+AR7P7FZ+twL37rNe iSHw== 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=ACEFlK87Gz05289PIUDTd6t9eL+0+C75sitf+MHRRaw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VsbBtlVfRSSpPqC2LGOxTmzz71UV/hBR6V8TUlsRJJ8mSAeeyqTKM7ynHGqwPfoZCP iXYP3Dt420BmJ9v3bnH8sNj1kdFBLisz6Pc+OF/RUgcfquRE3JXD+LFMS5AHxD15daET fnNue6/0GroYvemm2myrTq2JKd4mibbW2F7zwN0wrsbwPQOcTfGaqNLY72PwdZ1Maf9a tyVdmtLTPP47uHVo+FOjPgp435cLe8AftibUBXil1dqC+zIjOo3R60LMXTbQkzcrZGKb P97E82dz1TYywXyvXCgV2CeMOq9hoXxswNjr1iok79ZYv8uYsqg2EaATyRSwyLi94I5e +1uQ==; 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=g9gst2qE; 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 ev7-20020a056402540700b00568a4e7e391si3256120edb.564.2024.03.17.13.02.03; Sun, 17 Mar 2024 13:02:04 -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=20230601 header.b=g9gst2qE; 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 58D9568D206; Sun, 17 Mar 2024 22:01:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D132868D1C7 for ; Sun, 17 Mar 2024 22:01:11 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-513da1c1f26so3564872e87.3 for ; Sun, 17 Mar 2024 13:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710705671; x=1711310471; 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=g8V42aoe+CsKOUIPKaf5prw7AXFNwxjNRcJMOEaMS/w=; b=g9gst2qEg90TMUx9hRyB3eAVA6sEJytgIf+ayDleRH0T15ggg7XZHJ7/tcM07X8nyS raYsWgMF9FcfXbaA/2MiRV6pOWbuuAgrM1Fx+Qj6knrVXhagpbfZfsICnUl5XmIZbAyu ahjJu8cH6S67Z9zU/SV28HfA+Fjadd0Dt8PDaAhBNR4bOyy0dcYa/2qJGV478QXrQgR5 nFMhYKO8bjJj6CJeKZD9tqDw1PUOC1rHDZux3/AjPWAITkUA69obtxBliIYieRo/WU/3 WSyZru6eOf/pXBYEgPxxT52pkOkaDgl3OLqnY25IP6anKco2df3sJP4fftlnjxfkaXE4 /LDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710705671; x=1711310471; 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=g8V42aoe+CsKOUIPKaf5prw7AXFNwxjNRcJMOEaMS/w=; b=dfgomoBD4YOIctsZcErHSyg7V9MMJtS8+wvKVMNYzdgqWnAK28KnNauhhW2fiRZ6Z8 eMcEu8UdAN+4D8Zv79ur+pVCBgjbvQ3gV3ZVSudZy+B5SO1BCCAYXnK5PRTHZny8irP7 ViVj4n101HdwQ83mTbyGQW8mvOpCjvXQGBRZ8VFGev8SILfAFDIB6WGf7kf+7LdLLAqr jhNYoV7AUucTKq7YMdp6O5CU4oPY9E+R+7NEEwX/lpJj1xfaIjJvSIAh6/hQrSc66+pD NLp7k1moWSrNFYYFEfk1MS0KQnXMpftJua5muEQKgVZJXNYYDpIdLszAelGS1Hx60Ho2 Ln3A== X-Gm-Message-State: AOJu0YxWAAUshgj52YhEy0kGEVuVi5XWDR6ZP9GC5obCLkKuYq6Wtu4V mX/UUiAJN8XpeWXZURxaRGyRqDVlDMfe1yT+gY/0rjniBNeiwW9xZQynkqi3 X-Received: by 2002:ac2:5bce:0:b0:513:5a3c:e8cc with SMTP id u14-20020ac25bce000000b005135a3ce8ccmr7015926lfn.19.1710705670997; Sun, 17 Mar 2024 13:01:10 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id y3-20020a056512044300b00513c844603fsm1340462lfk.41.2024.03.17.13.01.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Mar 2024 13:01:10 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Mar 2024 22:00:42 +0200 Message-ID: <20240317200100.152097-6-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240317200100.152097-1-jeebjp@gmail.com> References: <20240317200100.152097-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 05/14] 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: bHodRJ8vVj37 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 | 22 +++++++ libavutil/tests/side_data_set.c | 103 ++++++++++++++++++++++++++++++++ tests/fate/libavutil.mak | 4 ++ tests/ref/fate/side_data_set | 14 +++++ 6 files changed, 161 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 dd27456031..4074391a92 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -747,6 +747,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_FLAG_UNIQUE) + 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 27281c168f..5d68d1e7af 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -999,6 +999,28 @@ 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_FLAG_UNIQUE (1 << 0) + +/** + * Add new side data entry to an array. + * + * @param sd pointer to array of side data to which to add another entry, + * or to NULL in order to start a new array. + * @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_FLAG_* flags, or 0. + * + * @return newly added side data on success, NULL on error. In case of + * AV_FRAME_SIDE_DATA_FLAG_UNIQUE 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..793a62c009 --- /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_FLAG_UNIQUE); + + 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