From patchwork Sun Sep 25 00:10:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 38225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1390172pzh; Sat, 24 Sep 2022 17:13:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7H9zLYc7b2Yk6h1vpy3nCgED78PnsF3QKRihoT9qPuXS3pZF6y8I5UMibSFD41VRz/ixpB X-Received: by 2002:a05:6402:2693:b0:450:a807:6c91 with SMTP id w19-20020a056402269300b00450a8076c91mr15795168edd.33.1664064781051; Sat, 24 Sep 2022 17:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664064781; cv=none; d=google.com; s=arc-20160816; b=LRQkyS4Dqc9xt8Vsv+pcYn7B4g7kBrGW2VLCBWaWBY+vrgzJEHUjIKLTRzxOTCEzCO fnM3Ons6RAsMfpd16df31KlY0/9FxximpBR4+UPbX11zxmZnXVXdLioGL0+HFJa23jmY GGKXUn7oeqvRGSrSTsUgsfauI3XADY2Hfo9e6lEKc06NsISy5vRmtEv9TibWOzqZtIgg VdbKFlNUkfvNTeJpe/MfI4vqsDt5J0nTaQbSy88dWj1G0ga+v6PYfmG78a5iL/3TlFN7 j9rqELA1scDWc7NJUFvyVYIpTYEDIf7FGZcCV2sOmgXpphTX2KNSSVbFfT3G58dlmqvG 1Hcg== 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 :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=CrfpLzzzivuw0rnBnJ8/e9OGhGy3Qnu0IL4oC1nUcBc=; b=q9jnTDeLLZe3c9cVUf87oCxQRIhnti8Rw6rxZZ8ssXukLV1qRLQ3MD/BJNmllNb5dE JMA0kXisiiKv0ep5qt4cg9XUlNzHOjfHCTXtLYYyJewgufSSgt4Gp4l83YZ9s2JrOVbe ZYTLLzOFQ3NRoIxkEWxeyhehzXWb/zh0kVi8sDpgVOGE147vQhJSdJYkY0ci2rYszpVa kYFhy8SmhmVdxXjAMG6SVipf7EIJAidFk29vtRklpAayXXD5ogQLmAurCMN1lOeY7nXp kdkbWhX72GzmE/7x8BEQppOi8W90Y6LOtpM4Mzkux4j1YGgmdmJmzTbed7tm3YTWzqpJ 5i/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XlirdkVU; 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 ne35-20020a1709077ba300b007814ff4ce25si12605072ejc.285.2022.09.24.17.13.00; Sat, 24 Sep 2022 17:13:01 -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=20210112 header.b=XlirdkVU; 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 A590C68BB53; Sun, 25 Sep 2022 03:11:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB13668BAF2 for ; Sun, 25 Sep 2022 03:11:49 +0300 (EEST) Received: by mail-ej1-f50.google.com with SMTP id r18so7386886eja.11 for ; Sat, 24 Sep 2022 17:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=HCjpwoSiw4Nt/CTE3iHBuHgQO25NNyXA4qqBzrqTswQ=; b=XlirdkVUDgiveUT7o0UdFKiaPkZ4aj44dFz9XXL7mUkHyYI+ty8y9N4dM5/yIqEGX0 l9inX91uIbHS5WLTwKO912waowakZaXFPwp0gQ5QLZH9hFC41CUCRv1E4LeHm4jAbm+y tQX3GQyYqDcrLUoMARn05OyVCwWpM+cwvY85nXrF9fv8SQuMOTc1HaQmQDig/b9DXTa2 hC0sXmH4fblovyWNgtno6oD4uc+p5ih+ebqU3Ah8/Uwn6PqjGNqT7YzB/l/eygeuEiyA s/hmhDoT+BRUupV43xEf9OiOm2otRaxQrG1sS8AJZqzB0bl1Hyp2eq0QrYT6CDK3q97V FhFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=HCjpwoSiw4Nt/CTE3iHBuHgQO25NNyXA4qqBzrqTswQ=; b=GY2zXzFNHmD4WxR1CnPdWx52YDZT+8QAJ928OuYo5x8fZrsYinQLKNNHzYziH2zYBU j6iPTLuVaswt1H8K2UVzItx7kiOLFR7mhYMsKE8IMdG1URioPJV09eqD9TBdhzoLG0cF P9q4zhz5BEcnZM0CJFA6EuVLM45qFHnOOa2QdvnB7tSd7YiDoiPKn8wQKYlCDABuIH0j Dknj8N1EsLUeOan+y6JQifMLz4/+G0Y695m5WLdkgiCGvMDIK+lD+82VdlVzHc+paeaC nva/8sLPkU4uWygEDY3K8BGwFj9e95Y/gcRNhINIxUY6U9ieQyt6FJ7ErZ76VRBe8lDt 3sGA== X-Gm-Message-State: ACrzQf1TKriS4mgyXvRCjdTm7vOZxlXM+mLSyojNYTfUYlkFahbiQBR+ tVNxUMldFsaQYrIUtR5Ksbf+fzZMQsw= X-Received: by 2002:a17:906:3a15:b0:73d:80bf:542c with SMTP id z21-20020a1709063a1500b0073d80bf542cmr12969212eje.633.1664064709368; Sat, 24 Sep 2022 17:11:49 -0700 (PDT) Received: from MBP-von-Marvin.citadel.scalie.me (84-112-104-25.cable.dynamic.surfer.at. [84.112.104.25]) by smtp.gmail.com with ESMTPSA id kz3-20020a17090777c300b007812ba2a360sm6208042ejc.149.2022.09.24.17.11.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 17:11:49 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2022 02:10:38 +0200 Message-Id: <20220925001121.37721-12-epirat07@gmail.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20220925001121.37721-1-epirat07@gmail.com> References: <20220922020400.46715-1-epirat07@gmail.com> <20220925001121.37721-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 11/54] avutil/channel_layout: Group pre-defined channel layouts 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 Cc: Marvin Scholz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9asbJiwsSSaZ --- libavutil/channel_layout.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index 52af52390c..6415355662 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -359,6 +359,10 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_MASK(nb, m) \ { .order = AV_CHANNEL_ORDER_NATIVE, .nb_channels = (nb), .u = { .mask = (m) }} +/** + * @name Common pre-defined channel layouts + * @{ + */ #define AV_CHANNEL_LAYOUT_MONO AV_CHANNEL_LAYOUT_MASK(1, AV_CH_LAYOUT_MONO) #define AV_CHANNEL_LAYOUT_STEREO AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO) #define AV_CHANNEL_LAYOUT_2POINT1 AV_CHANNEL_LAYOUT_MASK(3, AV_CH_LAYOUT_2POINT1) @@ -390,6 +394,7 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) #define AV_CHANNEL_LAYOUT_AMBISONIC_FIRST_ORDER \ { .order = AV_CHANNEL_ORDER_AMBISONIC, .nb_channels = 4, .u = { .mask = 0 }} +/** @} */ struct AVBPrint;