From patchwork Sun Nov 26 19:58:27 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: 44815 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp2880100pzb; Sun, 26 Nov 2023 12:00:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IECz6HNxYxcZ0GZlDGDjrgqnuN939qj8qT31hQ7rxai1LEPDD3GUDPLA2Mj3YAxp2GUy1Bq X-Received: by 2002:a05:6402:345:b0:54a:f72d:38ba with SMTP id r5-20020a056402034500b0054af72d38bamr6275573edw.9.1701028812107; Sun, 26 Nov 2023 12:00:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701028812; cv=none; d=google.com; s=arc-20160816; b=KRgC1jX7fsCFlqswxtC0H6Owsj03nt24MYYwZRgwzH7ujeuiLMszoeNvbCdeEDSJre 38P+sgHveRYq7nWA7pKGZmbCjRMoxugavKzdGjEKTCmIqjOOQIUNFQbBQQWNkZXC/2OP THBx83dKJZthwWUvSJ29gpBGaisaQmIyTLip8s8JDktGXN5YhCg4ylHwopOASCnKKj8Q 2F5HlVvwGUYwiQvniHZqc/cdr03pDORcaRMndbqQGQVXUKpjyVCmUZ/M39nZ8l62mcc3 QF4gXfdwLGONi/c0iYlAV144ktXxUv7EhoKj5nsGmMRX8QziXTMI9YSeT4uOfBESlVsJ A4TA== 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=A/N2ham5LYv6TRO3s/kiJ9ncmCiQU94K7C17dgbPtJ4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HxLR4yg5fVB47GZK35XNitJ9H+HurHpMd10OdSH5LYy3A1JKxvK3xl69pzgACy0qFZ JvmFoXiF0pjd14pdjNp+zdtPS41xVd1nSZOZMAcNittOUZvk9ZTSEHnBkw3JcV02qtVd v/AST6cZtfLd5hWQZVqjNHWuCUDd+FV7udlzD+CpP1YbyIIHmRJWDFWH/8y+JvOclVy8 0+NygKv2cP8W6s08ATkfz8woo+/ub9eBFRImv6j+y8xJC9/eXZxnqTBJj2ss7qlVfQFD sT67r6MbXj03Txj5sQYMBvZTzW6ygA22p6ZiDTdKb9YBLsJsqSDHi3FRkqjqpk1hP0T8 xJrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=OqdxGUlg; 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 22-20020a508e16000000b0054b4f63354dsi816635edw.493.2023.11.26.12.00.11; Sun, 26 Nov 2023 12:00:12 -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=OqdxGUlg; 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 EA01168CF6D; Sun, 26 Nov 2023 21:59:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E2CF68CC52 for ; Sun, 26 Nov 2023 21:58:51 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-507a3b8b113so4660301e87.0 for ; Sun, 26 Nov 2023 11:58:51 -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=pVW+jxnfSCMkq8XoYTNyGRPHUvZX7IQXabIPzeH8S2w=; b=OqdxGUlgOuDmsfX+f9Rg/Om5r3eORSUD9CHJyAFaWEBcWp7Vy09ORGlCiyE4oNBkOc R809e6FSd/BOjhp4mCzICVbdK9cfmkDiQjtasR8Mjf10SqNv96wJfR1pIYMwcZ2NvNSV 1vLjfNP38X7nO4H/YpOTRmEdG0EBomKOgOfJ1FPAGRA7LiU0GsA0ldPWKYn2z31aAehj MDMDojcWTAc5OWAndaGMvfE0lz+aXBeJYHlaqdX4AG46OWOJULs2A0mpWph2pUgGbhPJ zh7VL5Ks4UFHc+RqmIx5tmowIpK2B6yQUr7h9GKqTLCvFDJ5HtxrdSKo6LwEO68TMLbn 5ODQ== 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=pVW+jxnfSCMkq8XoYTNyGRPHUvZX7IQXabIPzeH8S2w=; b=sO8MFrikBpN1DjwEinp0Ns0waMwAoCs69l6s9h7qeIm985cY1iOSvwOrjQgoxKotl9 rOjMcfQggdQuTCEwOWVIWHiu3PQXakaNFjhnFeFEF7/IUl0r4ypoWqhhtHZKBvzCyVa6 VtzoHRpgCvCo3XE8CeycHMLw9igzhuGYe3CVCXwM52XQ1riaVRlxxWkRK+9oOlFkU5/i gfjOPXEzhyB99xxJr1wTzTaIM76S4Welp2qgByNeFv0KQzYymnDsyvTcffk5zaAEDd2u 2P0guujCQqU8TfoNBvGejAJKlwtKaHEyA0N9V/zPcuWXALI4Py3z8MiASzTzzNKYhS3V 33rA== X-Gm-Message-State: AOJu0YxSEck1eaKmXT12XlDrloTRlFiuuofTVsJD4ocNxyv9Smsrv31B gUHF8B6Kqf6kPtZPPqk8lDseRRhslS0= X-Received: by 2002:a05:6512:e88:b0:509:46fe:b002 with SMTP id bi8-20020a0565120e8800b0050946feb002mr3856646lfb.5.1701028730302; Sun, 26 Nov 2023 11:58:50 -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:27 +0200 Message-ID: <20231126195838.392467-9-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 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: ieqvW/Grb3XL --- libavutil/frame.c | 22 +++++++++++++++++----- libavutil/frame.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index e42d9cb758..e4004daa4b 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -929,16 +929,28 @@ int av_frame_side_data_set_entry_from_sd(AVFrameSideDataSet *dst, } } -AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, - enum AVFrameSideDataType type) +AVFrameSideData *av_frame_side_data_set_get_entry(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_sd; i++) { + if (set.sd[i]->type == type) + return set.sd[i]; } return NULL; } +AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, + enum AVFrameSideDataType type) +{ + return av_frame_side_data_set_get_entry( + (const AVFrameSideDataSet){ + .sd = frame->side_data, + .nb_sd = frame->nb_side_data + }, + type + ); +} + static int frame_copy_video(AVFrame *dst, const AVFrame *src) { int planes; diff --git a/libavutil/frame.h b/libavutil/frame.h index 9295c868ef..e8517bf6ad 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -1101,6 +1101,18 @@ int av_frame_side_data_set_entry_from_sd(AVFrameSideDataSet *dst, const AVFrameSideData *src, unsigned int flags); +/** + * Get a side data entry of a specific type from a set. + * + * @param set the set from which side data should be queried from + * @param type type of side data to be queried + * + * @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_frame_side_data_set_get_entry(const AVFrameSideDataSet set, + enum AVFrameSideDataType type); + /** * @} */