From patchwork Sun May 26 21:37:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49274 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2920299vqf; Sun, 26 May 2024 14:37:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBbe/2gTYgwPk/p6ENnb8pfscwSQoquLk7DdK0MCrI6ImaJRwzKy+/HrRgTDik3DUjd+RhUiQrcVHHt7v/hq0vpB/wKtvcni/S3Q== X-Google-Smtp-Source: AGHT+IEiSyF8v9yWMR9pZ338ucH0uTEGUzUzqiN7M1jwhSUlr+1w3VbVNKBNIwLn3fmV/KqAfOsg X-Received: by 2002:a17:906:640a:b0:a5a:62c9:bdf3 with SMTP id a640c23a62f3a-a626417a003mr473690066b.1.1716759473296; Sun, 26 May 2024 14:37:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716759473; cv=none; d=google.com; s=arc-20160816; b=x9oi6kv0TNzeVaNzHNOGuu7Uie0VSXuvRYnS0COHiZ3AywdVMLgfORtcZToPDyr+Jg cEa0RWl9KMtolBTg9CqJ1xKm/tViybvOKij9V5NrzC3B2gMc16Q6U8VHyUHwZ4GWeU1C cTyFc4picXKKtxAFBh3/XYB/LomrdJuCVRjs9YlkaTP1GSYWH/hcWCelwb/mzNOeIj+I 34UtU/xZHKVImJzSAG78/O9jLdptbje/3cwLi83n2Nfp8uAJ8UVX7s403WamyRk626H9 DYrtJQta3O4Y66OS7xBdYFsBQtYOIhv9nJ5LLDmPJW3sQUx8vazUMqOSY6Wkxeio3fP0 Nrhw== 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=55ToIjx2d/PEPtGVPU1aSowK+T+tkBYamJALKMgyQ5Y=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=f43KArBTTkb6CUyrfpzM4BObvVn9sgi8kMH6fSQLCdfAVC26jMeXZD+k+KI1V3qZ/m Tq+pdM58wJqTh5vFcVhmfpCBp+W2KENJYLehA0mG8ntAWW9Gamo8PToy1LQd82yG0W+X tLMErhCz5gK+THfbVGLjNDehkNX/KDSISQ5Spx5xjjakwjYYgVRRFtqmN2nQPegd317n rH/IrpInkLE/g3kCN4y+uZZWo9kdAL3pyLbRxd0+F3LUBDGVXV/qMdLn67GUklprTcVs Joa7gFHTES8iA4FJJxDKKR6EiVW0CkHUwHRqHCQNKMaC6inFzk0bbwo7vwJ0onNcOy4Q 7urQ==; 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 a640c23a62f3a-a626cc6769esi316679466b.603.2024.05.26.14.37.52; Sun, 26 May 2024 14:37: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 B2C6468D1FD; Mon, 27 May 2024 00:37:50 +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 0343468D199 for ; Mon, 27 May 2024 00:37:43 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 May 2024 23:37:18 +0200 Message-ID: <20240526213739.67158-1-dev@lynne.ee> X-Mailer: git-send-email 2.43.0.381.gb435a96ce8 In-Reply-To: <467d6a51-fe08-f8df-7d03-7d842ea804d3@passwd.hu> References: <467d6a51-fe08-f8df-7d03-7d842ea804d3@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: KDbXHm/6WCys 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..6625313cc5 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, + AV_CHAN_SIDE_SURROUND_RIGHT, + AV_CHAN_TOP_SURROUND_LEFT, + AV_CHAN_TOP_SURROUND_RIGHT, /** 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 ) /** * @}