From patchwork Tue Feb 27 22:12:11 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: 46606 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:aea4:b0:19e:cdac:8cce with SMTP id do36csp11780pzb; Tue, 27 Feb 2024 14:14:05 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWylQjfJxbhAA4YkHfvhuu9jYHK6A/zrzx0y/vIFz+2luPwhWM6skX8cC73bcATceAjQj14QUgAt4VcZqfurcneO2ej8oTKSfGg3g== X-Google-Smtp-Source: AGHT+IGZfZoodqxQwhWSiV9yaY9WI5ejEULb3z6KGDU39OuBCSSC38aKz1nz64L2eQvVmwcWdxW2 X-Received: by 2002:aa7:c0d6:0:b0:565:e4b7:e784 with SMTP id j22-20020aa7c0d6000000b00565e4b7e784mr4632365edp.40.1709072045099; Tue, 27 Feb 2024 14:14:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709072045; cv=none; d=google.com; s=arc-20160816; b=rPzEI5cg3lt0T7CM7TiOtxsD5op5jc9dSD4q5gEA/FDEt+fzwpg36bWWOzlOEwf1HZ tlcU6HT22sD7CdS5s3wXi4+PHRWiehGGJlM1fCvo/NEvEePUpJK3fiOnSZDddc+pjBlQ qRzmzivS55XJT+HCp/Clvj7jS2DGmPGUGPmCbm9BkPwebBX/jxjpwEyHYV3kxX9vQzR1 FT4aVNOfyAjMVwRvIZcqjmG0qzugHABYBuLLyNbiNIbCKDawrPj6Ga4rF1F96QwnXuSf sESWdQGnqO2YDZXI2niezbwPpNfFYMH5RqROsIZjktAtte4UFvU4U1AXwfXD5XRbHkUF 88VQ== 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=m2I5Ebzs52+rIiI8KihHi1ipRpSl6ZPTRx4p5XmRpps=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HmtczshEydBKt+eWkwkiczIi6KdF9IeB70P5ZmdmN81PfsyWSkqRCuxnvAvjkRA9JF kFaoISJgrbDk+tM+QXR+kgD0bj2F+ptRd2ZxZ1po/AKcXHR40Q1CWQxssbvx7O2DWrcn 6hNKz1IBOh8QWlMzwEBRxCysQsXNqa7s1DgJfHFnwTaymHOX3gRQ5WvP/ZCIr6hgYPYS /BeoVWyWnA0z/WxkOrrnBYq4/wvAZ1yngfkbpTX1g3UbS6qCL2uXimk+3zdMbRz3kKj9 WHvG3o5piOi+SIfO3OBQMo+BjoPWCM1BoHg7ey69ffxWImOXUglrmq2hW+3sPKazLExl VdAg==; 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="kp/1hG1L"; 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 c14-20020a50d64e000000b005664fddf5dbsi441210edj.278.2024.02.27.14.14.04; Tue, 27 Feb 2024 14:14: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="kp/1hG1L"; 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 8F8DB68CDF3; Wed, 28 Feb 2024 00:12:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCE2868CAC9 for ; Wed, 28 Feb 2024 00:12:40 +0200 (EET) Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2d180d6bd32so68830441fa.1 for ; Tue, 27 Feb 2024 14:12:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709071959; x=1709676759; 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=X2Bi+4AI8dKxyKwmzmkmjL5rg1BswwJgZ+zRdZmnPq0=; b=kp/1hG1LjMMqhmygFeHn4q1U0U46Vx+ZrwSK6RJ0hjz4C5u8YPUqclAczRXRK6spqt eQWdkkxW2SvFqfMDOCJ06oQ4drKJ9/Dr9rDTu1YjXLzcuZOizFrZeqkDMJvUkBR4ISpM luuPi6SzXPny0tULItga4Zb8epwIAXOe8/sLUw33E9O7INhpk1Clvr4bD/KgMaOVTAO3 39WEtlyZpgb+YtExfHnZdSiIQ3YABVmvbP3MSw2yWgirYilkHwsB4NsRiQ+Uf506q2is 3h3SoUVjSK0b8eYxb1XhkblaARlDp/sA9pta90kKa77+rbqxpXHN5hEDl8v5P7RfN8AE 5rag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709071959; x=1709676759; 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=X2Bi+4AI8dKxyKwmzmkmjL5rg1BswwJgZ+zRdZmnPq0=; b=LdHK5sHRJf+lDlRElmheH5ZRk2JlOGb0Ri7ESJyCe7G3RndQlwG5ZjEkQfgQSK5P6Y F9A4Vbojd+IC3MP8exPeb2IfEuCWD6iPQHLFMP3lK+iVMiRP77NrZ2Zw8I7gF684p20m 2/n+5d6S3ykhNODe/yLKyIy56NHkuJWrDhu3wg2EaI7AorsO+5u89oOxDdBK7yFSQh/B k3S1pRKS8WPGVeTBkmTJ27IA5tBqXxwIc/RmDmhq3nCHlydJ7pyXYGmiMShqgl+V9I8O TFhgYybVjJ3wRGpvh3GU6e1XsNiP9eTOCgJVGFhVYPkJC68otsiZyB4WpsLYJXNmyuSn IVYg== X-Gm-Message-State: AOJu0Yxx3QwLCCuLZxYRYCqfJrq4UA+HG30kgdVVYxLZ31nQoYVK/JfR +dbOJ5eD3z9t2pNxATCrbXYdIMBEmDKTL6Lf45GdCRUl2CHa8FL2GFFRM4ki X-Received: by 2002:a2e:b0f1:0:b0:2d2:b245:2f9 with SMTP id h17-20020a2eb0f1000000b002d2b24502f9mr671830ljl.36.1709071959141; Tue, 27 Feb 2024 14:12:39 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j9-20020a2e8009000000b002d09bc941e8sm1373564ljg.139.2024.02.27.14.12.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 14:12:38 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 00:12:11 +0200 Message-ID: <20240227221226.1377758-9-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227221226.1377758-1-jeebjp@gmail.com> References: <20240227221226.1377758-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 08/13] avcodec: add frame side data array to AVCodecContext 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: 2e5EBLp8xxJv This allows configuring an encoder by using AVFrameSideData. --- libavcodec/avcodec.h | 8 ++++++++ libavcodec/options.c | 2 ++ 2 files changed, 10 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 43859251cc..411f4caad3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2120,6 +2120,14 @@ typedef struct AVCodecContext { * an error. */ int64_t frame_num; + + /** + * Set containing static side data, such as HDR10 CLL / MDCV structures. + * - encoding: set by user + * - decoding: unused + */ + AVFrameSideData **frame_side_data; + int nb_frame_side_data; } AVCodecContext; /** diff --git a/libavcodec/options.c b/libavcodec/options.c index 928e430ce9..7e39b49b7e 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -181,6 +181,8 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(&avctx->inter_matrix); av_freep(&avctx->rc_override); av_channel_layout_uninit(&avctx->ch_layout); + av_frame_side_data_free( + &avctx->frame_side_data, &avctx->nb_frame_side_data); av_freep(pavctx); }