From d21ff8be54c548fee530b468a2335625e875feaa Mon Sep 17 00:00:00 2001 From: Nick Shaforostoff Date: Wed, 23 Feb 2011 08:58:17 +0000 Subject: [PATCH] divide by 1000 instead of 1024 when calculating riff bitrate to get standard 1411 kbps bitrate on AudioCD wavs CCMAIL:taglib-devel@kde.org git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1222375 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- taglib/riff/aiff/aiffproperties.cpp | 2 +- taglib/riff/wav/wavproperties.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp index 9da5b1d8..77c3d277 100644 --- a/taglib/riff/aiff/aiffproperties.cpp +++ b/taglib/riff/aiff/aiffproperties.cpp @@ -148,6 +148,6 @@ void RIFF::AIFF::Properties::read(const ByteVector &data) d->sampleWidth = data.mid(6, 2).toShort(); double sampleRate = ConvertFromIeeeExtended(reinterpret_cast(data.mid(8, 10).data())); d->sampleRate = sampleRate; - d->bitrate = (sampleRate * d->sampleWidth * d->channels) / 1024.0; + d->bitrate = (sampleRate * d->sampleWidth * d->channels) / 1000.0; d->length = sampleFrames / d->sampleRate; } diff --git a/taglib/riff/wav/wavproperties.cpp b/taglib/riff/wav/wavproperties.cpp index 07971a06..37216860 100644 --- a/taglib/riff/wav/wavproperties.cpp +++ b/taglib/riff/wav/wavproperties.cpp @@ -114,7 +114,7 @@ void RIFF::WAV::Properties::read(const ByteVector &data) d->sampleWidth = data.mid(14, 2).toShort(false); uint byteRate = data.mid(8, 4).toUInt(false); - d->bitrate = byteRate * 8 / 1024; + d->bitrate = byteRate * 8 / 1000; d->length = byteRate > 0 ? d->streamLength / byteRate : 0; }