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 F24B542522 for ; Fri, 18 Mar 2022 01:43:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEC6568B0B4; Fri, 18 Mar 2022 03:43:43 +0200 (EET) Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4043268AE59 for ; Fri, 18 Mar 2022 03:43:37 +0200 (EET) Received: by mail-ot1-f43.google.com with SMTP id o106-20020a9d2273000000b005b21f46878cso4743184ota.3 for ; Thu, 17 Mar 2022 18:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ap4V0rKCs8i7WggInlRdy0R+CG4xk+9WmUghEURKmIo=; b=iFSIFs8eXdQ2NV+Pdn/u5qoxceCmXBm+zmYjOPB9CdrxIjvseYnlbwcLxXBgnOxCRd FJGgRMcemdLTt+EFmsjHdB3oPDWmhzFfIvJadZxIHtqLLOImo7x0i+SFhe4zI1gjeVx3 CSWtpRtLLTE60VHfPvgifmhyVQ26yMw49WxkkOHFqXAgHzkr2KjXvrfTFIH3o3xZK4VH hCyarLyvKZguT6LWIlb6lIxquhnNoDPU7FRBpOz6DAd58koPer6cI3E+Ok0lA+RS/9UY ZxX/xe4WyjolQRy+BY5rC92MnGpQ7d7e2tcLLjdO+nGcJEh1czZxxJDbrNz6dl4YI0UL p7fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ap4V0rKCs8i7WggInlRdy0R+CG4xk+9WmUghEURKmIo=; b=Q5nbXsG0WJ5nPXvSZlF2aJGsjvaBMzh8DQhPS1fOSDt08JAf1C7EM7t+9XySjkABfR X0BVk7l0yxQyeEJQFty3ziRmGEkGBdPTRlCrcJPZKfIx7Ah0MZGA8Hv8fIXI49OPMPpI CSTaXjt3CCcZKnViBUVlHo7J7HePsqY8+4jv1acTbSqamsGNRpAiO2QuQ2uxuWI/2SgI riBpTVS+puNA4L4KD1ufUDXbEcc/I+xJe3XbfBcHEOSzlOLf8oYHIgpvRAuNubJYqHfV mLeeusxl5qB5ZfAelRp01JIwl9dR8X6z7938dpI46X7YN4f47kVS9zcdocha74vsjAqw g4Gg== X-Gm-Message-State: AOAM533iNTGqif3ALyS+c8g4nJgIlurnVfS5qLOzyfUIecfAQMUv39uU kAuKhb2laAcHSkXFvcWYF4eaJqNIDgjBMQ== X-Google-Smtp-Source: ABdhPJzeUFwNdH2NJZBuoEx9b7YpZUjPwcvephOGsB5gqMYB/f7ldI9RYs4eov+9FS/PwHZpV6X95w== X-Received: by 2002:a05:6830:448c:b0:5b2:3552:69c7 with SMTP id r12-20020a056830448c00b005b2355269c7mr2653722otv.79.1647567815377; Thu, 17 Mar 2022 18:43:35 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id q189-20020acaf2c6000000b002da32f2035fsm3117246oih.2.2022.03.17.18.43.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 18:43:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Mar 2022 22:43:15 -0300 Message-Id: <20220318014315.12480-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/opus: always use ambisonic layout for mapping family 2 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: No need to use a Custom layout when the non diegetic channels can be described as a standard mask. Signed-off-by: James Almer --- libavcodec/opus.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 7eccc17e80..3540206347 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -399,21 +399,10 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, goto fail; } + layout.order = AV_CHANNEL_ORDER_AMBISONIC; layout.nb_channels = channels; - if (channels == (ambisonic_order + 1) * (ambisonic_order + 1)) { - layout.order = AV_CHANNEL_ORDER_AMBISONIC; - } else { - layout.order = AV_CHANNEL_ORDER_CUSTOM; - layout.u.map = av_calloc(channels, sizeof(*layout.u.map)); - if (!layout.u.map) { - ret = AVERROR(ENOMEM); - goto fail; - } - for (i = 0; i < channels - 2; i++) - layout.u.map[i].id = AV_CHAN_AMBISONIC_BASE + i; - layout.u.map[channels - 2].id = AV_CHAN_FRONT_LEFT; - layout.u.map[channels - 1].id = AV_CHAN_FRONT_RIGHT; - } + if (channels != ((ambisonic_order + 1) * (ambisonic_order + 1))) + layout.u.mask = AV_CH_LAYOUT_STEREO; } else { layout.order = AV_CHANNEL_ORDER_UNSPEC; layout.nb_channels = channels; -- 2.35.1 _______________________________________________ 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".