From patchwork Wed Dec 8 01:06:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32128 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7048597iog; Tue, 7 Dec 2021 17:13:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbHFFULRJszr8+q2egTEpeisj41FtGHW+L25KKX8d9mfLExHO3JF3G7Tis/tZrXW0t45Zz X-Received: by 2002:a05:6402:35cc:: with SMTP id z12mr14090263edc.393.1638926013408; Tue, 07 Dec 2021 17:13:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638926013; cv=none; d=google.com; s=arc-20160816; b=aeW8E1z5v+1cK1NtOap2LbGmGEHL0Fq4ZHcztiN2eLMcjrwNzK+rhskYtU4gcRJ3vC mLp/ewo4lNT+SnZUMODrrGUhoNbVm1QNkqDSBzRsxzIRHYCPrOu7lxReI62NYSWKcp9O TZF42+BnSskCuI3KQP7EWcoIS3+nTZZ9bgze0mTLleI7XU6wg0lY68bLOaOi64Rj4a+z nT/8lXQHIX6MSbbJ5lZfrwkbTJZKOl7Aww42KeodHxvf8cymBrJ/VTx3ZeVdUNneQSJl vI+qsdAJpJCm1zhOHALVs0dQyMf9voMZNchMRPdoGpt1LpOv57YOykmDtJID+XrZhTVq U2iQ== 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=ZhZRl/Qkti49edm5ebLazIAEOd3o8ncOlBRCDXoeswg=; b=rath1Z/AxtbRpeTTHPuoOCtBqYHcbeaMSJ92vJMEgnU/R5/94TDEkQac/RuIEZYO2Y H+zXy9IYOZ6ECc8rbJlAuYT5a2NIxH8avSqStQTKBbWiL5nU33UXXoeLexeksb/dKI3K AMFC3QXjan9YgIk36+uoLH7fFV0S/16889DPN8i6wFf9T/1jt+jwJaonShi+q1Rfi2sC w9PRUH/7BsA08OysSpLQ9LQ/LI5GHv2Ia6iuCwDVlTWrjnspJdXFGnnSu4uwECt/qNvf 7m3DJn41Do7uPSo4az+HWOQHYUrqiAzsT/XdmfPb2ObHgjgs7BwD75tkY4szy4qfNV8b PTIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bpB35XZA; 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 v8si1671593ejb.422.2021.12.07.17.13.33; Tue, 07 Dec 2021 17:13:33 -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=bpB35XZA; 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 E3ABC68AFAF; Wed, 8 Dec 2021 03:08:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f45.google.com (mail-ua1-f45.google.com [209.85.222.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8046A68AF67 for ; Wed, 8 Dec 2021 03:08:11 +0200 (EET) Received: by mail-ua1-f45.google.com with SMTP id i6so1904584uae.6 for ; Tue, 07 Dec 2021 17:08:11 -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=f/jOKmLHM0YotEe9tUU8hfnxVKuVPOt44SBECm/M67c=; b=bpB35XZAd4WvVFNC28LYi2KogjFXqgQAhikVxtLeCi5rAkXfw4Ui2aN5h3H87nGGKB uzCknXosWjw+fo6ZYf89Bu0sQ4JGLQKgDUqe68yfyPxHnACaBIqCQGynT+LG3fVooahY we01hLwWSYJnVZkpFCadcCA1y/1RQ9B7iztl261YAzJSpNYHFTf5dANcnlFdPzT1K7KO CEslu/Mqc86rmz8wI+H1K/Sa2r6Y2NPry02IPlgbh1lV1vXBUPl8+97QfBVhRG1ys7va 6/9+93nCfOpCZeN+6AUE7gIA/j+rVV5NFEpr0U3W8nrjdBSXjY34h+QgflPSNo4hLQWx U12w== 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=f/jOKmLHM0YotEe9tUU8hfnxVKuVPOt44SBECm/M67c=; b=YuRGARxCDYQDFnJUIcuJ2Sfy3pP8Mt3ZGAaN5hbz1THG45aA932SuUEOYUygSAZu63 IpPDsyfnWhh7QNcbVYfYGkb3o9VZ4ktax+zN4xbLhGOrdUPPW1MkJKOidBvicx7TQLE4 eiDmssPVOkaPuiYxXIHwy8kYQWF/qCK+hkdJqtOGNVzxWlfPtRhMlwQs+7pioH41GDyY Uf6Hd+2+pTbut+m+YdH6LwyyxwX8sSK/I79hUxhHc/4DfxVM4bot1muQIPhz2mVlnvBg 2P/jKLELzPep2hzXsfiA5UUMb1WFuGbYPfCCWOdSEry/Ni2QsYuPY16G6xhS3M7wcxQY vkSA== X-Gm-Message-State: AOAM530+UfSEf819jZ6nopi0jlxiiZv3xRvFycCk/4UD9aSaycim5FZE tyxVa4xtlPCNDGuYr8XwPoBLQ/Tz2s2+IBQ9 X-Received: by 2002:a67:cd8b:: with SMTP id r11mr49776737vsl.27.1638925690025; Tue, 07 Dec 2021 17:08:10 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.08.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:08:09 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:49 -0300 Message-Id: <20211208010649.381-34-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 279/279] mov: Implement spatial audio support 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: 54r1TMfOavXH From: Vittorio Giovara As defined by Google's Spatial Audio RFC. Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/mov.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index b061659252..9bb126e028 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7223,6 +7223,100 @@ cleanup: return ret; } +static int mov_read_SA3D(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVStream *st; + int i, version, type; + int ambisonic_order, channel_order, normalization, channel_count; + + if (c->fc->nb_streams < 1) + return 0; + + st = c->fc->streams[c->fc->nb_streams - 1]; + + if (atom.size < 16) { + av_log(c->fc, AV_LOG_ERROR, "SA3D audio box too small\n"); + return AVERROR_INVALIDDATA; + } + + version = avio_r8(pb); + if (version) { + av_log(c->fc, AV_LOG_WARNING, "Unsupported SA3D box version %d\n", version); + return 0; + } + + type = avio_r8(pb); + if (type) { + av_log(c->fc, AV_LOG_WARNING, + "Unsupported ambisonic type %d\n", type); + return 0; + } + + ambisonic_order = avio_rb32(pb); + + channel_order = avio_r8(pb); + if (channel_order) { + av_log(c->fc, AV_LOG_WARNING, + "Unsupported channel_order %d\n", channel_order); + return 0; + } + + normalization = avio_r8(pb); + if (normalization) { + av_log(c->fc, AV_LOG_WARNING, + "Unsupported normalization %d\n", normalization); + return 0; + } + + channel_count = avio_rb32(pb); + if (channel_count != (ambisonic_order + 1) * (ambisonic_order + 1)) { + av_log(c->fc, AV_LOG_ERROR, + "Invalid number of channels (%d / %d)\n", + channel_count, ambisonic_order); + return 0; + } + + 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"); + return 0; + } + } + + 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; + + return 0; +} + +static int mov_read_SAND(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVStream *st; + int version; + + if (c->fc->nb_streams < 1) + return 0; + + st = c->fc->streams[c->fc->nb_streams - 1]; + + if (atom.size < 5) { + av_log(c->fc, AV_LOG_ERROR, "Empty SAND audio box\n"); + return AVERROR_INVALIDDATA; + } + + version = avio_r8(pb); + if (version) { + av_log(c->fc, AV_LOG_WARNING, "Unsupported SAND box version %d\n", version); + return 0; + } + + st->disposition |= AV_DISPOSITION_NON_DIEGETIC; + + return 0; +} + static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('A','C','L','R'), mov_read_aclr }, { MKTAG('A','P','R','G'), mov_read_avid }, @@ -7322,6 +7416,8 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('d','v','v','C'), mov_read_dvcc_dvvc }, { MKTAG('d','v','w','C'), mov_read_dvcc_dvvc }, { MKTAG('k','i','n','d'), mov_read_kind }, +{ MKTAG('S','A','3','D'), mov_read_SA3D }, /* ambisonic audio box */ +{ MKTAG('S','A','N','D'), mov_read_SAND }, /* non diegetic audio box */ { 0, NULL } };