From patchwork Mon Mar 11 20:58:29 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: 46970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1469568pzb; Mon, 11 Mar 2024 13:59:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXpnNv7fyFoipgjLP7I4xOBmFZ8UgBEKz0dgig2sHgDjdr0d5bl6c85SFUY7CFT1w+JU7yD3K68AiXUF9U355bZTFr1KZoHVHtjNw== X-Google-Smtp-Source: AGHT+IE08eLLuoEh2A4r/l6/qx9ki+u19cWuPaXQngpdxBTBZX+GhxALUp0Ic0MQGfqUipn7Uyqp X-Received: by 2002:a17:906:2455:b0:a46:2e0d:f5b5 with SMTP id a21-20020a170906245500b00a462e0df5b5mr1970082ejb.26.1710190789590; Mon, 11 Mar 2024 13:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710190789; cv=none; d=google.com; s=arc-20160816; b=aw+tKgcCvdFvlkK/KFqlwvA1+F1xl1Rdaxi+6VcMYJFacup8qQpErzqNS6C7QH3J9u B6774Sw0AI492XbK9ZDkDOSctFGfzToGERvhGG8Xw23w2LfhyoX862duToDwJ0W9o8Pe 4Rk3m5a1m/aBk93rbXKKZGNYY87wLwztxNsF1HYvvbg628goM4m4LyfBAIuCDCJ0ih9b x7GeptWjhSqLOq9RcZzCwNDGaae8R3k03OH14hca6hklYx54AaQCvxzsA0YVw+gQiHq5 M3FCxTEM/UYOcQwAp2mJorIw8ckK35ir5CMF5+Xy0046ixhbW3Qii/nQfKrh0JfuVtYb PPDg== 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=4wJ7zyoWYGLjylpM7KbGqd6qiCCWiiodrGwJLCfbNgQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=zw5k4WwaENZNY9fQUggybQ/yatYL27aL6oW7+3CcGXXUzPHlDRvnQw3fdVMNCYWYdg LgIQNR0vGfidw6ao/4r5INSEr9eDeNryJXSmw5bOM31zYDN9L4KQrIEVD5KrGlnZ1DNi NM2e7UVT0NPvQKlmvNEdvKtZcbrzkQYoArw54ARhZQDf2s10xInLtkYbs7y60bMujI/E /vxHLoRSroRaWGstGXBOXbfMxYLVjBElHXbWyi66fxTClrtVpgMXech8SPmBTojEvInV 1O5eU3zwt7NcbJk9NEsQv5IqBeoUGOvMb+Pdk00Wwu8zgZHEkQSG8ghE1eCr04+qHTVm 6bfw==; 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=U07xMKEB; 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 gt19-20020a170906f21300b00a462739da67si1241331ejb.892.2024.03.11.13.59.49; Mon, 11 Mar 2024 13:59:49 -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=U07xMKEB; 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 2FF4668D0F6; Mon, 11 Mar 2024 22:58:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D66068D0E0 for ; Mon, 11 Mar 2024 22:58:48 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-513173e8191so4807437e87.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=IZWpwXhe8RWUtcBxWwVAbDpDCUE14ngk2xDfOmszF08=; b=U07xMKEBkfkFzamRQVoeJwv8BVyOBrrsvCOFrsKgi3kSzLoJlbHyH7igzwEJICqwIl YUjnPQkLrdeyksCT4TWdcUzoPPznCQaYXZW+Y+o7wsFH02ZXK2kZHVPdkHIJhq0m8/bl e3Dt6qBvYbclH59xBkyutslrDbjFlVuaMO+gI7du/KE4aOXOlaAVhc1W8gRlSgLlFAMG JhH+FzKeJjrMApvjCxiK3i72qlZNL6MBZ2Ch9We5+ybvjseBuo5kzrmfbwvJLUbSABTs VnSXuPu35xWwWZDc2zPyn9I+LZJNtMALn3/VBHN27rblk83avULAPD2csMRVhk2Bl3Py dETw== 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=IZWpwXhe8RWUtcBxWwVAbDpDCUE14ngk2xDfOmszF08=; b=fE1aWg3Ohqt+q0Cn/FXq8DiasAdlASh4vT9nnQFohorUIpjdOS7sJFE1Xr+Ln4TAb5 uniinCtJV4DV3zQKbWBHuS/YV1A6ybUWGGo2eduB31VfjZvXfiFOjfAO9Xp7gfKlnG/g fSAcbKtOfoMrfsRH8iyjDjZGnO6YzZoTPzQ7+HeXr2umKAh8hIyjGXUIYXNRyJZEAETJ R4G87ngtcQ3ZknpsUg4O0CQRxjLfd4wZmDDpMZKgoTjVGSJ6IlsUNee3HDliOfFYxiqA BuCZEGyoSprkd9yuns3a4Q7sGUoD0/NJwJFqPkjc6YBjE34QHPSGr/nbcy1ptQ4wcvbE 2Xsg== X-Gm-Message-State: AOJu0YyaVsOSLz5oXA5YbP51q5/VM8axx727JpYWVKMLcaBXZyOFwKGM MLIk8rC95akYB49lp9bpmqvfZvMWrasv1Se08vsvrvi8A+eq0Auy7D4Qhlka X-Received: by 2002:a05:6512:124f:b0:513:a8fc:95d7 with SMTP id fb15-20020a056512124f00b00513a8fc95d7mr3499550lfb.38.1710190727599; Mon, 11 Mar 2024 13:58:47 -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:29 +0200 Message-ID: <20240311205844.3569895-7-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 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FPbnihCC2Zfd --- libavutil/frame.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 20 +++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 4074391a92..46f976a3ed 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -98,6 +98,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)); @@ -764,6 +781,38 @@ 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) +{ + AVBufferRef *buf = NULL; + AVFrameSideData *sd_dst = NULL; + int ret = AVERROR_BUG; + + if (!sd || !src || !nb_sd || (*nb_sd && !*sd)) + return AVERROR(EINVAL); + + buf = av_buffer_ref(src->buf); + if (!buf) + return AVERROR(ENOMEM); + + if (flags & AV_FRAME_SIDE_DATA_FLAG_UNIQUE) + 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); + } + + 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 5d68d1e7af..ce93421d60 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1021,6 +1021,26 @@ 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 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, + * 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 src side data to be cloned, with a new reference utilized + * for the buffer. + * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. + * + * @return negative error code on failure, >=0 on success. In case of + * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching + * AVFrameSideDataType will be removed before the addition is + * attempted. + */ +int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, + const AVFrameSideData *src, unsigned int flags); + /** * @} */