From patchwork Fri Apr 26 15:51:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 48275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp461569pzb; Fri, 26 Apr 2024 08:51:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWT7SZuOGtKQh8E395TVcu0+EuNrp+Z1V7b9c0VIFvVPLDRASXrW5twPTDmhJpw416UlIUCKI6XlWuXwyDmlhurGbkUIjZ9ujkNdA== X-Google-Smtp-Source: AGHT+IFHXqgesVW3awjG+F30w4BX1L5AaVEZvqwaDYfJ06k45Ey/LzXm2QP2vC4A5Ct5RV1hasUj X-Received: by 2002:a2e:9801:0:b0:2de:9c32:b98b with SMTP id a1-20020a2e9801000000b002de9c32b98bmr1790586ljj.2.1714146695534; Fri, 26 Apr 2024 08:51:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714146695; cv=none; d=google.com; s=arc-20160816; b=dRGvc7+H3V8R9jBhAeyiM+y2o3kVTqgsFA8CgEjqqCX6gZK7FKjsTLmXKR4nO10L2O RRdUpum9at3MWHG/7WgvT50241bn6/gVbKyXj2QA0L3e07HpzvhA+llwlufZPS9Y6PeQ A9b1IoqrDaJmj+ur4XFYPy91KP4GOuPTtTQCKCgYQ+a9tPO7ZB84PXpCDlTEBcTZ11Sp zwdjDBzoQi5Dp77mIO3NjjhPBPWRiDMGVJpG2vRRDuBbjA9z4Y6XSC/fU7u6jPpw/ESE u8QD2C+feaiv+TBZUNFOInfleqWDHSDbJGEAxiSxn3qDXg+znC20iQDuDtegVxkkWHkw IsYw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=Pn4hC+GY6zmFS8DBoXU3hRF/ErYhj5qjtZTo8R+pFyY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=vMix9f1UgS39wWU0DfZtDwnrfnKl4bjp8/7jQns74OEJxbW18O13RLRAfto+z4KW9g ruS6J4JGYJk4ARowS5Tw8VxGKCUHJ1rNmwNQmMNHeUU4RONTnsiWgOSpGWWJQiho9Kh3 ULTYbE2m0DCHffVlkuZZ14AZm9sqE9kqAHxqRNAthnGtMktsUGODm+00VhBE2AZeah2V ddR7j9wv62+9FJLVeehzOD+0y0BDjUO5fZhjyxTm04AxYrsiDAvEyfQ0/3etZTBsIPHg LFmT4u1EQAjCuTu8ZbDfULxO8L6GbeFm3KA0pb1rclXWjUjZWGQfNINPKqiwlXr+pV08 K7Gg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=MsNXuZwb; 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 h26-20020a2e901a000000b002d40e6dab63si5402479ljg.494.2024.04.26.08.51.35; Fri, 26 Apr 2024 08:51:35 -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=20230601 header.b=MsNXuZwb; 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 F190F68D3D1; Fri, 26 Apr 2024 18:51:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBB4868D234 for ; Fri, 26 Apr 2024 18:51:22 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1e51398cc4eso21256665ad.2 for ; Fri, 26 Apr 2024 08:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714146679; x=1714751479; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=XPUiLCpVaKuI8DTaKE+1yoLDUSucHftEj/NAHGnwiO4=; b=MsNXuZwbLro7dJG8B+dxMtHaUyUu8k8VY1Nofix53jltt+b49KZHBeYkiTtj3Q18+T EJlTPZJIDw7ILyCZR6hQVkuDY0jMUtIeT/q0InHRu/mJn8j+WvNpJG+OlirMAQhaltHX Bx15VVuSnzE+HL+wrxpOOpPWFxrupzIvLeMxPDnOtXLQvaNHFrvZmr8puqkqzYFGLtvu kHjk0DdRP1BgcJw8IZGameGCnH814Bj6RUkDW0k/QiQVjaf91ZMqGGJu1Q4pivJPzRia T2lLJdnw0zKexX5dMfc6UUuZ6ZsUS6aaWmWD6ov2LTAGGQQ1Jxi4PhyB3uPu2UVBMsG7 kj9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714146679; x=1714751479; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XPUiLCpVaKuI8DTaKE+1yoLDUSucHftEj/NAHGnwiO4=; b=hqaX0p65AP45pbsIc/Huof8+qGhpbZJLDJd4SERNh+g/peciaObjg0EI2gInpYYWQn Tyy6LkXaSvJU06bxtfKolvLSmcSwvrWci7MJyEwYBA/TUdYyKey5PTApjTGgvypXvCiU d+BKNV4SE6jfJdqD3mUQaQSBbcNd8/GYsRk41rp+/etw3ckRHzGwQlzZkSgLUWkHRmh6 zwjvANY/uMi53EkwvGNGaKUPYuBLZUYIwMkBSYF7B03DTU4W8uM+q8ujrVFUcC2VIyMb m9gRPo28q79sejspni5PfEcCONUQHsiagOyrU91owjyZx8RCW3xPa296Gr5fcsWN7jKE h0pg== X-Gm-Message-State: AOJu0Yy74fIW0IjYX3h3PFv+GPznS+SwREfdIqxeLpaSbIR08qV/ckBo 7QvXTUVSwL3aGK7SnzIV3FZtxy4+KU7qFVKmR8hSQck/y8ONXcDssAeIQg== X-Received: by 2002:a17:903:181:b0:1e7:b7b7:7b44 with SMTP id z1-20020a170903018100b001e7b7b77b44mr4630835plg.15.1714146679291; Fri, 26 Apr 2024 08:51:19 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id k17-20020a170902c41100b001e00285b727sm15649331plk.294.2024.04.26.08.51.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Apr 2024 08:51:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Apr 2024 12:51:03 -0300 Message-ID: <20240426155104.599-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: support SpatialAudioBox ambisonic layouts with arbitrary channel mapping 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: efpc8zEWRh7n We can safely export custom channels layout now, so there's no reason to reject valid layouts defined in this box. Signed-off-by: James Almer --- Untested. libavformat/mov.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index ecd29a7d08..d0ee6201a5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7925,7 +7925,8 @@ cleanup: static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; - int i, version, type; + AVChannelLayout ch_layout = { 0 }; + int ret, i, version, type; int ambisonic_order, channel_order, normalization, channel_count; if (c->fc->nb_streams < 1) @@ -7975,17 +7976,29 @@ static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } + ret = av_channel_layout_custom_init(&ch_layout, channel_count); + if (ret < 0) + return ret; + for (i = 0; i < channel_count; i++) { - if (i != avio_rb32(pb)) { - av_log(c->fc, AV_LOG_WARNING, - "Ambisonic channel reordering is not supported\n"); + unsigned channel = avio_rb32(pb); + + if (channel >= channel_count || + channel > INT_MAX - AV_CHAN_AMBISONIC_BASE) { + av_log(c->fc, AV_LOG_ERROR, "Invalid channel index (%d / %d)\n", + channel, ambisonic_order); + av_channel_layout_uninit(&ch_layout); return 0; } + ch_layout.u.map[i].id = AV_CHAN_AMBISONIC_BASE + channel; } + ret = av_channel_layout_retype(&ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL); + if (ret < 0) + return ret; + av_channel_layout_uninit(&st->codecpar->ch_layout); - st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_AMBISONIC; - st->codecpar->ch_layout.nb_channels = channel_count; + st->codecpar->ch_layout = ch_layout; return 0; }