From patchwork Fri Mar 31 16:21:59 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: 40955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp851920pzb; Fri, 31 Mar 2023 09:23:19 -0700 (PDT) X-Google-Smtp-Source: AKy350Y4vS0cmo1gmDCbc2C2rp+Y8z0lysxqYF0HDsErbVZTCxq49QoX6jjkS8pJF/ur1ErYR2cK X-Received: by 2002:aa7:d885:0:b0:4fd:2155:74ef with SMTP id u5-20020aa7d885000000b004fd215574efmr27630587edq.19.1680279798952; Fri, 31 Mar 2023 09:23:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680279798; cv=none; d=google.com; s=arc-20160816; b=l/Csq1EXqnEk9rWiiOWK6+/am7LZkqezHANw1L0QJ+yjPtCnt2p9DLZGaKk9CvPszQ tequ5WqL1isiy2c+5KTADQIe7VpclF2VquDR0nDCDnjHyops0wck/vswii6y/tiDbqv7 Av7MyGOR7nJSRjcKyF0RFcm84pnRpMqlF6f0F9/PsFBvBskUdjCqX5TTlMar+jdYrkna ZWUfJmBGEozKRiJNjSvQDiCSYscVAdG5XsMRmuolzQ7mE1ZLedrsZhF1MJ9U8JwWQIi3 WvY7WIPFhLpI+6wVQJEiKdoluf0C2prKF2CpWXjtlasR5myfInraM8cQesCUHE7ZiGkM HW4g== 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=zI/EybmFY9OwsPa/YURP6y8A1HDRTjMeVC9JGztbjQSV9mESWRajpnkP7thMg3Njss pH7dmmsAX3HGHb9ew8Z7VdSJHVufa6aIiOZH3ctOfJB+PlK+AQwmyqOEwH34I08Inqwa eOK5UhRchEZszSPhPQisxcNIRhmE/9uTTooxoIR9q+seNDirtnd3U8K6DFxFTBTsiCeL 33n5MurWUgQNGIQM297yoiC41w+UleIpQx4Fl6xMkdVvq0gfpPGeAFfwBPYKSrcUdi24 4CFfPg91xzF0Nbns9RGAFrIBoVeq1SY8NrZgulQYhicZkPajLSxaY7yH5bP2bKUtZMDE uCRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dknMA+J8; 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 a3-20020aa7cf03000000b004fb506ae6bfsi2380035edy.247.2023.03.31.09.23.18; Fri, 31 Mar 2023 09:23:18 -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=dknMA+J8; 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 1F7A268C32B; Fri, 31 Mar 2023 19:22:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F76168C2A6 for ; Fri, 31 Mar 2023 19:22:17 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id x20so23602155ljq.9 for ; Fri, 31 Mar 2023 09:22:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680279736; 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=dknMA+J8wrxK1DjVkSqIw1yp8GXVpzSTDSh/+A4b6R05NEqoGQbvDWX1cHhLmBJhaT N/iLE6WK8dYQA+wg5yc/lHXgOgM0SqAE2ErStXrEooNxNPFN69p5hh/oUXl0Ti4t24fd 84AEivpR5CkDgvn+XW4jqCgfW1PVmdpO5xq4hgmKOoVW9rskGovsdIgKX8CH3J9RLIOa hpQThoqH7fjJ5BoEGBy4YUZJK4bnqvBaZbwSg29yV7iZiuoiyQTG4tXKpqEqRfMfnlCr r1/81CCRmaLduE8e9aB7yUmb8n6uHt2Ebx88wjbZDud/z4jevwglnvvI2VKpMvAk/IYm zg0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680279736; 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=sUdnlQwH4mZGsyYUrrQ/61GJ6Ka7hLiem0xX3z8XIU2sKTv+Xcm+a/YuGpNBrUnbAj /yDmlWx+8ojjz14BqkP23IOZFwSRFtM1wqBHB+ksHmBBlbqv/aCweB3p4MmhRYudKSDb B88273DZdmRCJoXmtwetE3orc9ILQZC/0VdesJ83PJAnxkoeOVmuederrUe+jppzv02X AT9ny5c1Vui4E+04zJEzV2Hq2nV+3VAbhomm+kOdIOipqsiSU2DyksVBKNm2V2QyYX4j IJLnprI/RSqznlCzjJQUYbjzUyl9QcsRx/YluOeP2G/tKTdQe/8ZyM2dfwBI/gilpKcB MvjA== X-Gm-Message-State: AAQBX9daa47jfbIvBWhNdHTgcz2KIWSNpK0tJg3syJNY7ICE/D40IUP3 3wxoWDMBAZ7LD/HcKyXRW/1lbfMH5jE= X-Received: by 2002:a2e:88ce:0:b0:2a5:fe8f:b450 with SMTP id a14-20020a2e88ce000000b002a5fe8fb450mr4665461ljk.47.1680279736754; Fri, 31 Mar 2023 09:22:16 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id n20-20020a2e8794000000b0029573844d03sm411483lji.109.2023.03.31.09.22.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 09:22:16 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 19:21:59 +0300 Message-Id: <20230331162205.428735-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331162205.428735-1-jeebjp@gmail.com> References: <20230331162205.428735-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 06/12] 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: 2pPwQv//Ek1x --- 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); + /** * @} */