From patchwork Mon Mar 11 20:58:30 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: 46971 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1469639pzb; Mon, 11 Mar 2024 13:59:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXS5+Jk8vidGqjrwwgrUb7S5ImCBy4ZuwhmJAcBfu2efA7LggDfwqMY9bMYVoeusSHOJrCJgc3lXXn0u22tEr+B/7qlBtnJkgGHFA== X-Google-Smtp-Source: AGHT+IE+Uyxtigq3NcT/IcTDlJLbf/oc3v0VjauE6C8lNepzBmjZi6HgqvtU5a4eAAetI8+Kb1w/ X-Received: by 2002:a17:907:160a:b0:a40:2c33:1f42 with SMTP id cw10-20020a170907160a00b00a402c331f42mr5288729ejd.15.1710190798164; Mon, 11 Mar 2024 13:59:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710190798; cv=none; d=google.com; s=arc-20160816; b=s7fezusCx5dj8bhbBvjL+dCbyEi8vM7zYbhYT8buDItLtfZToqa5jdm7ubsQ86EOYZ /hEuXBQD0Jbt4BwkhMdXfPQIjsJ+geROv8zqKgLgPd922dbAcsZV8bzEZWo0oL7BAbnG djnMXqwnIUL6es36diz7tagi7HRnv1jGDFdR+SnHzmdgJdikXBwajUHqsJQkWCywYCaM qf0qDFdDz3qTo5lQ78JvTJt/iBLkcM1iNR0UPPR/Vtk3Eb4AEMYyiipOR8Xi3eTn2PMf n679msi5MaeFsKPyCvMdG4l3cDqQGLHm0ZQa4Sg6K1HY9DPY4ZA8Ox1MSAzyby1Kljl0 SHig== 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=TE2YhlWkumFdOyS/p2V5sOhgIViTCT/Jp3X4aDxEWQU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Pe169F07iNTFptkPJO6Myp2JH2XRcNx1nqsR6W2BdlIKQB8YqiAmNj3eacUs1tLLmq BH85jOctZmngmf3Ea1xlD1h5w9guIfQhuprr8VVRxI8PxFXf+GDf3A5ExUH+iPSIKnC2 TIzY0yY+Uwsyw2nU+28AIxMF48NiqsN5erRIHKuNBk5+K6DgQyl77a9t9xoeNaMB91aB X8NZN4K1NJDeUTYquuWUt0ULvb0+JDb8CFSGO1lGCkoSa+PZymSM6+il8Yp1b9cao6L+ hYcyJOAmPqpNwMN1I6ARpm7co+R3zIppzHc6N/N125fmSXvWtZxzqGu+0nZC495tT7FB AwAw==; 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=l49GDiSD; 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 i24-20020a170906115800b00a4300fe6e87si2633876eja.973.2024.03.11.13.59.57; Mon, 11 Mar 2024 13:59:58 -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=l49GDiSD; 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 4890A68D154; Mon, 11 Mar 2024 22:59:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE79868D0E0 for ; Mon, 11 Mar 2024 22:58:48 +0200 (EET) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-513b1c69cb8so1017943e87.1 for ; Mon, 11 Mar 2024 13:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710190728; x=1710795528; 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=qt6a8/F8bqj+RTz8gRZJFV2uZaNZU+zonBEJlN8Ye0c=; b=l49GDiSDFV4mCZbB5KKqDX1kQLO6uOH8mgCAl664yRVeJMQ81aN3l3Ad/QdSGfcErx peGsGQZsCpiJjlbRse0skJtDy04LricHQXo4oyzw73l453JJlQUfX+ZdsTuvvg2GfaH7 eh+BBfkXsq1wz5dXOd2w8U22yJB5SEbvZowUYduF0/RViQh5/epd6d8xE5p0yxhw1tfA 0y+/rbeIPHYc8uAPqc7KbzIEvLHaxfsQ6JLHOxbTppt/6wMUJ4kvuz7FifU5NR+07UPO WpOGp2rKNv7Lat2ypozlnkewxjGjD6D3RMt0vZkjxxjdKTJOqkWZq/4DrYMYDpDArNN/ 46dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710190728; x=1710795528; 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=qt6a8/F8bqj+RTz8gRZJFV2uZaNZU+zonBEJlN8Ye0c=; b=G6FhnXRdY4xOZqnhusod2rT1iXXKpOCEbzBVIURhJE6hkbTGVYlavNtALB2LoGKPeu lQarYM83Pd3KcggCi9Wm8AeDPuDEIx9pdfq3d2wx2JqSLjW3hV+n3dUjuD1ChuNPr9jx ct7z7lLG2+R7pY7xImFYaFzcIb51GMnrnzMuURROOXkyjT3nbPvW2FM+S8KsMvOnfAtS HctskMTU0HozB/sFXoCmFv9rXCdCw9DebzzjpCZQ42sd0md5dQoDNPVt8tuyH8t+Ov6/ adHVDt8wD9AtAzce2NLBqFvS8HMMmuds4dnccCYHZ1jPEN4F3XSU1ILIe4gI28F7Brha gY1g== X-Gm-Message-State: AOJu0Yx7n9aCDH9lbWbBPF7anyd9oc2lBFb9XDyFQ9Y/Jhzs2DggLhfF +kfOGFEu87FsYD1cRpP78/znd/uUuRiM1Ktcay7EPUqBMZvF20Bxg/S+wsUq X-Received: by 2002:a05:6512:78c:b0:513:523b:6e20 with SMTP id x12-20020a056512078c00b00513523b6e20mr4369080lfr.23.1710190728026; Mon, 11 Mar 2024 13:58:48 -0700 (PDT) Received: from maomao.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c17-20020ac25f71000000b0051333104075sm1249247lfc.259.2024.03.11.13.58.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 13:58:47 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 22:58:30 +0200 Message-ID: <20240311205844.3569895-8-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311205844.3569895-1-jeebjp@gmail.com> References: <20240311205844.3569895-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 07/14] avutil/frame: add helper for adding side data w/ AVBufferRef 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: /M5oo/qFP7kV This was requested to be added in review. --- libavutil/frame.c | 43 ++++++++++++++++++++++++++++++------------- libavutil/frame.h | 21 +++++++++++++++++++++ 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 46f976a3ed..30db83a5e5 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -781,29 +781,46 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, return ret; } -int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, - const AVFrameSideData *src, unsigned int flags) +AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type, + const AVBufferRef *buf, + unsigned int flags) { - AVBufferRef *buf = NULL; - AVFrameSideData *sd_dst = NULL; - int ret = AVERROR_BUG; + AVBufferRef *new_buf = NULL; + AVFrameSideData *sd_dst = NULL; - if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) - return AVERROR(EINVAL); + if (!sd || !buf || !nb_sd || (*nb_sd && !*sd)) + return NULL; - buf = av_buffer_ref(src->buf); + new_buf = av_buffer_ref(buf); if (!buf) - return AVERROR(ENOMEM); + return NULL; if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) - remove_side_data(sd, nb_sd, src->type); + remove_side_data(sd, nb_sd, type); - sd_dst = add_side_data_to_set_from_buf(sd, nb_sd, src->type, buf); + sd_dst = add_side_data_to_set_from_buf(sd, nb_sd, type, new_buf); if (!sd_dst) { - av_buffer_unref(&buf); - return AVERROR(ENOMEM); + av_buffer_unref(&new_buf); + return NULL; } + return sd_dst; +} + +int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src, unsigned int flags) +{ + AVFrameSideData *sd_dst = NULL; + int ret = AVERROR_BUG; + + if (!src) + return AVERROR(EINVAL); + + sd_dst = av_frame_side_data_add(sd, nb_sd, src->type, src->buf, flags); + if (!sd_dst) + return AVERROR(ENOMEM); + ret = av_dict_copy(&sd_dst->metadata, src->metadata, 0); if (ret < 0) { remove_side_data_by_entry(sd, nb_sd, sd_dst); diff --git a/libavutil/frame.h b/libavutil/frame.h index ce93421d60..a7e62ded15 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1021,6 +1021,27 @@ 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 an array from an existing AVBufferRef. + * + * @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 buf AVBufferRef for which a new reference will be made + * @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_add(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type, + const AVBufferRef *buf, + unsigned int flags); + /** * Add a new side data entry to an array based on existing side data, taking * a reference towards the contained AVBufferRef.