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 0049748F0F for ; Thu, 29 Feb 2024 16:44:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DC9E68D1F4; Thu, 29 Feb 2024 18:43:31 +0200 (EET) Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AADBA68D1CD for ; Thu, 29 Feb 2024 18:43:21 +0200 (EET) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-512d19e2cb8so1354349e87.0 for ; Thu, 29 Feb 2024 08:43:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709225001; x=1709829801; 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=D6Gt6g280a8LM67//coy+KvhnRw3T97wrUZ9TK0hivQ=; b=k8EKxVc8E6zXTf0FNvHo7CGgUktca3EUdw5dsAynYB+FnlFc1eloBH7CIXWP4fJw6F A6CSpSpiciPL8nuPuwiSmtJlF9PRjBVueI4xxhMyA5YBIpJ5YTDnulBR5ljgB4hsIkeL HIx3EuEzu9pbqBiAR9L3aYLRgVBKQz6bX+IEBpWiaXjG1RK49HhML2ItI8uTb2LJ4Lfa NwRc7iOGrjKvv38B7hVsxAUj8meePNL5+KovJxpq259zYu6IVyhjE50pmyIboOOfstnq nupKW1aUk9LJPuvGR/d+V0WCG7ODj9fJIcqWKL+s7GCrmhfYsz6+Ze8gMXRlmS9gKOcB R9Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709225001; x=1709829801; 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=D6Gt6g280a8LM67//coy+KvhnRw3T97wrUZ9TK0hivQ=; b=D3fVVQx/Kii5X5pocpQK68d5YPkUvMkolhqANyi+QWkD/vs14STG8/xsMbAUqavmYJ GFnKUucOkvSZ31K4Dx8rgCXWnm2OwZD5JcgkKzWnyRSte7Yfla2wfEbD0kFzQldYOBNL kM05tdSpGnrd8OF/09G4pg27yDnyvcnPGQoFVh+aWSKjaAWdJPY4xR8kQk3ECVniUE7O 43Q8awaTQmEpVI1mCcBMr/P8kHr65XrVAspVnqEQ+CuYt8MVrglJ9ovjRd4ekhHOd0wk aFKbmFj4F+WNaFDyQ2xmBYWUPkY1z9A6b1WwXCrJQ1VYBJmQctS2mrfpNfXnPhz5ZpDU /4KQ== X-Gm-Message-State: AOJu0YxVBBQsn0XgEgu0ggEZXlhhgLa77kGM35ZUGhtUaDTwqDcHzznt 6NTwwl31u49pH77o+laAmvBiFcuQlhNt8XNIa3yItoKD4AQlAnaVRFytP9Ok X-Google-Smtp-Source: AGHT+IGC/GR0q+4K0IO4A6Cajsx9XNk2Eqsp50opEPJ3ChC0MJT1Orcbs0rBVSSo/2obpj9n/SEEOQ== X-Received: by 2002:a19:e01e:0:b0:512:ec53:5915 with SMTP id x30-20020a19e01e000000b00512ec535915mr1923012lfg.15.1709225000730; Thu, 29 Feb 2024 08:43:20 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k6-20020ac24566000000b00513290734cbsm206248lfm.292.2024.02.29.08.43.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 08:43:20 -0800 (PST) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 18:42:53 +0200 Message-ID: <20240229164307.3535613-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240229164307.3535613-1-jeebjp@gmail.com> References: <20240229164307.3535613-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 06/14] avutil/frame: add helper for adding existing 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 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: --- 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); + /** * @} */ -- 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".