From patchwork Thu Jan 13 02:09:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33541 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp47618iog; Wed, 12 Jan 2022 18:54:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0ts8fkJQ29AgOnA2UMcNy0oL3gOFZHTat41L6cRcPQHO7wLr0gnHGzllBXj+CIAIF9rB3 X-Received: by 2002:a05:6402:2787:: with SMTP id b7mr2392506ede.162.1642042440402; Wed, 12 Jan 2022 18:54:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642042440; cv=none; d=google.com; s=arc-20160816; b=cquBw9oUh6ozAcLdS5AyFEYbxz3KVDHdGf+CzO7XvAvBM/YkHuxBI9A5VMbr1ChugV hwUDDkIt8LasLeZ59k6YhdvQVTpm/Ma01LwxxRmG7RxLXiGXjLvSJbHBEFazmOJb/PWf uyHZgIIG3bTxxwys5zK8dKYqwtXgcWMoHwC81wBbQmy7W+Ipxfajn913xgRUTRNvHby1 +gJx2VosvZkBuzYEkay8g0UusFGyqMAA/Uh/3+FJOGavbT7JoRrtldlvCS+1HKvXmhJE xrBNUsFEMADvIq1AFWh7MbPeG1siRsDu36NepHZc3UPlugX1WkLzinyQ7j8ICbihe5oF sKGg== 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=+qUpYmYsCPZfxhmDHkhncVXOQPzNYSM0YyMssi/wNFs=; b=WvZJw5bsJNPiuC09GzIeKS1A27v2BkVdTyVkl/ynTGJqqc1kQFBQWEgEz1c9DLMaqR vPYQLZjKSw/eWsKPHLmnaKz1170L3G8GFJYFYFh9hKiRCg4D0pxKO8OOoQZHygH+pIcG AHM3VUHuwTkikOfDgudC/YWsuDwuYuxAtdGR9EsCMTTKy6GdYdyWLoekKvPU2eK8Ru1g gcQgvZb7KSsFgcuwFHG7/Nb21kP6Zv8yQbyfZ+ri51MUtsOW+Ns+79gTo/sOQh7Fqq21 ndlOUUJD9Jz7mKkvAh+7HZmcxM9GBLOQGbjD46tglLYTw4uVt2huf3+Bnqlxmtr9ug7n I4pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HencLT8Q; 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 jg16si791423ejc.74.2022.01.12.18.54.00; Wed, 12 Jan 2022 18:54:00 -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=HencLT8Q; 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 B942468BACE; Thu, 13 Jan 2022 04:09:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A086E68BAB3 for ; Thu, 13 Jan 2022 04:09:44 +0200 (EET) Received: by mail-qk1-f175.google.com with SMTP id 193so4896282qkh.13 for ; Wed, 12 Jan 2022 18:09:44 -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=6izMkkDTDt+RiTuuWxI8KKpOmDWEG36v4TGqUQrMmak=; b=HencLT8Q9R2NonppA7/sszUbnp8Ty4ywwEs4PzVGoEjxQ52w8HJPeS7bPjv4lK10Mg Low3d2/ieIBQP849QzOh7kiCeuaJcbFsF6K6HsY4jm3dNvcx+oT+3keB3YUgVgWNWm16 mebaKjmrquiFOOSp1kMn3En5ydea7Jfto35uzZG91f18+i2K/Wv1ojG4hYe2RCpvxbW/ bClEHpM3OQrFyRkr4vt7mLdmMdDanRaJNUkOLMfu1rGFMlfHeMjEmYm/GPNy+jK9oqJ8 kPjy6zoBaY2v8xGjPDI82lZvnGS2GM8NbYYKZcbBCo/f/226GckUS4Flv1kIlcOI6wvk o+0w== 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=6izMkkDTDt+RiTuuWxI8KKpOmDWEG36v4TGqUQrMmak=; b=pKmK3zvqxBodg0WaWydFXi48BvuzHqh0oYbUY9CnwMaZvyv7JC8ffIqbeRBIWP/icN HsXfCfUUWNLQn98SO4K0i4CpQwSjHBr/NPBjaMIr203Yg81uRcWGrrC3W6L1UapTk4gS voH4YANyRrffTVExgQ7IQVwGxnhRG4SepOChKJDQJhdzhqU03pembUNXhOKtY3Wht/Gc jWAxRI9Pqu4DJ58JXSlJClPWonvIwwHUrzgQqXUjjeVBKR/Dq/+N1L+ZfTxHcbeREink 70jLw3FKTzDgIx+INbPbY75TQVzbZaCeZSp51aXlyYsa2b47SsbKfAW/bfn3WYHDse9v JZpA== X-Gm-Message-State: AOAM533XNIH6JZFuk24AcStwnolS7NKOem92YIH5i9mEeHMeFPd2nBEm C1E+1e2ivjHdGHFD+cpXWAL92VrWHA4= X-Received: by 2002:a05:620a:240f:: with SMTP id d15mr1861415qkn.370.1642039782919; Wed, 12 Jan 2022 18:09:42 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u6sm1068031qko.83.2022.01.12.18.09.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:09:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:09:13 -0300 Message-Id: <20220113020913.870-12-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 281/281] 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: BTeBepCiFeah 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 e307df8e3c..d6d287262d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7193,6 +7193,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 }, @@ -7292,6 +7386,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 } };