From patchwork Thu May 30 02:37:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49382 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:5c1:0:b0:460:55fa:d5ed with SMTP id 184csp31750vqf; Wed, 29 May 2024 19:39:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXGLa67Uplnqi/XU+r1R7Jr2m3/FvW4f6f2a9Z/v+v6nWZDtG2EBi31t9MqbRCjtuFyOlCnLmfnkuernbmxEvbNuGNWYV4dLJz+XQ== X-Google-Smtp-Source: AGHT+IHpkFuouso9+btpcdi8obMjGhjp15216KjC+/XOoPP8XL1/H3ZLYyjdETSaqaXE0Bzb1O2d X-Received: by 2002:a05:600c:1391:b0:418:2ccf:cbc7 with SMTP id 5b1f17b1804b1-42127816092mr10304255e9.2.1717036793822; Wed, 29 May 2024 19:39:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717036793; cv=none; d=google.com; s=arc-20160816; b=SYrZEt9Wn2zxJmdPGk2vA/OkwpkOJcHc6Ef/jzTSsXp/YDu87dqhK2NvwdFhOm5ldV XWzyGEp30GS00DAFmDF427+iYVRC9TmDPycWGfmdT+RyHrFiaxXCU5Melzu/UdmOSJ0y n9jGCYfE6keW8Ij+n2S0dSbuMcQQNteJTb1Y0vF5HX3vQE90hKSceVEtmIuuQwe1YrAi 4kYOgBVGbETx2awNXJLO6agOiwJDP4JcjxSTCE6+2U4NXkSHJkOGBIx8/h+4SCo4q9uc 6idUP+9pXFkUeqzEPMIVbvQW2XKwRZh+YRXG2+seVa6ngl0H0qsjBHfPSm40+M/H9ygv KtPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=Mv5bxxiQc8QvJpr0L5cACbgOAAF22CEWL6dG6Lzzi4k=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=UKRWATy893b0baPwclBsQ6SPcfYTYO9TMwDNbX6d18Tm4X0O+GgrbL0PjgXaWGpDGG qxFBKR6r4a2At32oQXlfBdW2ASXzxuPwQ76mMZsGui6aREFxteFFGy8xfJCTqcxJo8gP Kxf5RZBtDBCXWoDsRY6pupWE40mwr/IkwccWgpbDqD+2cEjxljG/EuyHnfu20xe6CbaN dH4ioMqCkj+u//KOj7sH9w4qkqnD7IzfTHjkmB3MT5qzJFqCRVRL53BPBIx2HGTUjxDh GvzJk3ZpCxy2MX2q9MjlK9AhRSDAtw69wseYDfZGN5Fv7d6Hop6Kv4LUXJLoz+v/AqJq g+aQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57863fa6be3si6097321a12.324.2024.05.29.19.39.53; Wed, 29 May 2024 19:39:53 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DAD368C528; Thu, 30 May 2024 05:39:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D73C68C528 for ; Thu, 30 May 2024 05:39:32 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 04:37:09 +0200 Message-ID: <20240530023927.1205442-2-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 In-Reply-To: <20240530023927.1205442-1-dev@lynne.ee> References: <20240530023927.1205442-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 01/10] channel_layout: add new channel positions supported by xHE-AAC 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: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vdE2A0za9v2x apichanges will be updated upon merging, as well as a version bump. --- libavutil/channel_layout.c | 4 ++++ libavutil/channel_layout.h | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 98839b7250..2d6963b6df 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -75,6 +75,10 @@ static const struct channel_name channel_names[] = { [AV_CHAN_BOTTOM_FRONT_CENTER ] = { "BFC", "bottom front center" }, [AV_CHAN_BOTTOM_FRONT_LEFT ] = { "BFL", "bottom front left" }, [AV_CHAN_BOTTOM_FRONT_RIGHT ] = { "BFR", "bottom front right" }, + [AV_CHAN_SIDE_SURROUND_LEFT ] = { "SSL", "side surround left" }, + [AV_CHAN_SIDE_SURROUND_RIGHT ] = { "SSR", "side surround right" }, + [AV_CHAN_TOP_SURROUND_LEFT ] = { "TTL", "top surround left" }, + [AV_CHAN_TOP_SURROUND_RIGHT ] = { "TTR", "top surround right" }, }; void av_channel_name_bprint(AVBPrint *bp, enum AVChannel channel_id) diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index b26b601065..3a96c2d9b8 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -79,6 +79,10 @@ enum AVChannel { AV_CHAN_BOTTOM_FRONT_CENTER, AV_CHAN_BOTTOM_FRONT_LEFT, AV_CHAN_BOTTOM_FRONT_RIGHT, + AV_CHAN_SIDE_SURROUND_LEFT, ///< +90 degrees, Lss, SiL + AV_CHAN_SIDE_SURROUND_RIGHT, ///< -90 degrees, Rss, SiR + AV_CHAN_TOP_SURROUND_LEFT, ///< +110 degrees, Lvs, TpLS + AV_CHAN_TOP_SURROUND_RIGHT, ///< -110 degrees, Rvs, TpRS /** Channel is empty can be safely skipped. */ AV_CHAN_UNUSED = 0x200, @@ -195,6 +199,10 @@ enum AVChannelOrder { #define AV_CH_BOTTOM_FRONT_CENTER (1ULL << AV_CHAN_BOTTOM_FRONT_CENTER ) #define AV_CH_BOTTOM_FRONT_LEFT (1ULL << AV_CHAN_BOTTOM_FRONT_LEFT ) #define AV_CH_BOTTOM_FRONT_RIGHT (1ULL << AV_CHAN_BOTTOM_FRONT_RIGHT ) +#define AV_CH_SIDE_SURROUND_LEFT (1ULL << AV_CHAN_SIDE_SURROUND_LEFT ) +#define AV_CH_SIDE_SURROUND_RIGHT (1ULL << AV_CHAN_SIDE_SURROUND_RIGHT ) +#define AV_CH_TOP_SURROUND_LEFT (1ULL << AV_CHAN_TOP_SURROUND_LEFT ) +#define AV_CH_TOP_SURROUND_RIGHT (1ULL << AV_CHAN_TOP_SURROUND_RIGHT ) /** * @}