From patchwork Thu Jan 13 02:09:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp47548iog; Wed, 12 Jan 2022 18:53:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEtSVvo+BzgGZCjOP8TVG0w84dxBIikHj6lwIIt5pkaEBXdpK+rNUoNz8UJRJRTBwMDmGf X-Received: by 2002:a17:906:150c:: with SMTP id b12mr1962594ejd.284.1642042429663; Wed, 12 Jan 2022 18:53:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642042429; cv=none; d=google.com; s=arc-20160816; b=N9G23fyzqMQnqp/XnH5CNHkSCUYZTuwH+dAmQtMSO4ulf5VFlAUjZ6CSFqGCWOrQLA L4gtEiw1WH3q1kZgQAhbTSJNbLLa3El538xfLHXjR78OQC3XONo6y8iXPwNJxmQTC6bR QHbQjgcwUQPxV3jZzTPibz174umJEU3MPS6PXlKgyG0a1TnzLeyBZgAcAgXJ+DLd/7nx 0HAlwSzE60q/gDRWe5RFiHgtFY2aqxr3avS1moDoOhViOObXu8V10IyrINXZxc3WE3Gs q5SyQJKgV7kmKSbjuw+eIZNKUZRToYnJOKVMUxGDW4jomMFhlbmiYUyaZvHPsWXlMPfd LDpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=pfU0oDObHAP0j4EIyz0kWiVtT7Gkxni2llckN3sm3ys=; b=yQlLLOVGCCJF3Q/75Syz/or5HFS4gxSwBosMJSnQvoL5qPE0rTcrgNaxn8sPfc2N5V uZEzxJeD3ksv0i20tlYtBPZgKizInYlejMi4/faQj8qTAurYLaq9jXGZO1pNw4wCo1sp xA2lQSRpmQwBvtaKnvyAOMIf742y1Abo7uiXcHBti/+36Bf1RNa6EeN8RpvOh2wyWWK0 CCKzJvxQPMDB+zxg3KRM2yswSuxP0hszD4juhS1fOFla6YemEjxvhUpmK3H6vFz3rwJC 8B+Q9fW6ceMxIOtAwDHSRrAKD/zNERRAVULaVlH3edC7ax4yqYHtLuhXl1EolwieUwvV GfIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qc3pYOg6; 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 c12si771418eja.919.2022.01.12.18.53.49; Wed, 12 Jan 2022 18:53:49 -0800 (PST) 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=qc3pYOg6; 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 E31B768B1E6; Thu, 13 Jan 2022 04:09:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F69668BAAD for ; Thu, 13 Jan 2022 04:09:43 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id hu2so5113949qvb.8 for ; Wed, 12 Jan 2022 18:09:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2qglb6oQmYvKmXAgusFSqn2b4VhDbIHSvGzkdmR4Pu4=; b=qc3pYOg6FK0XpOxEr9FzYZnM+3EVsr3lYul8IC4F19E+b8POVePn9YHUR1bYruhRbs cXXKjaimp6N0qrzI3bn8/qyNjHH8ywpZGAWgzEJG+DeZ/r1ZTTHGJdUc+WNKkTsinSYk Dg3ahGdxCNfP4u1ELie9o/NYbwDewGwFfqigvIuZnXR95JPEt3jXxeiClgZOQyfz2IKV IXWqlmnVXYoZWZk1p7LRYGBPt71xK+zHD7N4UnqmeRa6lNgS/fcWr8veSAn5dMBY0z0p ZL8n/iCGLswX3OReM/2k7ODyRUBHTFP1eST+n+/y0VZY5Cd5S0Ppuejv2wm1C3PGXd9S M1Mg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=2qglb6oQmYvKmXAgusFSqn2b4VhDbIHSvGzkdmR4Pu4=; b=4FX+foBCo5Len9Q2sHM2+Q4QT8KTAizPLSEgxIY/XOjKHAkWZA6uIs/dqxRY3sM3gr col2ev86b56bu7J2TpOz/P+udbJXm3gDv9dMF8tZsh3/k3Ox1/EKf9vmRsRnvpCG/k8d KIy6GBgXeVF3ZN7Hc/k9JhEyn6YIaFINRnOpDzk3B/UDUxnmG7df6vzvP3TsxDt+CkJP EpZ92bP0EV2FQty7i9JREIFXnaJ0ZsuC6KMdDjkshYbWqfUZrYKe/84XDLqlgdlLu+hi 1E2oF3tKRtgEXzSJlUierDKNQTPBAhKP6y6UYSsXVlUfv0UMRWAcrdEo/rJjAZJYS28G 7lGA== X-Gm-Message-State: AOAM531K1zRKhpBjmWeCGs09PHA6vg/prymiRKbsb1gHgElu4Z0giVPw 9OOin/k1/80LOKIsPS6bt5JIZuenZ4Q= X-Received: by 2002:a05:6214:1ccb:: with SMTP id g11mr2145760qvd.97.1642039781720; Wed, 12 Jan 2022 18:09:41 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u6sm1068031qko.83.2022.01.12.18.09.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:09:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:09:12 -0300 Message-Id: <20220113020913.870-11-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 280/281] opus: export mapping family 2 (Ambisonic) as Ambisonic 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CwUBZBmE5loA From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/opus.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index c18ff47f71..474ae427aa 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -398,8 +398,22 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, ret = AVERROR_INVALIDDATA; goto fail; } - layout.order = AV_CHANNEL_ORDER_UNSPEC; + 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_mallocz_array(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; + } } else { layout.order = AV_CHANNEL_ORDER_UNSPEC; layout.nb_channels = channels; @@ -450,8 +464,10 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, } } - av_channel_layout_uninit(&avctx->ch_layout); - avctx->ch_layout = layout; + ret = av_channel_layout_copy(&avctx->ch_layout, &layout); + if (ret < 0) + goto fail; + s->nb_streams = streams; s->nb_stereo_streams = stereo_streams;