From patchwork Sun Nov 26 19:58:26 2023 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: 44814 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp2880004pzb; Sun, 26 Nov 2023 12:00:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFJZVF8J6n1PiyB6vGFsdWGf8QLFVVdpxIXFuBzkCHQc9yjDt2S5cneWrb4N/O2MuV+ywi3 X-Received: by 2002:a2e:8244:0:b0:2c5:19ab:726e with SMTP id j4-20020a2e8244000000b002c519ab726emr5662779ljh.47.1701028803726; Sun, 26 Nov 2023 12:00:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701028803; cv=none; d=google.com; s=arc-20160816; b=gH6zMAJJ4P4YyFe3qCzkKqMvcPOhi/4gKl02c3CvdQS/F5ZUzTHfWS+AvTAA1AwqMG KuYaWimMWyRmRLxiiAEuRYgsQTRHSxeaTxE3qsEG2dtRi8WA7I9IMp5cVgmv8r2yrmyG +U6qCdfQbMIteXxvUTFZU+UrZyR0ITMgiZyik20b9e7lvo7Pmgyrz61ASpfzYiiVqpf7 J1Orw6n4t4ChOiYiGfO0JOuBQkqzd97uhhx6vrBdoIbek4WV3bMlAeaOTTANVxvyadZC detYBNfrs0UBpAlwDPMNhbXEpXHC6Yy9VW0DTZEpEMVs+hJFgocnGH0jgVqlr4lmZ9kf Nmyw== 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=zVaoIAl3RTJMs/fRqOWbWjKy7Sd89O0F4v/dGT6A9kw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HNnhu/GLTakQ9p/r8Ot2hv74F9o3tFcCh1DA9KqwuYtdH+/F/1gfxE5cW9Dm8rT1fx UxPBkjLSYL3PY3oTTSF/UxvSxFhW/ut6GhPKLNjpHXpneIuWoDUtBVExv6WLNhDWRkQw s4+cye2i0uige0GWXdvU9RgTKR5SkF+7VjKQCZy2sLozEN1UV3v2sNKZXUCWXF8rocXu SUdg2wZ6rsFZrMiS98pwEX77frLhAhmpnEuW7zfD/YhyEHKRaGpMyKlSgbR+0FEhOOFO FduqjFMODuvrBbbXZVmOFK5oeINbLrgyPoSGZdwBLx4jIZ8yYJHFc5ge+VLttIoMyPmc vjmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=SBkVb7LI; 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 l22-20020a170906795600b00a0c3af38c2fsi1649529ejo.229.2023.11.26.12.00.02; Sun, 26 Nov 2023 12:00:03 -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=SBkVb7LI; 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 F0CBC68CF74; Sun, 26 Nov 2023 21:59:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA1A868CF67 for ; Sun, 26 Nov 2023 21:58:50 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-50a6ff9881fso5445573e87.1 for ; Sun, 26 Nov 2023 11:58:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701028730; x=1701633530; 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=IAb3KEQ2ytKMZYTmiBiW6q5rxkfTpwMoskKVs1skQyU=; b=SBkVb7LIeRFsAb7TxzlnaOgoXJBSerqikCyDepl775/ilyysn+pwwiljjQ5ecqL4ts d0BrU+JrwT1ArWUW1nZK6/PP54E1+8Nz6JD54q9Dc7GVQcRJzv5sYwlm05xFpPaQYKiP N++voWmuMXh1MuNOneP6ilz+DRAjxESBJK9S3W/VKb5oJx62pNi0zYW2pczxUem2hRDv iB+xqIS+Nwbb2H10QFKTes0YMw4adT0ej0ztnwowptUv01qrumS07d4CiBVuA8Z4pqhQ vXsRkjgMYVfWQT7Lr0b0gRXeSmHbFfwb/BJ8Pg1fp7Lkhf7DYCIDJk88Wlm4r5My3dle ZKXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701028730; x=1701633530; 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=IAb3KEQ2ytKMZYTmiBiW6q5rxkfTpwMoskKVs1skQyU=; b=dgKvIoSb/qeJktu9z/JiY6REjGuuW8Hfru7Iq6hNo4OaEUf388qsjgIfzl5b1xXnVW rk7BjppxMrTDf7bpJmaBPUzx/RalEf9olEogQhP3bBKAZKLcleT86g3sC0fNdcR0qBBu tlocvP9CS60KAI+/yRv7vQYRAE/hDQeXajHFoj9DdCGqLd3oPw3C4zbYcl/Vejlzuk5c D/MGvKcRDuM39VcLb+/PTpAit9C44Voulc6knj4IM84YyZtRXYhWDf+SGFvlhumd/bQd fFeabcVWXcVTcLetKN7SUejgppOdspXQK+mUhqEl74IjL3Opd1/3h2pik7zi9miCMhSr eKdA== X-Gm-Message-State: AOJu0YxwZepBOwH1J3u3lVmcZIBnt/XjuLT7uDXYRYYfHz0J0IEl74x1 ZPfn6tmR55yVhlD3S+Emy/WsoRYIlfs= X-Received: by 2002:ac2:55a5:0:b0:507:9b70:1f0e with SMTP id y5-20020ac255a5000000b005079b701f0emr5245568lfg.24.1701028729846; Sun, 26 Nov 2023 11:58:49 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k16-20020ac24f10000000b00500d1a72734sm1281833lfr.130.2023.11.26.11.58.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 11:58:49 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Nov 2023 21:58:26 +0200 Message-ID: <20231126195838.392467-8-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231126195838.392467-1-jeebjp@gmail.com> References: <20231126195838.392467-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 07/14] 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: MLCRw4MMbBxM --- libavutil/frame.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 16 +++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 9ac3db430f..e42d9cb758 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -110,6 +110,24 @@ static void remove_side_data(AVFrameSideData ***sd, int *nb_side_data, } } +static void remove_side_data_by_entry(AVFrameSideData ***sd, + int *nb_side_data, + const AVFrameSideData *target) +{ + for (int i = *nb_side_data - 1; i >= 0; i--) { + AVFrameSideData *entry = ((*sd)[i]); + if (entry != target) + continue; + + free_side_data(&entry); + + ((*sd)[i]) = ((*sd)[*nb_side_data - 1]); + (*nb_side_data)--; + + return; + } +} + AVFrame *av_frame_alloc(void) { AVFrame *frame = av_malloc(sizeof(*frame)); @@ -879,6 +897,38 @@ AVFrameSideData *av_frame_side_data_set_new_entry(AVFrameSideDataSet *set, return ret; } +int av_frame_side_data_set_entry_from_sd(AVFrameSideDataSet *dst, + const AVFrameSideData *src, + unsigned int flags) +{ + if (!dst || !src) + 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(&dst->sd, &dst->nb_sd, src->type); + + sd_dst = add_side_data_to_set_from_buf(dst, 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(&dst->sd, &dst->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 093a76e30d..9295c868ef 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1085,6 +1085,22 @@ AVFrameSideData *av_frame_side_data_set_new_entry(AVFrameSideDataSet *set, size_t size, unsigned int flags); +/** + * Add a new side data entry to a set based on existing side data. + * + * @param dst a set to which the side data should be added + * @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_set_entry_from_sd(AVFrameSideDataSet *dst, + const AVFrameSideData *src, + unsigned int flags); + /** * @} */