From patchwork Thu Sep 12 00:59:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 51546 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:14c:b0:48e:c0f8:d0de with SMTP id h12csp776674vqi; Thu, 12 Sep 2024 01:44:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWyeNcaxUpeoBw9i1c2UCRShqGb4WSAqwgMRcUr6917g3BrgOS36P5xpsW/nBw3W0FUkoD8tK47Jp10OcVtkOZH@gmail.com X-Google-Smtp-Source: AGHT+IG21WtwqwI0QtgATwxqQIx1dmZvp1RlcRHJ0a99wVZd199S5AcGLm4PsniveuPdBf6SR7JX X-Received: by 2002:a05:6512:1094:b0:536:5339:35b6 with SMTP id 2adb3069b0e04-5366bb48626mr2421912e87.30.1726130650618; Thu, 12 Sep 2024 01:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726130650; cv=none; d=google.com; s=arc-20240605; b=KfHoClxcusU1k96Ggo0O1kKto8X6wVr499rW5QUSjzcDFEV7MIhWw/MKmejXU2l3Sl nRX8yreBZHv+i6Iw0v0+7+XPNfb6B16E1Z7h2c4aBmAPtavf7UfUVD8hF+feinyCQDT3 ONY6dNSCgJet/I+QU1tW0J/6PGYoS2q64mdFWui0xgg++fY91prq5UUTgvGeha9KvGDt VNSIgIyLfymzUZODtohOG9LcJ3dTYu3e5HKCMAUYIMVlph4PTWPafPeEwUnrSwaeLyvs tENOKySjw81ERMRKB6CEiW9ba2Bf1wGir2QIfewXfCG349Zr2Si8zE3coJKSYceomUR/ wuOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=fgXke5lt4s0j4K9uoQ/Io1CnLRgOikgaOZUf0UA3f2g=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HDFp7o7zMb68eMFK2nUD2vaNe/VEBABSDdjHDszD1tk47XE04Qq5Zlmcqk5EOTbaGn 12VOjCk98unI2hNH/H1/C5bDsyqQzse09vBwTGqqv6jceWeTp86BIh6lFa0pzIFTSfKX h1VGvXHRzeaJC8bcYynZdHlbxcEbEsmy+pijdBpHVLv0ryMnFGOw/gR4Vs0w5UAaynLq Xbyi+oanF9GJxzbsvOYZ382czjqRpqS9OGFC1en7QR+kHYK/157Bz2rW92PYIFLnBKfd 0Sp8ssSpwTqFulyNu9Y6g4mXbY/cH5cqO/y1goTfNkmuclYiJ5DtEFZdaqrW27XIKEiQ EU5A==; 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=cdiWegfb; 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; dara=fail header.i=@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 2adb3069b0e04-5365f8c141esi3508606e87.299.2024.09.12.01.44.10; Thu, 12 Sep 2024 01:44:10 -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=cdiWegfb; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2ADAF68D94F; Thu, 12 Sep 2024 03:59:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACF6768D90B for ; Thu, 12 Sep 2024 03:59:46 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-71923d87be4so235957b3a.0 for ; Wed, 11 Sep 2024 17:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726102784; x=1726707584; 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=Pr6iIwo6ummyN37Axq3AH82Z9Y06C3TozSJ8juIkSI4=; b=cdiWegfbap7JkYzm2OfuutQpCwY0WnEQe72mn3ETjtnYW9VIEpKGuI4DX5pZ1uQzcy RFwPPN170Cyv0w9S5F0HuerncLvKAdYAwKbqV87+UQVQcDFj4BQkAWJa3K8PWgqS9y+O 4oJEN2oj2W0eUD9t5Rmfv/17N9Pv2IsGfoBWqqRLRVN1hC/c2U+Z8cgcbAH7zwcJQ9Yb 6V9xamajjp95hhCHjGsBsHCcS+buFwvCcoC+XSNZuQxesSHZwvBgspFs0RLvNfXgVeyh UAPrFIqMVGd7UJgZ9v+ahlvOuwVIUNQORdpcw+LN7KBdcevQzj2T0xG7e789KvCWHQ4w B6yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726102784; x=1726707584; 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=Pr6iIwo6ummyN37Axq3AH82Z9Y06C3TozSJ8juIkSI4=; b=kMDbSnCqB+Wl/U+Gt4FPjU0q90NLgSG+1520h2m7xtsd41xfv4dzAuZGaDZWAWyEhy LG54aLADFi623y9RokuuogJ37gg4YrZbqsHASvdUnXo/oB69TzIczfaRV8C4kYHxep3L g1jcS1rIFkBKg5Gvn3VUSeEClk9ZiMf0fmWyREA4KRnx8awmy2gGWkXajFh+GFTu7vXd P5KkdRxoE1oRNp4urV8gUd9nPCMWIEuSkMFAkK6Eo8A8/HlOsVgaljtOlg5uhezO0XHb RwP2ti/rvERidEq27/qh97kS83w9q6A07bJopBbXN0i5UvPgLan136XwuzoIYogKWDc4 AYvQ== X-Gm-Message-State: AOJu0Yw7wgqRQ5qabp2HnT+e36voDN+Zh/R9+L+X1C6JoOkm2mTOWX0C dzVyS2iceRXQXIr9u2szgmWjuXTtMmpXjCqQvypbZNRUM9uhFvNnR2jVbA== X-Received: by 2002:a05:6a00:92a8:b0:717:88b6:6b1e with SMTP id d2e1a72fcca58-719261d0a4dmr1380448b3a.18.1726102783853; Wed, 11 Sep 2024 17:59:43 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71908fc8210sm3557769b3a.36.2024.09.11.17.59.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 17:59:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2024 21:59:21 -0300 Message-ID: <20240912005925.10151-7-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240912005925.10151-1-jamrial@gmail.com> References: <20240912005925.10151-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10 v2] avcodec/packet: add an LCEVC enhancement data payload side data type 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: ikCf6KHvIMCB Signed-off-by: James Almer --- No changes since last version. doc/APIchanges | 3 +++ libavcodec/decode.c | 1 + libavcodec/packet.c | 1 + libavcodec/packet.h | 6 ++++++ libavcodec/version.h | 2 +- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index c151041da1..b71ceb010c 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-09-08 - xxxxxxxxxx - lavc 61.15.100 - packet.h + Add AV_PKT_DATA_LCEVC. + 2024-09-08 - xxxxxxxxxx - lavf 61.5.100 - avformat.h Add AVStreamGroupLCEVC Add AV_STREAM_GROUP_PARAMS_LCEVC diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 27dba8a1f3..18ddd28690 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1434,6 +1434,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, { AV_PKT_DATA_SKIP_SAMPLES, AV_FRAME_DATA_SKIP_SAMPLES }, + { AV_PKT_DATA_LCEVC, AV_FRAME_DATA_LCEVC }, }; frame->pts = pkt->pts; diff --git a/libavcodec/packet.c b/libavcodec/packet.c index 032f270777..381001fd65 100644 --- a/libavcodec/packet.c +++ b/libavcodec/packet.c @@ -306,6 +306,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM: return "IAMF Demixing Info Parameter Data"; case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data"; case AV_PKT_DATA_FRAME_CROPPING: return "Frame Cropping"; + case AV_PKT_DATA_LCEVC: return "LCEVC NAL data"; } return NULL; } diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 13667ffa36..0a28010542 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -339,6 +339,12 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_FRAME_CROPPING, + /** + * Raw LCEVC payload data, as a uint8_t array, with NAL emulation + * bytes intact. + */ + AV_PKT_DATA_LCEVC, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may diff --git a/libavcodec/version.h b/libavcodec/version.h index 7531c6c42a..9b8c267529 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 14 +#define LIBAVCODEC_VERSION_MINOR 15 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \