From patchwork Mon Jul 25 09:36:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Yan X-Patchwork-Id: 36955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1927168pzb; Mon, 25 Jul 2022 02:37:07 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uw01Elfns1mYlJsBK1pFce13v9g2K5ZBAPiwr42zY24ktO92e/C14W2NSSPXJ48SH5+WJ9 X-Received: by 2002:a05:6402:5108:b0:43b:e395:d2fb with SMTP id m8-20020a056402510800b0043be395d2fbmr9042237edd.260.1658741827356; Mon, 25 Jul 2022 02:37:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658741827; cv=none; d=google.com; s=arc-20160816; b=A07d0umGszlWtlv3DiVoxtVCwMLHIHtMh5ZOSQRPr31FUHsAGZZNPibZBewGKRF92+ rVaFH/xJQRtnLXkXlNmZcqiNVR8DzVICPtHrpfukyl32AfdMA62xPC0Xkgjae0QI1Qip v4U5XsX7YU83Bs51bDArXYNUS9Z3HOJ/Db1flw77p7+DYDt1QwCcu6nt2FEkFa5hnwJt qBqxVfgwIK2PM7YF2ybIiusnYjrBjuODnT5PhuKSah7CGR9aQGUr16gavS9UQtCT88u+ y7BdR8ovxaZ02Nn1E6DYuk3OwkfM3ot+1x7BTZ5PESQYL1IwSWPK60oI75UTwFi7XI7F 6pyw== 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=eGoMNETKVzUyRr6IKWh0ckKVuaUOTS1Adgr71FQrL2I=; b=gqHLMLOQcNYEDmVc2xCoY63coTwxaqkcoNtR/jJowzQAQ25gJ4EPaFZmBvaWouZSKM /0TDN1VSTkaP8nI/kNfnFNhBL8BrHUy2qobdQ6MLVIBksjVYGPSInrBtvyUSfZwTvP1y RUN9Ne90VK1r/ZPuh7anYS33Gm+HjrNE1oJegbhn4uNGVWGxL4r0G10eOxiQonvBLsmq WVYOtRIHRRATrBHOEWFtQRma0jSA9dPQjzvfD8XQxaBlpYBQFghHqjZQOnBiKumfAhfz eJUh0XCtqtHDdAX5nN5VbXayXtbp4B6YzZZWj+viE8mVNuJEXHzoPeZV3jLG23qXLvrL mO7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="CaZ/qjSf"; 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 i19-20020a056402055300b0043ac66b0d92si10599999edx.379.2022.07.25.02.37.06; Mon, 25 Jul 2022 02:37:07 -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="CaZ/qjSf"; 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 6853568B7D3; Mon, 25 Jul 2022 12:37:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25A1B68B5A5 for ; Mon, 25 Jul 2022 12:36:55 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id h132so9871146pgc.10 for ; Mon, 25 Jul 2022 02:36:55 -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=x9GbLsTOngeEG7B73fz3i45abS7GzGi2+3mkKqsuqMc=; b=CaZ/qjSfXMrs1S4etURPMyTfsx/26HHKzteQ5JA4IFH+96cYkc+O1YUz9sWNFmn+Xb tNPScsntTCfU3V1dhGO/CRuw3EHmpjcvpIsxs48qZ4n6gXWQ+B0dBtMJrJpmICm0p8M+ AsTjG3xkTQITIzlliG0/cekachTRExkNGSnQQzYL0bNeCUu3s79N+Jg1DjZ+vH+5bNEX nlGEHM1ZbtMwRa7Imk6Ta3YSYiGcbwqQ/Ce01jxM6Snw63rQVRbZxnp+EdJw/GoHuuPO 6+5o/+/ThvconHLFTZJPwUVXG+yLk6bn0IlMlqlsy6PUPMMJNwI8zDanktqhvStBvaF8 CvaQ== 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=x9GbLsTOngeEG7B73fz3i45abS7GzGi2+3mkKqsuqMc=; b=5a2NG8/PoxK8slGtae8djNdE6zpaS67zJ80LNGOcsElhwA6TISxDp5ZAvBrmQ9UxoO rpWZ6wVxnGLav197mCHdcnvorSbxQ7UvhkekXK7gYl8kq5sEGJyfTOmO9DFD9mk8G0PO Hu8LhVE4gNdkTufQhbRWxDifpERmkMskrV+AkfvvXmHT3uudEzgdbbRFv53DMHHxJEF9 m3Y7mj2y5QJyQ6DcnYIalJFf/Yxau5jfB+M6avJby738zqEZLsOvseKt1S/u0Zp+ZgV/ YTiNi12MrswQtwxTiakAVjUntK8Cfu98TASR70J+5Is750a7Q0D9l5sqywSNdpvLWxNj EVyw== X-Gm-Message-State: AJIora8I7xP+GIs1vDY3Cg8zCDQTh9R0lOzTd3GRxuyxhVq+l6Q99J0i wqgcFraW/uGrOfh95kQbjSeyhITVQ28= X-Received: by 2002:aa7:9519:0:b0:528:c2e0:b7ae with SMTP id b25-20020aa79519000000b00528c2e0b7aemr12046949pfp.39.1658741812955; Mon, 25 Jul 2022 02:36:52 -0700 (PDT) Received: from localhost ([161.81.118.178]) by smtp.gmail.com with UTF8SMTPSA id r13-20020aa7962d000000b0052acb753b8bsm8971915pfg.158.2022.07.25.02.36.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 25 Jul 2022 02:36:52 -0700 (PDT) From: Tom Yan To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jul 2022 17:36:47 +0800 Message-Id: <20220725093647.4417-1-tom.ty89@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/riffdec: fix support for WAVEFORMAT 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: Tom Yan Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: k7mjLNRr+J8H WAVEFORMAT can be used for 16-bit PCM as well. Signed-off-by: Tom Yan --- libavformat/riffdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 3946ecb72f..8289438f08 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -94,7 +94,7 @@ static void parse_waveformatex(AVFormatContext *s, AVIOContext *pb, AVCodecParam int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par, int size, int big_endian) { - int id, channels; + int id, channels = 0; uint64_t bitrate = 0; if (size < 14) { @@ -118,15 +118,15 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, bitrate = avio_rb32(pb) * 8LL; par->block_align = avio_rb16(pb); } - if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */ - par->bits_per_coded_sample = 8; - } else { + if (size >= 16) { /* We're dealing with PCMWAVEFORMAT */ if (!big_endian) { par->bits_per_coded_sample = avio_rl16(pb); } else { par->bits_per_coded_sample = avio_rb16(pb); } - } + } else if (channels && par->sample_rate) { /* We're dealing with WAVEFORMAT */ + par->bits_per_coded_sample = bitrate / channels / par->sample_rate; + } /* Apparently size would be >= 32 if id == 0x0165; see below */ if (id == 0xFFFE) { par->codec_tag = 0; } else {