From patchwork Tue Feb 27 22:12:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 46602 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:aea4:b0:19e:cdac:8cce with SMTP id do36csp11640pzb; Tue, 27 Feb 2024 14:13:40 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWv3zoN+1u1GLIuMjJQn639MbvAN5A/yQAoa+SxoHBhjPIxBSwMNWouNiZFzqV2wtrIyT5Kqpp7Ovzv05DWomFXfBv8ast/R62qrQ== X-Google-Smtp-Source: AGHT+IFBr+xGU+yZX9smOvOjaE/Tmq/HezFq2FPvJ5LGgcN3MUJGFMdkdnsMxCMrb4Y+kn3EQsEM X-Received: by 2002:a05:6402:2045:b0:564:2518:adfd with SMTP id bc5-20020a056402204500b005642518adfdmr8523026edb.10.1709072020517; Tue, 27 Feb 2024 14:13:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709072020; cv=none; d=google.com; s=arc-20160816; b=SPEsYfdL+vHFofpZlZchUIvWZx0wVivkLvBDEs2wEb2inav5b4jkMCNnaA/j7ru8kT Jed6XKJHLOfxPy+9XhvfOBlhvFM4ZMGzpYEKYjbTcTM+yuKdjyGRgNiibi3Cwza7iphx EJrDgLadLB0akrYEKNG4YaYDihnTfP23tFNsyFdIXHV3CAUzjWiq8w+kCWZu1qGk5D9B H0kHiy9/RzAAqDrZOzlx1LRFNUEdDmUvzeB6QR302mWX6jwphAOLsIXVFQuIYJ+wYY2L i3WY5J4b8CwP+vIERppw9EUIithjvfc1LybBOlJPiZBVnYc0yZm6BiAxzbgJbxRJcKHm oIBg== 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=XWwpM+IBo2jW1LsDqaAk/T5qaaekTwvi4xYBEd5WgjY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=cxltrrB24GMISXuO2d/Og++eeZ2hL6h9HGSKOp0st88NgNES9Nb3ahsyR9R9ylLxJf 4DeIhMrdpci/AAGTSM64vE4v0wt1ClFAUC73R1wIwGh4CRUktsIrxIBFENebjo8czHcr acthl0y7LfffUnvzpIWMN76X2pK1rqvsGGA58KACI1kjyR87pIpTvXX5H244kSKT+rm0 Fyh81a2UhKjJC8D81wHSK7qDUPJN2hLKT8qBNp4Smmjr0+J2+MkhjjOO8v21RzSzStwR pm07Rdp1qlYDO017TlQjfaOxoCwaGFKuNam/++bDAAFrdRf52zLLRlbwLgid10m4i918 bRBQ==; 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=QELIuUaJ; 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 a2-20020aa7cf02000000b00565d73c1abfsi1054078edy.377.2024.02.27.14.13.40; Tue, 27 Feb 2024 14:13:40 -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=QELIuUaJ; 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 5B74768CD82; Wed, 28 Feb 2024 00:12:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17A4968C90C for ; Wed, 28 Feb 2024 00:12:39 +0200 (EET) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2d2ab9c5e83so8163131fa.2 for ; Tue, 27 Feb 2024 14:12:39 -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=vhn7IWOA6TqBRotDdGGMhAh/TknQqUqcU+LVsSZg4xU=; b=QELIuUaJI4nDKH3Q17zfRkw+aVb5lQXdaS77LdRv+Kl3lR3EP8tY1srgHt8lSqqxou KAUFzgTkKE7PVu+nQq3wWS63W/P56p/z7XdPBkqm9WdImBGLY6h95htyQY/OwqM2apm6 pLH6MlwMxzBTWjZzw64JtX0naCy0C2usXZWBQUrKyd/n3uacmB3RVEupshjw/OtX+Btl gBlXY4qq2Mm6yEdx9M2xsoxwI7zCAYM2KyVYOhHXpWIGbKcFzGvBzXsI6ZuC1urNfnz6 Cjcu/hde9sN0shic74WivUwvcFc/kdLPfJeamAx+znFD7khHfkwZLUxR/3brHsIRgATg I+AQ== 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=vhn7IWOA6TqBRotDdGGMhAh/TknQqUqcU+LVsSZg4xU=; b=izXBy3w3H8A2IU5BEo/SmNz3E29NvR2aeHqMYp3jWZYi4VipMKl7x52AonoVmeaU2h ayNsFSlj1ueVpg8ISsOBlggcaDa+fK7ubEjq2/+XGCfqM3GmG9S7C5lWYCMP7u/SdR+N eoLet6uFvsm5mg1FexehvkPQrUnB4XZgZBmqjdye4qvkqaPdx0ZLNzljJbSTPyUyy7Ml VgjJcw4hMIYUSOY6FVfE41HPPdz5rmLw/q4E/+bfexLhKJwc3qONsgnHBkLn94XaHiVs 2kAzo8Y5n2hWKvTE7u+MnZUO6+bmCUF1sg+9ArnzrDyt8etsLqc9qTnJzyv6Nt9lbP3M oVjg== X-Gm-Message-State: AOJu0YxxsFGKAMxIddhWp4E4hrtVJASsFcuz7qf6B4DvRJtnl5Bag+9q 3iAG8Dla67z4WRm5IXw1C+Uh6k4lLxP8rZapvxOHwMVcpGh6cWwXdAc0eQ6Z X-Received: by 2002:a2e:be8e:0:b0:2d2:864c:8220 with SMTP id a14-20020a2ebe8e000000b002d2864c8220mr6910212ljr.5.1709071958153; Tue, 27 Feb 2024 14:12:38 -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:09 +0200 Message-ID: <20240227221226.1377758-7-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 06/13] avutil/frame: add helper for adding existing 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: 8K/Lg7794vBT --- libavutil/frame.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 19 ++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index d9741240e7..99c9ce4119 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -110,6 +110,23 @@ static void remove_side_data(AVFrameSideData ***sd, int *nb_side_data, } } +static void remove_side_data_by_entry(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *target) +{ + for (int i = *nb_sd - 1; i >= 0; i--) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry != target) + continue; + + free_side_data(&entry); + + ((*sd)[i]) = ((*sd)[*nb_sd - 1]); + (*nb_sd)--; + + return; + } +} + AVFrame *av_frame_alloc(void) { AVFrame *frame = av_malloc(sizeof(*frame)); @@ -872,6 +889,38 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, return ret; } +int av_frame_side_data_from_sd(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src, + unsigned int flags) +{ + if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) + return AVERROR(EINVAL); + + { + AVBufferRef *buf = av_buffer_ref(src->buf); + AVFrameSideData *sd_dst = NULL; + + if (flags & AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES) + remove_side_data(sd, nb_sd, src->type); + + sd_dst = add_side_data_to_set_from_buf(sd, nb_sd, src->type, buf); + if (!sd_dst) { + av_buffer_unref(&buf); + return AVERROR(ENOMEM); + } + + { + int ret = av_dict_copy(&sd_dst->metadata, src->metadata, 0); + if (ret < 0) { + remove_side_data_by_entry(sd, nb_sd, sd_dst); + return ret; + } + } + + return 0; + } +} + AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, enum AVFrameSideDataType type) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 726ca19a03..47d0096bc4 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1081,6 +1081,25 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, enum AVFrameSideDataType type, size_t size, unsigned int flags); +/** + * Add a new side data entry to a set based on existing side data, taking + * a reference towards the contained AVBufferRef. + * + * @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 src side data which should be added to the set + * @param flags Some combination of AV_FRAME_SIDE_DATA_SET_FLAG_* flags, or 0. + * + * @return negative error code on failure, >=0 on success. 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. + */ +int av_frame_side_data_from_sd(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src, + unsigned int flags); + /** * @} */