From patchwork Thu Feb 29 16:42:57 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: 46667 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp720253pzb; Thu, 29 Feb 2024 08:45:06 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUf6VkqpDHEjFBV/CItJ1p3RQFWIhvP+/Tew+kBG4xTe5RjfL3mnjqiYumfcNaiilpPOE+dghtJ0Yfm1ycq1nFV0nYDnwhQgKeBRA== X-Google-Smtp-Source: AGHT+IFkLhJTBNPsKWB4zPe1lCRAXNNTvWk9HT73ZJJ/geYcbQhbJoot4S8NfyEAFRrNDlWmsJoz X-Received: by 2002:a17:906:538e:b0:a43:f4fe:eb01 with SMTP id g14-20020a170906538e00b00a43f4feeb01mr1765130ejo.3.1709225105841; Thu, 29 Feb 2024 08:45:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709225105; cv=none; d=google.com; s=arc-20160816; b=dc2xjgTugxxxQ33QuUEKMUikKY/FVvXQ49CblGWsS02A+F0ERnrLtKn/rmq4t32+lY LAQdTnE+iOhmGj+aKIfpcx5gom8OlpwhgfE4Axx4syAhHG+Btniqg/NKVb8KgU3TPayh /ThoMGHZKebrmGBRFd/nUip7rAfFWDm8VAqpOIZ5sIr6NpwTBboYiXZCgf7E1bmu8D/o RyK89OxFGYx37FpyGlsWTbpTpEYaNNkMb3PyZRKQ/CrE/SU9DUHGpOmj4kpMZOa6hQRV D82LlIMcwMAhXEPEZxKBOXSPzTgTBWZErzq/oiKoLfqP4KBIvAD00C7gpqvNHX2hT66i VkFQ== 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=pG2kANzXbaUeq5bk6+/mCNm4Jur14CRzaQjvQg3y96I=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=FNZ+yEF5kge8evBfEtiq5xoTi3Sar2gljryy8uQbMUMcRBhRYX6B73dKCPd+M1ZXxu HslCUkxo+7/nYjMrfozOakeclVVVLEI/ih5KlzqrnQ0sfHIHRBc1eo8bVe2X4PONevTg 4vAPeVu72LaQzKow2iA+QE+UrHBOAo1cQ1//VVWJuKq4fH7jcefUGAdFBG7bt+Wu6Cai CBkUfuCebwEWeL0TAqBNSlLrV6yTGol8UE3wiRRkf07rleNkmHSRQ2fGlwS2clCWW0Wr +8t5wIAnvJqZ2YtvcWwkLP02LUZ4hkensf1xEtfyFF3ykwKDNqLSQib7GxHNQBVYtBcj h1ag==; 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=UXl9M+pZ; 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 va2-20020a17090711c200b00a444f7c377dsi467370ejb.960.2024.02.29.08.45.05; Thu, 29 Feb 2024 08:45:05 -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=UXl9M+pZ; 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 B436B68D1D9; Thu, 29 Feb 2024 18:43:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4340D68D1DB for ; Thu, 29 Feb 2024 18:43:23 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5131a9b3d5bso1225631e87.0 for ; Thu, 29 Feb 2024 08:43:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709225002; x=1709829802; 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=JqmXQX7DPomx1scXg6FNavJtpmtj0sY50qZx/DDMrds=; b=UXl9M+pZWMNs8Kx3wkhwb8dkDPKfOt7neLJQuqL7JLHgjhA45oGBsAL8egq7NLsvuX Lzq4p58irZLJtHecryjSc3y84yhKEN4DwK4HRf17dOA4L0qnpCC8iIT4DpM86gXBkgpc LhGEcfv+pu7Ivyyan/xGSbSCElKjfFT6yVZNxE3kQtvsUpVdD90ctPWNwMihj69vttIA 8Yumzd9ZSniP5EKXcGVljuXinrhRuSk1w6Yc+8vtmPjbGA/vzAjIxoIdqODw3pTLWW0h SItrwOVBTM1aAcjI+KihIiJRVpjgbVwSNjfGigFDRMUCOgJ7kTZ3U07u6+S4FVZnEbRP ZuFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709225002; x=1709829802; 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=JqmXQX7DPomx1scXg6FNavJtpmtj0sY50qZx/DDMrds=; b=DSQaX4AGbjMWCWoRPv6aguXxdNqjsZEI3pgVimOCYIk9oZs4zAmOO1yW1Zr6fHQ//F ynHUj0FsccLO74KBv0+E8ly5+J9+502TQlcWZJqvnTdN7PIfsb99t1Fcq6/aRCcmCZ6m l6/KedLnbO9RuOEAM0JQB7oCkbtfNHNBzLTSb/2EUaWytDG37CkYV46qyu7GBwBWG/Ep ldrNHRYsDwHOXJPtQpNu5YAZOyZbsLoYM9PmJ4yVvdiSgd1KxVFpyEWNom4uRwpit1UK 3Xreohs0Xkash8QZegV5aQTdVfTrMEUg3zE2Vc67v53Q9HyLqBlDHOep27sgD58JSQ5o kBlA== X-Gm-Message-State: AOJu0YwFjxRrhvYa10syPZQCvsUYhNb1WxlnZepjHIJzNpI3oxCbZjWm W5i1HxMB1P1txr+2XaMUMNPxx5AiggnosilDPVvqmT2PG61x8Bp6VOmSCTKw X-Received: by 2002:a05:6512:3a8a:b0:513:1673:31eb with SMTP id q10-20020a0565123a8a00b00513167331ebmr2565648lfu.58.1709225002459; Thu, 29 Feb 2024 08:43:22 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k6-20020ac24566000000b00513290734cbsm206248lfm.292.2024.02.29.08.43.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 08:43:22 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 18:42:57 +0200 Message-ID: <20240229164307.3535613-11-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240229164307.3535613-1-jeebjp@gmail.com> References: <20240229164307.3535613-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 10/14] avcodec: add helper for configuring AVCodecContext's frame side data 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: jp+K5GOUcIFm This allows API clients that wish to configure multiple entries at a time to do so without writing the looping code themselves. --- libavcodec/avcodec.c | 30 ++++++++++++++++++++++++++++++ libavcodec/avcodec.h | 20 ++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index a13b781996..d3ec41b280 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -720,3 +720,33 @@ int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *fr return ff_decode_receive_frame(avctx, frame); return ff_encode_receive_frame(avctx, frame); } + +int avcodec_configure_side_data(AVCodecContext *avctx, + const AVFrameSideData **sd, const int nb_sd, + unsigned int flags) +{ + if (!avctx) + return AVERROR(EINVAL); + + if (!sd) { + av_frame_side_data_free( + &avctx->frame_side_data, &avctx->nb_frame_side_data); + return 0; + } + + if (nb_sd > 0 && nb_sd == avctx->nb_frame_side_data && + sd == (const AVFrameSideData **)avctx->frame_side_data) + return AVERROR(EINVAL); + + for (int i = 0; i < nb_sd; i++) { + int ret = av_frame_side_data_from_sd( + &avctx->frame_side_data, &avctx->nb_frame_side_data, sd[i], flags); + if (ret < 0) { + av_frame_side_data_free( + &avctx->frame_side_data, &avctx->nb_frame_side_data); + return ret; + } + } + + return 0; +} diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 411f4caad3..3b5ca9c0ef 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3162,6 +3162,26 @@ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size); */ int avcodec_is_open(AVCodecContext *s); +/** + * Add multiple side data entries to an AVCodecContext set in one go, for + * example from an AVFrame. + * + * In case the function fails to add a side data entry, it will clear the + * whole side data set. + * + * @param avctx context to which the side data should be added + * @param sd array of side data to use as input. + * if null, clears out the side data for this context. + * @param nb_sd integer containing the number of entries in the array. + * @param flags Some combination of AV_FRAME_SIDE_DATA_SET_FLAG_* flags, or 0. + * + * @return negative error code on failure, >=0 on success. + * + * @see av_frame_side_data_set_new_entry regarding the flags. + */ +int avcodec_configure_side_data(AVCodecContext *avctx, + const AVFrameSideData **sd, const int nb_sd, + unsigned int flags); /** * @} */