From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 029254A176 for ; Fri, 22 Mar 2024 23:31:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3654D68D526; Sat, 23 Mar 2024 01:31:52 +0200 (EET) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8566C68D496 for ; Sat, 23 Mar 2024 01:31:46 +0200 (EET) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5ce2aada130so1717206a12.1 for ; Fri, 22 Mar 2024 16:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711150303; x=1711755103; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=J2L0nFizXbgiDzCXyBqNYCVRC6bGX+saNNzsfditppk=; b=cx0XsL/Oq3+4Qu0iwGDW56zfFSv4JbrGq4Ngwr1rfuWOesCmU8472ycuq8JOBIr6CO SjU6QmXG65KdbW1IhiXNAZRTnMcEsPhUUJepDzgzni9Y2cPBxks1J4OjQzwXA2seYvta rAIbo/P5gc1y4SktIWK55k7WYTfysX7D3If8KPQUqhvvbqZgHYqQ/99mgOo+G7QCAZPO yIR1Lv7tu4QT5ejfbbuyMHrvxQokLDPHJkOBkA4C71W4oiO57wwn+8pGnVd3QobE0VB/ fcsrDSQanq3juxTzM97A2raCAOk8m5xukx/T6Sf50h9OKltxx2BzC4Yc1v7Kyrs7qcHk T30Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711150303; x=1711755103; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=J2L0nFizXbgiDzCXyBqNYCVRC6bGX+saNNzsfditppk=; b=rMyEQWYP82cEGt6GGZ9svv3NGzYQxlEW/t13MrFkwKFvekaconyr7Q66va9yJLhg/O 1l9PS8RlQD76CWzsb9ArixczcaGOyaHC91wSwiTGM5SNusdxROFjTwMKr/FQlIOzqCvJ v5H1Cnswr85Ed8rpX9yeWtIu1Vaiu2QVzwL1yxHzHJD5AiLno1y+YxCfhlAwiZ+xKNoZ ZZXeIlM1fYoyeMe7GEdUgccgCKHRvr+FKQfs4iC02qV6+zJCGrU8CcB37TMFYkSIAVdi X8U+oWoAMeLxGK7KWefkScjzbsmP0O0TDC+bruDt5qwQP7w5TCE3igTxK4vQ+qKGC6Rx MikQ== X-Gm-Message-State: AOJu0YwZtnoQDF3iBWekTWUBOJy+Sa2Dk4flwccj04eScqboF8Qoelaw kpOJvQakHsWgOOZ3IAe3GU7i1hFv3/R2eNF9PXCZ0uU4sRBip42AoJdJ0v/F X-Google-Smtp-Source: AGHT+IEFPrJcobczY3t7wYUcDx5HZ8incCmGJzUwuUCgbGjbecDmtNWaC3zuMHpAEXSU7C2j4BgnQw== X-Received: by 2002:a17:90a:db54:b0:2a0:4008:2ac1 with SMTP id u20-20020a17090adb5400b002a040082ac1mr1117351pjx.26.1711150303337; Fri, 22 Mar 2024 16:31:43 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id s59-20020a17090a69c100b0029d7e7b7b41sm6642890pjj.33.2024.03.22.16.31.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 16:31:42 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 20:31:25 -0300 Message-ID: <20240322233129.62994-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- Now taking ownership of the passed in buffer, as Anton suggested. libavutil/frame.c | 22 ++++++++++++++++++++++ libavutil/frame.h | 23 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index d7a32cdc92..0717d89711 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -782,6 +782,28 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, return ret; } +AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, + enum AVFrameSideDataType type, + AVBufferRef **buf, + unsigned int flags) +{ + AVFrameSideData *sd_dst = NULL; + + if (!sd || !buf || !nb_sd || (*nb_sd && !*sd)) + return NULL; + + if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) + remove_side_data(sd, nb_sd, type); + + sd_dst = add_side_data_from_buf(sd, nb_sd, type, *buf); + if (!sd_dst) + return NULL; + + *buf = NULL; + + return sd_dst; +} + int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, const AVFrameSideData *src, unsigned int flags) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 373866c600..e3733ce928 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1021,6 +1021,29 @@ 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 Pointer to AVBufferRef to add to the array. On success, + * the ownership of the AVBufferRef is transferred to the frame + * and *buf is set to NULL. + * @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, + 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. -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".