From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 178F347D5E for ; Tue, 24 Oct 2023 00:35:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 740F068CA46; Tue, 24 Oct 2023 03:35:23 +0300 (EEST) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5FDB68CA46 for ; Tue, 24 Oct 2023 03:35:16 +0300 (EEST) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6bd73395bceso2862340b3a.0 for ; Mon, 23 Oct 2023 17:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698107714; x=1698712514; 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=+DrvDxUywktzfIb/RMsCH3/PPxfJmfXP38cFU72zD+M=; b=kwyw80P/O5NvSmy//IRjYnlMbKdkV5GC6RlaDwT+wPEBkFLzOj+TIyK3hWQ/xJ7hN9 goP/QEHpRg5Zja0G5HQ71TYisJFCnRWPeHqz7JJN7qDCGz3bn3zImhXe2tkKtGSsDU6N wrA1QwO0G021CFgTtd5a1UGt3h66/6KZgxCyVfw4L4pJPedYh+ECuuLAS2nEmHv0JcEr K9qtH26E1RIpLsoHf1eHPk6hDEZgG4evbQQjLR5po2r39KPBV9PXnptgZHDnedl1xKyS 4N2s9km6F1P73TQiyPyOwfmEaS7dteTwLg8scQhsG7rhzHRDa+qkHIIwVphPuZCl3T4b Gg5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698107714; x=1698712514; 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=+DrvDxUywktzfIb/RMsCH3/PPxfJmfXP38cFU72zD+M=; b=JZZB42HcW9MDqTRRgYKySW/qccfp6ltulLzxTU504kOpSGiZhCbiaPYKIJtvormOaL pnlXPQp3KTAxozs0Zh4ENoF7ruu/WhpEFArsvL0/QFOxbkpBaKEk2TbsaOLSaeSJb76p y2gCSLZ2p4yYk7vbQHgIaFjKGT4/ABQNRIGQV9of2KKb+1y97E/dsfzMPknFDtOsu5Up oGcgsgVMNk9t0eOrkOJMf8VrVtV6fOA3hIxGr7Tr7clIsEr/5iKAt+MN/iKJEC8B4h7E y0iPSk8EOWCgYnr9VN5KoIXcIXRzN4wKKzeZyhzmZR0DD22tqxgn4lFdSuDce1VeUqUJ MnnQ== X-Gm-Message-State: AOJu0YznVJ8q6OqpKkfF/hhqT69iB7BuBuHVFwKpFpkxujkmL6wQyHGU C3GVEqyUkis5/kkwSK0rooCw4TCNUfE= X-Google-Smtp-Source: AGHT+IEAstZDBEqY/0R5yHKJOeeEMQgTh2ZjuL5ABQwPS6dp54fNcJrh30PyuHVGxgfdR54KIt/OQg== X-Received: by 2002:a05:6a20:da9a:b0:17a:e2b9:77e0 with SMTP id iy26-20020a056a20da9a00b0017ae2b977e0mr1645492pzb.7.1698107714414; Mon, 23 Oct 2023 17:35:14 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y15-20020aa793cf000000b006883561b421sm6675709pff.162.2023.10.23.17.35.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 17:35:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2023 21:33:49 -0300 Message-ID: <20231024003349.8966-3-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231024003349.8966-1-jamrial@gmail.com> References: <20231024003349.8966-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] avutil/channel_layout: add a 7.1.4 channel layout 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Will Wolcott Mapping to ITU-R BS.2051-3 "Sound System J" and ITU-R BS.1196-8 "Channel Configuration 19". Signed-off-by: Will Wolcott Signed-off-by: James Almer --- doc/utils.texi | 2 ++ libavutil/channel_layout.c | 1 + libavutil/channel_layout.h | 2 ++ tests/ref/fate/channel_layout | 1 + 4 files changed, 6 insertions(+) diff --git a/doc/utils.texi b/doc/utils.texi index bd71fb59c4..91e648cfe5 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -721,6 +721,8 @@ FL+FR+FC+BL+BR+BC+SL+SR FL+FR+BL+BR+TFL+TFR+TBL+TBR @item 5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR +@item 7.1.4 +FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR @item hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR @item downmix diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index 621606cd59..f529c4f7d0 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -204,6 +204,7 @@ static const struct channel_layout_name channel_layout_map[] = { { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL }, { "cube", AV_CHANNEL_LAYOUT_CUBE }, { "5.1.4", AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK }, + { "7.1.4", AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK }, { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL }, { "downmix", AV_CHANNEL_LAYOUT_STEREO_DOWNMIX, }, { "22.2", AV_CHANNEL_LAYOUT_22POINT2, }, diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index 49adf33880..1a67890e4d 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -236,6 +236,7 @@ enum AVChannelOrder { #define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) #define AV_CH_LAYOUT_CUBE (AV_CH_LAYOUT_QUAD|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) #define AV_CH_LAYOUT_5POINT1POINT4_BACK (AV_CH_LAYOUT_5POINT1POINT2_BACK|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) +#define AV_CH_LAYOUT_7POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT) #define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) #define AV_CH_LAYOUT_22POINT2 (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT) @@ -405,6 +406,7 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL) #define AV_CHANNEL_LAYOUT_CUBE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_CUBE) #define AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(10, AV_CH_LAYOUT_5POINT1POINT4_BACK) +#define AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT1POINT4_BACK) #define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL) #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO_DOWNMIX) #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) diff --git a/tests/ref/fate/channel_layout b/tests/ref/fate/channel_layout index 194083fb71..f42bea9a0a 100644 --- a/tests/ref/fate/channel_layout +++ b/tests/ref/fate/channel_layout @@ -28,6 +28,7 @@ hexagonal FL+FR+FC+BL+BR+BC octagonal FL+FR+FC+BL+BR+BC+SL+SR cube FL+FR+BL+BR+TFL+TFR+TBL+TBR 5.1.4 FL+FR+FC+LFE+BL+BR+TFL+TFR+TBL+TBR +7.1.4 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR downmix DL+DR 22.2 FL+FR+FC+LFE+BL+BR+FLC+FRC+BC+SL+SR+TC+TFL+TFC+TFR+TBL+TBC+TBR+LFE2+TSL+TSR+BFC+BFL+BFR -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".