From patchwork Mon Mar 20 23:34:02 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: 40742 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2166213pzb; Mon, 20 Mar 2023 16:35:35 -0700 (PDT) X-Google-Smtp-Source: AK7set+xz62K7NWdoJumPban/9pbWb6H71iIxXLORrzdXN+QHvaQ0lB9oAu1waP24Bt59YtjCWA5 X-Received: by 2002:aa7:d887:0:b0:500:4e0c:2b09 with SMTP id u7-20020aa7d887000000b005004e0c2b09mr1127076edq.7.1679355335244; Mon, 20 Mar 2023 16:35:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679355335; cv=none; d=google.com; s=arc-20160816; b=fdr1sY0oXZFz/IIcDN4nMQXrnAu6vbjTmws0TxvtREi9afqq6yM+3PyPhrBlztWZJ0 /6oFZgh2EyAPpcr91NVI1s25GkkVjqZ07rb5wUPo68e4KcO6K6NQuWjBXhuonnKVn/A/ rPSaNoIkyj+WFWHNRa1cGl6psh29hiCu8FzvuwEGZeUzHoFM7POby6P5rfn+BKLfcUC2 MXZWM7rJHtLYlt0lJYan4kiDGZEYWpBadaHeOYwR4vu+TLgRtHPfyEz5SWjb2Z01KmSG zkp2iDQ+gXsTXYxwKlYu4/F9WqV9LHcH1lvQ6F9ZCakwjUxqNl0/zzWQ8WnYyau1faxu E+/A== 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=nl0a9ujcefWUPm4wrYvtPk31fAYjPa93tT/cn33ruBM=; b=O9Zxz87bemuZT05qLFrGwSQDsAHFtMjt+mtoAIs7b39YptxqEm7Y2vp1zAevMZLFIZ HRb8I4LuNOt7XS+/m3AYr1xI1fcFxqocYGUmdMuIlgx7DAVxvJmJO7Rq9SP6ftJRPzTa BZa2LcyBEfA4FjcVCur6N3OXs0T6XTg0bZJBp3L9g/+1RdIBy7EV3dpwaQqB+s6a9C6o Q6E4ciLjjeO6WBsC6b/+do9umFZLijjyPc392J7O6Vzk/pgFemqd2CAev6hEBTgtZSuD lxP2Wik3cLKrUzctln/VKbXBz984gfLAlTjX2n0Do/awE8cxcaLGAmc5kSauKWtZMM7Z 3n9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=R4Zi5LHS; 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 g12-20020a056402180c00b004ab4beec181si12565522edy.476.2023.03.20.16.35.34; Mon, 20 Mar 2023 16:35:35 -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=20210112 header.b=R4Zi5LHS; 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 EF96268C600; Tue, 21 Mar 2023 01:34:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E24768C430 for ; Tue, 21 Mar 2023 01:34:19 +0200 (EET) Received: by mail-lf1-f50.google.com with SMTP id f18so17016063lfa.3 for ; Mon, 20 Mar 2023 16:34:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679355258; 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=WmBGtDR4WahWX/AOvlMBMBpbmnm77KLt53cdeFx+uKE=; b=R4Zi5LHSXkDn3Qk5OpxfK2lwljQVz87ayMWwS5i+dS0Itg6xPHD9TFhHxvBvkysVcS OBVK1FC/1Xoxs9CCf5cM6By7VG+nourKACDguNfSXvCHfKlog7lRpJdeiV68Ox1imsKC 2hBA0z6fPP4n35efuNfoceJtZs9tHh6gldRR1v5+kq3Sx392yR3fu5vcwbfyHrmzpd6o YChUHHpVI/HBDXyALMP7JW7cfGYN5H7iCcFKhN7KVIjS4fvh2yHlGQGv5fangBU+oned i04CaOxOAmP9w7zbTP3z/uWp7B5CSI1MDufJwyOegXnKZtUFzROsS35UGYw47uq6AGXl 93Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679355258; 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=WmBGtDR4WahWX/AOvlMBMBpbmnm77KLt53cdeFx+uKE=; b=kwAL6Qhud5Rry0bXlOt2wj/UFVLEtm+VxMlC7/6HOizAda69T14CeCLHeDr+TJRhwz V4h7Zvo8UOfjOTNTBcYeLdQ7JzZcrDNavxGpiXBzOKFwR1m5D200LVXWuhOui8EOsRJL 0B/MMJsAyiJZyyIABU8bF9xYWq9F/YdJGQLU3ddEsl4BSPcf3tbR4rNXX88UVc7xaItH O3izYxsCt80PdALRiMiNSuWuZqNXB+cgYF2G+sIPmbzcby2pmp+G9mAtxlsQ8YvKUWjc s4H+naxMBJOhUZ5t4SYPNIpbzl7RE0Zo8zpaga2SzW7SLjl2IzRlPBeLFuJPlk8OcOiS PMfw== X-Gm-Message-State: AO0yUKXOEs7J9TruZSiOXDGViyzanish/iWdycM2D0iXEaDrGNt/5B20 ioYmWDHnLKYt44IPYpTjn6A5z7oTKIY= X-Received: by 2002:ac2:5474:0:b0:4e8:57b1:9498 with SMTP id e20-20020ac25474000000b004e857b19498mr221218lfn.5.1679355258444; Mon, 20 Mar 2023 16:34:18 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j19-20020a19f513000000b004e84b79de9bsm1900701lfb.254.2023.03.20.16.34.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 16:34:18 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 01:34:02 +0200 Message-Id: <20230320233408.134255-9-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320233408.134255-1-jeebjp@gmail.com> References: <20230320233408.134255-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v0 08/14] avutil/frame: add helper for getting side data from 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: H2uR8effJNJT --- libavutil/frame.c | 22 +++++++++++++++++----- libavutil/frame.h | 10 ++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 29e9b631f8..3386cda627 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -720,16 +720,28 @@ AVFrameSideData *av_new_side_data_to_set(AVFrameSideDataSet *set, return ret; } -AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, - enum AVFrameSideDataType type) +AVFrameSideData *av_get_side_data_from_set(const AVFrameSideDataSet set, + enum AVFrameSideDataType type) { - for (int i = 0; i < frame->nb_side_data; i++) { - if (frame->side_data[i]->type == type) - return frame->side_data[i]; + for (int i = 0; i < set.nb_side_data; i++) { + if (set.side_data[i]->type == type) + return set.side_data[i]; } return NULL; } +AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, + enum AVFrameSideDataType type) +{ + return av_get_side_data_from_set( + (const AVFrameSideDataSet){ + .side_data = frame->side_data, + .nb_side_data = frame->nb_side_data + }, + type + ); +} + static int frame_copy_video(AVFrame *dst, const AVFrame *src) { const uint8_t *src_data[4]; diff --git a/libavutil/frame.h b/libavutil/frame.h index 167a8f0ff6..8aa50e3ad8 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1011,6 +1011,16 @@ AVFrameSideData *av_new_side_data_to_set(AVFrameSideDataSet *set, enum AVFrameSideDataType type, size_t size); +/** + * @param set a set to which the side data should be added + * @param type type of the added side data + * + * @return a pointer to the side data of a given type on success, NULL if there + * is no side data with such type in this set. + */ +AVFrameSideData *av_get_side_data_from_set(const AVFrameSideDataSet set, + enum AVFrameSideDataType type); + /** * @} */