divide by 1000 instead of 1024 when calculating riff bitrate to get standard 1411...

CCMAIL:taglib-devel@kde.org

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1222375 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/taglib/riff/aiff/aiffproperties.cpp b/taglib/riff/aiff/aiffproperties.cpp
index 9da5b1d8813f54add5034a9529119b5a0b0dcf7b..77c3d2776077044bff8e44c7b858d916330e285a 100644 (file)
--- 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<unsigned char *>(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 07971a06484fea818ecdaefe1ce3256ae1be3f87..3721686058f2bfcbd706353fb27e47ac8e608e62 100644 (file)
--- 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;
 }