From patchwork Sun Nov 26 19:58:25 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: 44813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp2879923pzb; Sun, 26 Nov 2023 11:59:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUNOkCLmLEc3Xt6O64RMDDd4d7JmMfTiXtYBIjXMYPFtJsGmYhFaO4RIacX4+4aMRrX9LC X-Received: by 2002:aa7:d70e:0:b0:54b:ae6:6141 with SMTP id t14-20020aa7d70e000000b0054b0ae66141mr4399578edq.2.1701028794164; Sun, 26 Nov 2023 11:59:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701028794; cv=none; d=google.com; s=arc-20160816; b=QE1+dJ55lgmnOSSrdzCXFI5ZA+bYF88hZKbHEiOOi4KQUPsP3ZG5e990R0YGxutqhq y3C7Fv2W7O4nnIuPkN7WxcHASe5NFg1w5+J6YtU6imc1uJDON/lPoqEOkMnxuIownrVv RNKWqmQBjoEk/i2t1LYmQ1Qe1oqVyUyEONAb0ZB6JkV0zCg+6IKWtFyRxdmjPUFz67CX JS1VJJ6YXBNYXRev87i8ar87xfi+XBaRIMClGeETiJNVaZ/iixmA+tSO8GhofZy0d92P wSGyJEPjvrZCOCk/39SySngNWdmdliTXMq0gCUSLgC0cQrvd1jvLwOgksC9v9O90tvxy Txlg== 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=nR/wTxtGHEFg3Jis/GXIrI5k5bwkdoaaXhhq52YHJ1Y=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Ok8eIjAor31ZtefKpeDTITEbAR+KC2XwBGnJUKgB32BNk1q3c8rfIuleQuJk+ihimF ArYS9apeAHgJn69/lRvC3/gj0w4XVd1YPYmhn8s8nDBuSABQ9VLJlvvkMJfWuihVuQFN U1wNkhRt1x5j+oDEOFV4F14FE+XqwgQ62DU6Y12OOciletaL3nBEYyp/Hfq+ucFZdNse uIcVVXZGv4Nlg/VDA9+MAgqSn/aOlkzb1uz+u63JRItyTDJINwtrGh8cvOVhwyKvuNPZ Q+XiCeEUieccK76fgTcOTWRMYEdE9dBuuNgsupUU/jHwqBylX35g3jPAMu/bUOgTrcdB WhmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=FFq2SNR8; 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 f3-20020a50a6c3000000b00548ab7d9393si4213124edc.133.2023.11.26.11.59.53; Sun, 26 Nov 2023 11:59:54 -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=FFq2SNR8; 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 E61D868CF75; Sun, 26 Nov 2023 21:59:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7681B68CF64 for ; Sun, 26 Nov 2023 21:58:50 +0200 (EET) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-507adc3381cso4815212e87.3 for ; Sun, 26 Nov 2023 11:58:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701028729; x=1701633529; 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=Gzl8qgf/nQDcxKg+bumJZr+Msx3y+VPLJ9rlW+OM8Gg=; b=FFq2SNR87TK0y/gBOfLOymaXjVYGUAKqe7kq7FkTvddw69I/B5rdicCyK9iEOrVPXQ iP7fQuFUHITTqctRgnz6Aez41m4A5qGF3dzBRV0k/KgD63GWxWsJ1uNYpOqRL9h8WkqZ 6fOAhwm7v2iYtJkRAWraaNOEuqQFZo6wnsObX/yRQkf0pyUsjkqrQjhT/XT9KwdWEsIH +LI7Ex/l1A6dCQKG0WZWLP/sVKbV/qJEzWWg1c5W3cVZY7s9ypcDO+1sLcKezdNV/tOQ JPiQnB1Hbm1K8Qdy3/6ixOgiXYiLmJcxi9v3v/BWKSq7vYc5hq6U5wile9IsRjqvWlvU LzvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701028729; x=1701633529; 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=Gzl8qgf/nQDcxKg+bumJZr+Msx3y+VPLJ9rlW+OM8Gg=; b=witExIvARzDp1zDHxIKBuuNd9hKmdusAFYGcKXMlIvqhiLPqMhGpWsHIV/XDKUp0ai P+fG/iOmJrNoiOuDzi8E2r7nSnWX9qmBuZMB9aJ0YuyI6JfsgRaemPS+g4nsU2ciZNOM AJxH0tXiqCrYljUHWD1Sdow/wO05092d+UxHVBhZBTS7bkHO2O8Yq+j7LjdzK4hHA6lA kAcQhCaWTNQ7qtl58V1ZM/x7+KxlOniVE09YTPIU9SQgOZ3ZsalegayyGJB5V+w/FdQQ EGI9PWK7Z+y6BywH6h82/6sAM7WwS2D5RtcLFT5ynucoURTyD2vNv6D8G9uQ1/EJHb5t q9qg== X-Gm-Message-State: AOJu0YxljEjlS5IBpXn8dzhwxYsDw/BB+09x8gn6vtVwbuh23ckCbgR/ u9XoniPxH4wGHsS4h0QKHkdmhS1ov5U= X-Received: by 2002:a05:6512:31c6:b0:508:2022:7743 with SMTP id j6-20020a05651231c600b0050820227743mr8610898lfe.2.1701028729444; Sun, 26 Nov 2023 11:58:49 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k16-20020ac24f10000000b00500d1a72734sm1281833lfr.130.2023.11.26.11.58.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 11:58:49 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Nov 2023 21:58:25 +0200 Message-ID: <20231126195838.392467-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231126195838.392467-1-jeebjp@gmail.com> References: <20231126195838.392467-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 06/14] 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: u7biuW4PuVct 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 4711f8cde8..c000fa0c7e 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -266,6 +266,7 @@ TESTPROGS = adler32 \ ripemd \ sha \ sha512 \ + side_data_set \ softfloat \ tree \ twofish \ diff --git a/libavutil/frame.c b/libavutil/frame.c index 587e212d1a..9ac3db430f 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_entry(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 4fe9ac9411..093a76e30d 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_entry(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..820b3aac44 --- /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_entry( + &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_entry( + &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_entry( + &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_entry( + &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_entry( + &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