From patchwork Tue Jun 7 08:26:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Baykalov <4rusxg@gmail.com> X-Patchwork-Id: 36085 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6732655pzj; Tue, 7 Jun 2022 01:27:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCmHCuMPhtSINpsy//VDnJsrYJFPx/VslrJ3zjB0yWRe8TrSoD2WE632QLrTUKwzEbmV6c X-Received: by 2002:a17:907:7fa9:b0:711:d214:36cd with SMTP id qk41-20020a1709077fa900b00711d21436cdmr7131540ejc.600.1654590440627; Tue, 07 Jun 2022 01:27:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654590440; cv=none; d=google.com; s=arc-20160816; b=g3u2vGeAdBCxy5zjiK30NcDmDXyxhuzOnC3kIcPJFtVXCJ3v8TMGI01OUfnPNK+awm cfwvX3FbEzXRevEQhL56k3WMCqUEqfIZNkHq20vc3kX30TaRWg4+LWrRhjnRSFzwNNc5 KXwxiOmr6g99h4N3oXEoFtCI3LBjUJ/xSh6H1vDEDpXiTH8pQmhj8XoALCt5k+zhrK9H b6QVDjL97rQsRBkMQs5BHVZ32KxG1LqhlIx1gbe/MYnOBbHBf6KRsYfzeMigfQJdtjP8 DygC/x7ACdBhdnd/W/9CqFvYW87xIN93lxflhvdsfnd1EdV7/NybvZpoVlfaJHdQfuRX ThbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=tfzE/wwBYfkGlxfYL2W+Xt2KoNgUdYgZJ3SiW0aaWb4=; b=Q1HksfxiksU27Iyy3UtZJ7Jhog5l8KOsYUFP44PFVHfJUWj4n8Rkr1lKfqV66DJeOd HIPO1QKA6AbddYERqlFo0oKbGubqdw8SXXcJFRvJ7R6mP7UtQhIUWVbTCPX7QDQNS1rr JRC4ep4ELv7YIAUtC/mVeyyuLf3DyBdjWumVnDrSyJnhn1daH7+tK3YJbZyA7sj8HZ5G jAV1UYBkx3wG0V6OnmvCECB7gQpyX7GwHu9kVeM+10jP3qfIzihAV174CmflEJRPCa1D 1lL9RI3ARYvvPqGchsK3pJfX6pG+EsQjEyAdTQMiSCeYxUgfk/un7BZcyBPliEl6PT0v SiyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Bg3Uk/jw"; 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 jz19-20020a170906bb1300b006fed5df74e0si13561938ejb.144.2022.06.07.01.27.18; Tue, 07 Jun 2022 01:27:20 -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=20210112 header.b="Bg3Uk/jw"; 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 DD6B968B619; Tue, 7 Jun 2022 11:27:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51A6B68B4F9 for ; Tue, 7 Jun 2022 11:27:08 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id y29so18335651ljd.7 for ; Tue, 07 Jun 2022 01:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aCNHbshOPF0gtw375m5FYgB/WNhk6FVOYRUt+j/ol88=; b=Bg3Uk/jwv8J7fPjZ3UMqqYzFB4Sp4pBs11YmJNZjYmxS85Cx5VK1VSoArIv7m3Z/hz elNV8Uqbf2RGI8S73rxZTLWH67aXyr7Me3MY84TYvwdcQldx/oK5SoPR7aLJYC2KxKj4 pR93UQXKKx1OdtuAh5mOpY//Dk/sW57KkR/bxg7iuSaHh2uJvupbQ3NNaQ/NK1/NTJTx 6U13nlaYzB8OHsbFIKj2SmXTEtexh/1YrMY+ZyIPHjAcsTWDQdaTAFNg2lsiyhR4NEdM oDG+1CEdHhV7zQEYVijQvvwsPYnqOosevmPKP3m4fz9rt3Fr3QnjZ3ZgDIvKd0qWlV/0 7j9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aCNHbshOPF0gtw375m5FYgB/WNhk6FVOYRUt+j/ol88=; b=Cut+593Oq0ei6Qpf8xtHIDzZINv/jc6ZGvQoVuJN5Xs+Tfshv0u2p/K6RIdSLLJQ9Q FJJb7zFISacNsqVAWJxQsoBI6B+HxGJfZZigkdUmQgkeEmNafjsaarxU/PacEfr7E3Cx UfrmPyFbenceUDP8/L1fuO7C1sMgAZgahs0EvAFIgju4jTQIFHBlobXHATj+LGTFpsu5 8cYOuBvZAlim3dEkbqinyA05EhFz7vhieYFZS0jIqp3REued/0eDDqYDODuwWEjopBu8 b2/sxK5mNdmGUlxbSaLtqUKgYBkuXrfNMbIINcvun1UkuHZm9ClLZoXtBqHVIYriAIcd LA2w== X-Gm-Message-State: AOAM530JdaPlh9UYMFvjJpFu+95r4VmxzRblS+W+ltVuWT0MEGXLFJX0 /DJkeYUVIny50wEXU+QQ7bW/9zkYpds= X-Received: by 2002:a05:651c:14f:b0:255:9762:cf6d with SMTP id c15-20020a05651c014f00b002559762cf6dmr5414714ljd.236.1654590427189; Tue, 07 Jun 2022 01:27:07 -0700 (PDT) Received: from localhost.localdomain ([95.188.97.28]) by smtp.gmail.com with ESMTPSA id h7-20020a0565123c8700b004787c77fcebsm300730lfv.289.2022.06.07.01.27.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Jun 2022 01:27:06 -0700 (PDT) From: Ivan Baykalov <4rusxg@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 15:26:18 +0700 Message-Id: <20220607082618.64814-1-4rusxg@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: read PCM audio configuration box ('pcmC') if available 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 Cc: Ivan Baykalov <4rusxg@gmail.com> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tvdkDHURi2DK For ipcm and fpcm streams, big-endian format is the default, but it can be changed with additional 'pcmC' sub-atom of audio sample description. Details can be found in ISO/IEC 23003-5:2020 Fixes ticket #9763 Fixes ticket #9790 --- libavformat/mov.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index d7be593a86..f71a470d9c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7567,6 +7567,65 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return atom.size; } +static int mov_read_pcmc(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + int version, format_flags, pcm_sample_size; + AVStream *st; + + if (atom.size < 6) { + av_log(c->fc, AV_LOG_ERROR, "Empty pcmC box\n"); + return AVERROR_INVALIDDATA; + } + + version = avio_r8(pb); + if (version) { + av_log(c->fc, AV_LOG_WARNING, "Unsupported pcmC box version %d\n", version); + return 0; + } + + avio_rb24(pb); // flags + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams-1]; + if (!st || !st->codecpar) + return 0; + + format_flags = avio_r8(pb); + if (format_flags == 1) { // indicates little-endian format. If not present, big-endian format is used + if (st->codecpar->codec_tag == MKTAG('i','p','c','m')) { + switch (st->codecpar->codec_id) { + case AV_CODEC_ID_PCM_S16BE: + st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; + break; + case AV_CODEC_ID_PCM_S24BE: + st->codecpar->codec_id = AV_CODEC_ID_PCM_S24LE; + break; + case AV_CODEC_ID_PCM_S32BE: + st->codecpar->codec_id = AV_CODEC_ID_PCM_S32LE; + break; + } + } + else if (st->codecpar->codec_tag == MKTAG('f','p','c','m')) { + switch (st->codecpar->codec_id) { + case AV_CODEC_ID_PCM_F32BE: + st->codecpar->codec_id = AV_CODEC_ID_PCM_F32LE; + break; + case AV_CODEC_ID_PCM_F64BE: + st->codecpar->codec_id = AV_CODEC_ID_PCM_F64LE; + break; + } + } + } + + pcm_sample_size = avio_r8(pb); + if (pcm_sample_size != st->codecpar->bits_per_coded_sample) { + av_log(c->fc, AV_LOG_WARNING, "Unexpected pcmC sample size (%d vs %d)\n", pcm_sample_size, st->codecpar->bits_per_coded_sample); + } + + 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 }, @@ -7670,6 +7729,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('S','A','3','D'), mov_read_SA3D }, /* ambisonic audio box */ { MKTAG('S','A','N','D'), mov_read_SAND }, /* non diegetic audio box */ { MKTAG('i','l','o','c'), mov_read_iloc }, +{ MKTAG('p','c','m','C'), mov_read_pcmc }, /* PCM configuration box */ { 0, NULL } };