From patchwork Sun May 29 01:37:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zedong.xzd@gmail.com X-Patchwork-Id: 35977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp1589195pzj; Sat, 28 May 2022 18:38:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBrzsnC+zze+5QbvTDIuZYbcyCBeQciUc5jcvJv0QCaWXcyi+CpeL15774SPINKjzzKBNx X-Received: by 2002:a17:906:7304:b0:6ff:a76:5b09 with SMTP id di4-20020a170906730400b006ff0a765b09mr20576447ejc.193.1653788301523; Sat, 28 May 2022 18:38:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653788301; cv=none; d=google.com; s=arc-20160816; b=TUQP2kSZrgCiLeayMNrDuOx1JSR9JiBeiUElSOxi0NwuoTPGB+kVre2eub8xCU7WQl NByRcEL8D2VEVjGAxnCs5mv4Fqza3PIVdAynArbanxm+2kIp3ohYNtfPBNU3NRQAO0rR 5ZEz+PgSpuspccVrNQIbQ1GrahBzwonHvUb8QALVS2GR4RTl8bjUwiMdBDseYv9KzyRm Q6wGZk+HVckT5VZ5LqCXTSgIYvrcDcK9aH80w/LG7a+E9ijYXVTc9B3HOdt4iBBQ6rRk GPJX5fcyNCNje3df5gsVwk/uk7DfrIAToy0/uffbhgyqV4lGbISOExPsquL51XQhu1Gc hD6w== 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=So7qUs9y2BYhhXRL24a5FOMduouIqzeGGK6hWkWwjuc=; b=Ctw67KhLkxdbcF47xEQIcj16Xa+wTOawqBc1TkOkaKzKqVQyRrIfJslsfr8UIUzI4M L1mLLr8tqlr6rzTCqIJd0stufBSop16bg5TFa5PyTkvQ1B7ZbcoPXS/fdH4hUCITTHQM hkNePF0ZQq5T+FO19oJNF2/k0cViP2qDDL5/Zplf/vcRZXLRJfOOlptJaHgdizCAtPMS 9t513yXkhK1G/o6826Eiinl/wnk0uIeWQk1msGpUG+V4KgzkFPHCNg3N4jtkRk3mTlEJ taWR3zwohxVBmYltVnvksyPqXMDBMsARrITaXGzpCz/Dj6jbbmV+Kam2Ke1Umk/TqkIz 3GIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="NHEGb/Ro"; 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 j21-20020a170906475500b006fe8d7af992si6070765ejs.894.2022.05.28.18.38.20; Sat, 28 May 2022 18:38:21 -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="NHEGb/Ro"; 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 B139A68B57B; Sun, 29 May 2022 04:38:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82F9368B510 for ; Sun, 29 May 2022 04:38:10 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id f21so7595988pfa.3 for ; Sat, 28 May 2022 18:38:10 -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=67PFL5i6SqKaU4XpXiPCaWuaYi6OrMjLFdTBo3odNvc=; b=NHEGb/RoBh5MliVohhfLFFq+fEbyL1MVe4pWpgSRYqvcEhEifJoYNjmMKwqcFCit+z KU+K7VUlNLjzZL9GziFl0b/LYemuqGBe9EbJzGxrU2x+AHhIdC+CkJWEAN98kXQSiEnZ 2/4PaavQCBw3bXs09FjloaBL58421ZFVYy4JNuQ/pnEDq9YfFRsn/uopVeOXF78wc7xt W7AyBq5A1bm20MEABAKZR3wZ+XyVxfnSi0siUdZXn8N+vOCN0rk9csiFYveKJY1eEPOo zQlWgiCvoz3GoT2Trom1qxUtOVZ5v4XvU4mT+Z4aANN/zsFcnh7IkB+SKDEdVgNKZCfa ch8Q== 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=67PFL5i6SqKaU4XpXiPCaWuaYi6OrMjLFdTBo3odNvc=; b=DdnMaZVV3edVd9d3pUno2ro2kt39EA1MU2j7SOY51B+TDui2L3wHiLIuOFWwqBdYzt wQh/eGfdJZsqcxXUYgK9Uw4u6JUFegh5DFCyo1CVan7WovS4RG44Kb+RxyrKeEeon20a LdPOflDVQpBYAYLzg9iPEL6Xhuk3JRJwzxpO2ax6rjxcBmSQb+Mr68sOqSPZHbmd7PXE FAE+x718mUtlULJGlN9FHeL2bXQiWbbvvRkraucnyDxwE31sWJoQhWXGicB9vvl79Ww+ dWOh6s1+IjFEoxwRAvSxRXjEGY0/FETZj962t7sqo1hsfYxK2TWUX1g9ka3qTWmYEU24 KyKQ== X-Gm-Message-State: AOAM5317KmGZ08BkuPMbaWV2cmQHAcO5IVOztbbKksiNNkzFxweSTPGO EH5xbI5j8i6aIRoz94FvhjmHL9ZccFAB661l1s0G3fKA X-Received: by 2002:a63:10d:0:b0:3fa:fdd0:a8d0 with SMTP id 13-20020a63010d000000b003fafdd0a8d0mr14411277pgb.331.1653788288209; Sat, 28 May 2022 18:38:08 -0700 (PDT) Received: from localhost.localdomain ([180.162.86.71]) by smtp.gmail.com with ESMTPSA id g18-20020a170902d5d200b0015edc07dcf3sm5597732plh.21.2022.05.28.18.38.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 May 2022 18:38:07 -0700 (PDT) From: zedong.xzd@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 May 2022 09:37:30 +0800 Message-Id: <20220529013730.30879-1-zedong.xzd@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] avformat/mov: get endian format from pcmC 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: xiong zedong Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gdMge810DFlu From: xiong zedong Signed-off-by: xiong zedong --- libavformat/mov.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index d7be593a86..a3a79679ad 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1552,10 +1552,23 @@ static int mov_read_enda(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; st = c->fc->streams[c->fc->nb_streams-1]; - little_endian = avio_rb16(pb) & 0xFF; + /* ISO/IEC 23003-5 Part 5: Uncompressed audio in MPEG-4 file format */ + if (atom.type == MKTAG('p','c','m','C')) { + avio_r8(pb); /* version */ + avio_rb24(pb); /* flags */ + little_endian = avio_r8(pb) & 0x01; /* format_flags */ + avio_r8(pb); /* PCM_sample_size */ + } else { + little_endian = avio_rb16(pb) & 0xFF; + } + av_log(c->fc, AV_LOG_TRACE, "enda %d\n", little_endian); if (little_endian == 1) { switch (st->codecpar->codec_id) { + /* for 16 bits in pcmC */ + 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; @@ -7584,6 +7597,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('e','d','t','s'), mov_read_default }, { MKTAG('e','l','s','t'), mov_read_elst }, { MKTAG('e','n','d','a'), mov_read_enda }, +{ MKTAG('p','c','m','C'), mov_read_enda }, { MKTAG('f','i','e','l'), mov_read_fiel }, { MKTAG('a','d','r','m'), mov_read_adrm }, { MKTAG('f','t','y','p'), mov_read_ftyp },