From patchwork Fri Mar 31 16:22:01 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: 40957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp852087pzb; Fri, 31 Mar 2023 09:23:37 -0700 (PDT) X-Google-Smtp-Source: AKy350ZpK/zuFphN5dFsiXF41I2bIiCB3hLQp3ERUN9kSkxDB3hc++3ecbGHqdWZZSDJCDvsKr9D X-Received: by 2002:a17:906:6953:b0:932:e43f:7367 with SMTP id c19-20020a170906695300b00932e43f7367mr25408012ejs.35.1680279817332; Fri, 31 Mar 2023 09:23:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680279817; cv=none; d=google.com; s=arc-20160816; b=tBTLz6afRkhcF9lHaBaXaPP5nknZJUxNKVv6SUHe06sgoe5Yic5CYQvFNgQK7hbFxq eX9bShkCAjn9IK30bR4I+I4cHlnNtHwhYuYora+r2vPUXaB2BKSCkY42MD9/Hstsf0TX Wub/Puat18vGS5xFu0/Zeg0Lffj+lYLCr+eRaIbDLeHMJH1m9lbkZIQy2o84t0rGahaE PSNuI3gJiaz7I/ZTssSA/gtrk9iC9xVUtaEfrmKWapTpoWOz/HDMgKv6zHUgBvBGl4iV LOTeq8CiC/W2EImfyksxqYXlpQMjsyX4mD1T2G7CKMfxDbt28XeST5b09IIhGIZKssti 5DAw== 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=VGYpg74F0Bg1pbHysrdIQEUEjxEKT76BOdDDfC8eduY=; b=NYqrSJvFWGOpiHcrgO2mjHOeE9/8X/89kY4dTE3aEhZoub2AwHrxHPeGCNg+WoM6G1 EoBbsMT3+faUf1NFRWxDaBO+AeFiVgTrAVfWlZQlxxFMTZS9VBoHxbNFBZ0PU9h5LdMR PUYVFB96vwO53iXwPaWtucMPh85GUHPB4ExWZntO9xB84UVZuG4VVQIN3LkrNdk0isab JvOG+J4g1nGrciD0UNWKATl4jNzzv4d+ZbB8FePQKRXoLtWrLnCmpYyfNonKP3n9W4J/ 1zoXOZfALIczI18qKKTzGtby8KEMmw8TRPgBJkg2ofwc4zVfNErvYsh0xVz7c3HPJgnY iJWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=MCoGzTLH; 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 s1-20020a170906168100b0093182033b89si2090908ejd.711.2023.03.31.09.23.36; Fri, 31 Mar 2023 09:23:37 -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=MCoGzTLH; 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 C515068C2F0; Fri, 31 Mar 2023 19:22:32 +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 0DE8A68C2DE for ; Fri, 31 Mar 2023 19:22:18 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id e9so8360097ljq.4 for ; Fri, 31 Mar 2023 09:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680279737; 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=THa7SvoWwJKGXnBPBzDBm193Q7NH1WQMe3d1EqK2UV0=; b=MCoGzTLHrVxikkuI/NWsKfVm6MYAnUVMkWyzVbFtW3OWVQ/nIKSv8jGLdq6s5ttBvN OQjRN3nz1m2bk+qEiC/BYEs1AJYNhfhKAycbd4PeQ8h8c7W40hmIMzNva1zYB6hMaFSV 3S0aqjo9fb1jYYOYp9hM4w4hz2WNM7TLmKYtv4s9ohsocsMdWgOUeMR0oI8UZaT+Wdd5 ykjzJSqe3Xe/rRiqJmlyrNx6P5Z70AkF9MAh3rR4/FqBxab2QYlQx1WzforiqqhDCaJT tzgutuTCqLvF1k5i0+DI+4Sw3GO4wyRFOrppNQ0RmOV7DSBHR9m/8/QBiWdO/3YEwQN0 mySw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680279737; 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=THa7SvoWwJKGXnBPBzDBm193Q7NH1WQMe3d1EqK2UV0=; b=lqAM8mBC6qHAeMkuxC8/zZWUU6AymIXrGyx2BFPdo+A3upgiartJVIahDVyZLUePM5 UGRHSHbKt0XtPJ6V0DCRgXkT+TDmUmMvboLFWZco4SSPzxQO3ltJ7ugodRZA9gC8ckJy FVU9GVHQTHKDusskUnnl2WvUF/epAJvVvZV6CQF4i/OCkeGGrY8TWssPzTIPzzFHFtzE aGBgvtfvoeF2hmpXWdQ0KdCAHGfWlMd0ReAc9PIfvXFZ0tRFT5PyFyNb6Ev+WpHfs+zO X8sBPWxjwyhnp+IkY58L21la6peAZWaWXAx49lb8lvuYSVu7lItE4IVKZIWVF3E8FzDP luxg== X-Gm-Message-State: AAQBX9c+68CbzitgCGTp+xyxbDgVReD/vFhodGn/48/M3cQnFYkY8a8b 7ZP8GwZbx3OcEQoLZqKGlAjDAgWLwDE= X-Received: by 2002:a2e:6a05:0:b0:2a5:f6c0:cb36 with SMTP id f5-20020a2e6a05000000b002a5f6c0cb36mr5221936ljc.7.1680279737488; Fri, 31 Mar 2023 09:22:17 -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.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 09:22:17 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 19:22:01 +0300 Message-Id: <20230331162205.428735-9-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 08/12] avcodec: add private side data set 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: VW9VWYINO8bJ This allows configuring an encoder by using AVFrameSideData. --- libavcodec/avcodec.h | 7 +++++++ libavcodec/options.c | 1 + 2 files changed, 8 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 18ca0e2494..0ba0c390c4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2084,6 +2084,13 @@ 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 + */ + AVFrameSideDataSet side_data_set; } AVCodecContext; /** diff --git a/libavcodec/options.c b/libavcodec/options.c index a9b35ee1c3..b7ea6b6ab5 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -180,6 +180,7 @@ void avcodec_free_context(AVCodecContext **pavctx) av_freep(&avctx->inter_matrix); av_freep(&avctx->rc_override); av_channel_layout_uninit(&avctx->ch_layout); + av_side_data_set_wipe(&avctx->side_data_set); av_freep(pavctx); }