From patchwork Mon Mar 18 21:31:33 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: 47204 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1290021pzb; Mon, 18 Mar 2024 14:33:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhBk8UD5d9fyUHOWBgny0+I79vZAsvEGK8JDn37xJlJnfF4OyCvTg39YHbWRblKOI4oBTamfiykVObhVrwYQuMA+Y/HVmEmYoPUw== X-Google-Smtp-Source: AGHT+IGX961M1cgvCjpU1qh+8C6fLXxQefRS5wcplentXhLlle7eVPBeqX6lb+9aATavUTD7neYV X-Received: by 2002:a17:907:9487:b0:a46:aa0d:a2e0 with SMTP id dm7-20020a170907948700b00a46aa0da2e0mr5638174ejc.3.1710797610292; Mon, 18 Mar 2024 14:33:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710797610; cv=none; d=google.com; s=arc-20160816; b=Y/g3VaTcZ3Qb01xYc1h3eHOnHh/snphDIy59sDrfduRhywsrWK27d2EerxCk5Kkayl 5y004GltLSvFONHtSMfSpsR1KG83OBj5BlsIAn5fUJxD7iR59hSNzynJZaV8j2WS4OBt 4wGI6ONFLxaivsFd+M29cZxcXM4Ja/quVyhRHYWb89/OPO16tnkvjNWivXLatt0bsWVJ 4N1gPpMmXaXtdVcvYrzsojhpUbj0Yq4j9ltOUADxl43DddFDXFfF9dvk3BlJOFRPSuKX I+y0teo9EVqimBslFClqSdrfZsm7nkSZcyxNNud+IRHUu4bqsEuG62n6VECIhFK9dkDs OFXQ== 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=0U+JDdJlVJ2SYERY1ql+7XCfsah3Atb7i7SIeCqnj9E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=GJGSAjcJ0EGhVQg2t97QNTBOhUPWF9kVqfGsskN4pbnDIdyk4XesvUov31dHAfRWXX 2mRQvFej8V9qcPossiRvdXAqcys7KWcRbMvVothYrmMu91SuNHpwQdH+Ji3U1aY9E98N mbWuJsWtINURFaMWNkG3OirAn4wlcWCVwPSSRamrrpZh/grborGQ/rerkBl83b1qH2sU RRJO4jroGbQ8G4yeoobN1qGgJO/PwP6X7h+92i3P3JXq4edKwQ55ZEIHNtiGJy31WsHt DVeAe6xr77aq7mnUucoXDNN6KFW+BZJsd9Tqs/JNant+vQJOi+D/314+LZq+vuaCkCCN DX1w==; 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=ivDNWJqr; 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 p5-20020a170906b20500b00a466b2834f2si4751976ejz.993.2024.03.18.14.33.29; Mon, 18 Mar 2024 14:33:30 -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=20230601 header.b=ivDNWJqr; 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 40A0D68D3CF; Mon, 18 Mar 2024 23:32:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC11468D395 for ; Mon, 18 Mar 2024 23:31:54 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-513d212f818so5745044e87.2 for ; Mon, 18 Mar 2024 14:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710797514; x=1711402314; 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=971gYcIMOmTAYI3iQnEHYfhWghAyKkO3ynrL2mpZfIc=; b=ivDNWJqro2Uoo7z+Uvr4l7NbiTgzfhkGiW5iPB6lcXJ1qs0w683nS3WfcQhhOL00tw A715sFXb/MeS4WmAYzyN1gScHtMk7YSYPELGYJASxCuClponGlYWdn0aJGMoWcoCCuAz WKVlWxKBqn72jyTMiPdY2HtBlPgFBoRh4BUU+B/b5VeY2olDQpk6GX9gL0L+Ropao7PV pq5ebDkdvyenbzJJabrYm2uSMpm29lx0Y/zUYIEiSdcLKnSflE696l2JIAsaE3zgOIcp J/QHrvDKFeO4dXTIoB1E88EoazensOqUQpU2mjBBsLYTVbbyVnx9BekCZaW2MAKTML9w Ep5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710797514; x=1711402314; 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=971gYcIMOmTAYI3iQnEHYfhWghAyKkO3ynrL2mpZfIc=; b=e5gIABLZOwJ+tKT9n/K3f1ujcgf8vjVb72PPgxX+Q1ojjkDXPO22nTRDC9T89ZPQsG 91NEm4nd2bW/tVljA6vphtinL3GTbjnsuc1dlyVKhdI/MGKLvoSHzZr5GcjCDlXhvXaH q31wFKYXK4839kASGOisWq5xPoc3WI5AtNfNZlvDh7AahBAziHjnH+RSGz6GQzAXOOEU jmTcoQvlPSWoY/pCtdem0jr9SwM/0YBd2tSUiTW0qJ2+gOxKECPpDg3fGlC9p1+g5eHg 05aovvaz4xpYjdLIKcb3lLgc/JSC6fdpMygiAhZnhQzlndp4UoW4zvFA3/8ZYlYGEWKK C4HA== X-Gm-Message-State: AOJu0YzoxfAx/CgSwONF/JcwfOgUnL1VsWQd3pHdA2XkpySlGXQsHpae Pj2ZPQO8nl2K+4Ho8DL/QakocqYeL4wZlma6gbwunAacBlxl4slHhJiJWdEZ X-Received: by 2002:a05:6512:3441:b0:513:d246:6e65 with SMTP id j1-20020a056512344100b00513d2466e65mr7252880lfr.50.1710797513969; Mon, 18 Mar 2024 14:31:53 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c13-20020a056512324d00b00514b5462dc7sm186929lfr.56.2024.03.18.14.31.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 14:31:53 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 23:31:33 +0200 Message-ID: <20240318213141.1376789-11-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318213141.1376789-1-jeebjp@gmail.com> References: <20240318213141.1376789-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 10/14] 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: z0tGrKqli1pk This allows configuring an encoder by using AVFrameSideData. --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 13 +++++++++++++ libavcodec/options.c | 2 ++ libavcodec/version.h | 4 ++-- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 4f906432d5..a025f1df14 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 API changes, most recent first: +2024-03-xx - xxxxxxxxxx - lavc 61.2.100 - avcodec.h + Add AVCodecContext.[nb_]decoded_side_data. + 2024-03-xx - xxxxxxxxxx - lavu 59.3.100 - frame.h Add av_frame_side_data_free(), av_frame_side_data_new(), av_frame_side_data_clone(), av_frame_side_data_get() as well diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 554501aa44..83dc487251 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2062,6 +2062,19 @@ typedef struct AVCodecContext { * Number of entries in side_data_prefer_packet. */ unsigned nb_side_data_prefer_packet; + + /** + * Array containing static side data, such as HDR10 CLL / MDCV structures. + * Side data entries should be allocated by usage of helpers defined in + * libavutil/frame.h. + * + * - encoding: may be set by user before calling avcodec_open2() for + * encoder configuration. Afterwards owned and freed by the + * encoder. + * - decoding: unused + */ + AVFrameSideData **decoded_side_data; + int nb_decoded_side_data; } AVCodecContext; /** diff --git a/libavcodec/options.c b/libavcodec/options.c index dcc67e497a..5169f2e476 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -176,6 +176,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->decoded_side_data, &avctx->nb_decoded_side_data); av_freep(pavctx); } diff --git a/libavcodec/version.h b/libavcodec/version.h index b4616ccc27..0550d7b0d8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 1 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 2 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \