From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 778024D680 for ; Tue, 25 Nov 2025 01:25:35 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'A+wG7z2ghRp0PRR+VWWEiXIXIW1HDrtuaEUEuhACm2A=', expected b'rGTalVzDayPIAmAKhG6sKESG0ElllqwcVrRlmbJNWQg=')) header.d=niedermayer.cc header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1764033922; h=date : to : message-id : references : mime-version : in-reply-to : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : from; bh=3O4j7UYAnQdPLyDkOah43BZr2FoUkp1fFw7rdPjUCr0=; b=V3DKZOySEzCL4My1lqmVIYoiBn6rYXhE1DjZ3xpVJ26j6iRkGJtntIsxtXHDly0iJW2Xk DMHIiZ4+nUZELWCCIM3x/A3kLb7FIKJJk6o4vhl91NxyHQkmzQAWaomKnexhumZdgkRjoeA YU+ajpNaRUG094pIz0aAZG7a9MgknHOHRn07/mYsSvsPB7KOD3djXgVJj5uhzws6we3dhjD wwd2pzxjGNEdJAoP/l5Iy7Hjj/K9G3Nj2sURidQLkw+MJSRDScBnAkrB93km5fOnIJTmyay nOmmbi/CD1N+BXECSXDxCs9bISKweeFVQrGg+UCo2DotuaB8RVNVsXpHeh5Q== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 829FE6901D9; Tue, 25 Nov 2025 03:25:22 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1764033906; b=jNo1rWTDx+l57Gt7yD47t3FWExr/z8DP/Agx9gDaq6pHxR3DJm+64gyeq8YfNpZNpFY9F KTKbyDHa2t4fyyiqWGi3LzcFOo9NaEJ8jK+J2Y57RNxjhSZRzBfiaFLkKiBGy5TS06YJo/t cPlsQWOxJhK5HoEz5YHtzzQw+6meuecBUQCOOCpC1qESWiRdbpZJC2khhse2b/62AD8Nh52 Z3H+9X1OIz5XAc3fzu/vVJ7nhuA19emTYdHwaIfEtLMm214DTJ0QeLHwp+lMSFqQLjQOtKo 6TjIpTf9zMdodkl/kogIwsSQGLESOZybGC06R2QHAHfVzI9WohexTcm5Fmzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1764033906; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=A+wG7z2ghRp0PRR+VWWEiXIXIW1HDrtuaEUEuhACm2A=; b=EPOpcdvwhF08wxFsT6bPKhqd7q5heTdV9CXg9wTmfVbtxKFfVKEOIb19qW+WgpSDEcIg6 rD9WSm7qq/JsUtLbqdnOBVj1sKozF02NrHNlNQ0nz+F23T/IkeEZxHH8S7rxS0E81SnXCfr 8MzK3+IKwKD3kQpz4NsU8UFkqfGcLvZEgI7GiYcQlkcLtP8tp3s44q3uopPBztYySGTHO0B 4K0GWKibcDiKJyjZ87L+7BEanUTVDnN0TvBTeD6yPl9w6celelG61gSjcbObnbS4ZxfOHFs WEyyBUaYpKE/Cxjxo/L2xJHSvPJZqB2PTYmuw+ftrq/sKhqZOHref47rS2XA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=niedermayer.cc; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=niedermayer.cc; arc=none (Message is not ARC signed); dmarc=none Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1601C68FE15 for ; Tue, 25 Nov 2025 03:24:54 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 42367201C6 for ; Tue, 25 Nov 2025 01:24:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1764033893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rGTalVzDayPIAmAKhG6sKESG0ElllqwcVrRlmbJNWQg=; b=pSUK0eNIsn6tL60qPAVPQV1mc+1RXLEGP2UyXi+VjApidGHwv6QW9SfHIVeP+NbPUroxn9 KPVqZKpE989oXq0Nrx5gayIvDHBrtaRJEpvUp5cIY+m4fwuxa9shqiaah+PzG3s3S7MtlL 81oL0IalYZUDzOr9sikzM6SPdYDYqBxm8UBEpj6xVSiEkhpGNZqrCBJvRgpc/eYVosLN8J qzUhFMZ1Uval/23st5qAHAmkP54gGq2bmnsq3X7DcTqkERDnN6fD1xWXOk/awz/HM7tTWt vVs/pMW1pm99bF2pPR9eTJMCDkrLur/okLDit3hHN6ts5DBu9pS9IdKQ5WEUJQ== Date: Tue, 25 Nov 2025 02:24:52 +0100 To: FFmpeg development discussions and patches Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-GND-State: clean X-GND-Score: -85 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggddvgedtudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenfghrlhcuvffnffculdduhedmnecujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfpihgvuggvrhhmrgihvghruceomhhitghhrggvlhesnhhivgguvghrmhgrhigvrhdrtggtqeenucggtffrrghtthgvrhhnpeeigeektdejudffjefhteegjedtgeettefggedthfejgfevhfetgeekjedtvdfhveenucfkphepgedurdeiiedrieeirdehtdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeeguddrieeirdeiiedrhedtpdhhvghloheplhhotggrlhhhohhsthdpmhgrihhlfhhrohhmpehmihgthhgrvghlsehnihgvuggvrhhmrgihvghrrdgttgdpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-GND-Sasl: michael@niedermayer.cc Message-ID-Hash: ZSAWD6ZWXA5HSBVQ3DX4QRJZ2DNEUX6C X-Message-ID-Hash: ZSAWD6ZWXA5HSBVQ3DX4QRJZ2DNEUX6C X-MailFrom: SRS0=qj7y=6B=niedermayer.cc=michael@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] Re: [PATCH] Fix WAV bitrate calculation when bits_per_coded_sample != 8 List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michael Niedermayer via ffmpeg-devel Cc: Michael Niedermayer Content-Type: multipart/mixed; boundary="===============2051320522981125914==" Archived-At: List-Archive: List-Post: --===============2051320522981125914== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="fdjw1mCE9xdkNuqN" Content-Disposition: inline --fdjw1mCE9xdkNuqN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 17, 2025 at 02:01:19PM +0100, Erdinc Kaya via ffmpeg-devel wrot= e: > - Correctly scale bitrate by bits_per_coded_sample instead of assuming 8 > bits per byte. > - Prevents wrong bitrate reports for 16-bit PCM WAV files. >=20 > Signed-off-by: Erdinc Kaya > --- > libavformat/riffdec.c | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c > index 30835d5f36..d63edc6377 100644 > --- a/libavformat/riffdec.c > +++ b/libavformat/riffdec.c > @@ -130,6 +130,10 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext > *pb, > par->bits_per_coded_sample =3D avio_rb16(pb); > } > } > + > + if (par->bits_per_coded_sample) > + bitrate *=3D 8.0 / par->bits_per_coded_sample; > + > if (id =3D=3D 0xFFFE) { > par->codec_tag =3D 0; > } else { breaks fate --- ./tests/ref/seek/acodec-adpcm-ms-trellis 2025-11-19 00:07:58.826436074 = +0100 +++ tests/data/fate/seek-acodec-adpcm-ms-trellis 2025-11-25 02:24:33.522013= 997 +0100 @@ -2,52 +2,52 @@ ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos: 29786 size:= 4096 +ret: 0 st: 0 flags:1 dts: 1.888005 pts: 1.888005 pos: 60506 size:= 4096 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos: 13402 size:= 4096 +ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 25690 size:= 4096 ret: 0 st: 0 flags:1 ts:-0.317506 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos: 42074 size:= 4096 +ret: 0 st: 0 flags:1 dts: 2.591995 pts: 2.591995 pos: 83034 size:= 4096 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos: 22618 size:= 4096 +ret: 0 st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 46170 size:= 4096 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos: 6234 size:= 4096 +ret: 0 st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos: 12378 size:= 4096 ret: 0 st: 0 flags:1 ts:-0.740839 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos: 34906 size:= 4096 +ret: 0 st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos: 69722 size:= 4096 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos: 16474 size:= 4096 +ret: 0 st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos: 32858 size:= 4096 ret: 0 st: 0 flags:0 ts:-0.058322 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos: 45146 size:= 4096 +ret: 0 st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos: 90202 size:= 4096 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos: 28762 size:= 4096 +ret: 0 st: 0 flags:1 dts: 1.760000 pts: 1.760000 pos: 56410 size:= 4096 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos: 9306 size:= 4096 +ret: 0 st: 0 flags:1 dts: 0.608005 pts: 0.608005 pos: 19546 size:= 4096 ret: 0 st: 0 flags:0 ts:-0.481655 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos: 37978 size:= 4096 +ret: 0 st: 0 flags:1 dts: 2.400000 pts: 2.400000 pos: 76890 size:= 4096 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos: 21594 size:= 4096 +ret: 0 st: 0 flags:1 dts: 1.311995 pts: 1.311995 pos: 42074 size:= 4096 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos: 3162 size:= 4096 +ret: 0 st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos: 6234 size:= 4096 ret: 0 st: 0 flags:0 ts:-0.904989 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos: 31834 size:= 4096 +ret: 0 st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos: 63578 size:= 4096 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos: 14426 size:= 4096 +ret: 0 st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos: 28762 size:= 4096 ret: 0 st:-1 flags:1 ts:-0.222493 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos: 43098 size:= 4096 +ret: 0 st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos: 86106 size:= 4096 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos: 24666 size:= 4096 +ret: 0 st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos: 49242 size:= 4096 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos: 8282 size:= 4096 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 15450 size:= 4096 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 90 size:= 4096 Test seek-acodec-adpcm-ms-trellis failed. Look at tests/data/fate/seek-acod= ec-adpcm-ms-trellis.err for details. make: *** [tests/Makefile:321: fate-seek-acodec-adpcm-ms-trellis] Error 1 [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Let us carefully observe those good qualities wherein our enemies excel us and endeavor to excel them, by avoiding what is faulty, and imitating what is excellent in them. -- Plutarch --fdjw1mCE9xdkNuqN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCaSUFYAAKCRBhHseHBAsP q+H5AJ9EEyi8HfLeRYd758sOG7Ein63xQgCfYJXtuMvEeetxC8vCHAwngHZKycQ= =FA5y -----END PGP SIGNATURE----- --fdjw1mCE9xdkNuqN-- --===============2051320522981125914== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org --===============2051320522981125914==--