[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdesupport/taglib
From: Lukáš Lalinský <lalinsky () gmail ! com>
Date: 2010-07-11 9:47:59
Message-ID: 20100711094759.41F32AC85F () svn ! kde ! org
[Download RAW message or body]
SVN commit 1148614 by lalinsky:
Added reading of WAV audio length
BUG:116033
M +2 -1 NEWS
M +5 -0 taglib/riff/rifffile.cpp
M +5 -0 taglib/riff/rifffile.h
M +8 -1 taglib/riff/wav/wavfile.cpp
M +15 -7 taglib/riff/wav/wavproperties.cpp
M +7 -0 taglib/riff/wav/wavproperties.h
M +2 -0 tests/CMakeLists.txt
AM tests/data/empty.wav
M +2 -0 tests/test_riff.cpp
--- trunk/kdesupport/taglib/NEWS #1148613:1148614
@@ -1,9 +1,10 @@
TagLib 1.7
==========
- * Support for reading/writing tags from Monkey's Audio files.
+ * Support for reading/writing tags from Monkey's Audio files. (BUG:210404)
* Implemented APE::Tag::isEmpty() to check for all APE tags, not just the
basic ones.
+ * Added reading of WAV audio length. (BUG:116033)
TagLib 1.6.3 (Apr 17, 2010)
===========================
--- trunk/kdesupport/taglib/taglib/riff/rifffile.cpp #1148613:1148614
@@ -79,6 +79,11 @@
return d->chunkNames.size();
}
+TagLib::uint RIFF::File::chunkDataSize(uint i) const
+{
+ return d->chunkSizes[i];
+}
+
TagLib::uint RIFF::File::chunkOffset(uint i) const
{
return d->chunkOffsets[i];
--- trunk/kdesupport/taglib/taglib/riff/rifffile.h #1148613:1148614
@@ -68,6 +68,11 @@
uint chunkOffset(uint i) const;
/*!
+ * \return The size of the chunk data.
+ */
+ uint chunkDataSize(uint i) const;
+
+ /*!
* \return The name of the specified chunk, for instance, "COMM" or "ID3 "
*/
ByteVector chunkName(uint i) const;
--- trunk/kdesupport/taglib/taglib/riff/wav/wavfile.cpp #1148613:1148614
@@ -96,13 +96,20 @@
void RIFF::WAV::File::read(bool readProperties, Properties::ReadStyle \
propertiesStyle) {
+ ByteVector formatData;
+ uint streamLength = 0;
for(uint i = 0; i < chunkCount(); i++) {
if(chunkName(i) == "ID3 ")
d->tag = new ID3v2::Tag(this, chunkOffset(i));
else if(chunkName(i) == "fmt " && readProperties)
- d->properties = new Properties(chunkData(i), propertiesStyle);
+ formatData = chunkData(i);
+ else if(chunkName(i) == "data" && readProperties)
+ streamLength = chunkDataSize(i);
}
+ if(!formatData.isEmpty())
+ d->properties = new Properties(formatData, streamLength, propertiesStyle);
+
if(!d->tag)
d->tag = new ID3v2::Tag;
}
--- trunk/kdesupport/taglib/taglib/riff/wav/wavproperties.cpp #1148613:1148614
@@ -35,12 +35,13 @@
class RIFF::WAV::Properties::PropertiesPrivate
{
public:
- PropertiesPrivate() :
+ PropertiesPrivate(uint streamLength = 0) :
format(0),
length(0),
bitrate(0),
sampleRate(0),
- channels(0)
+ channels(0),
+ streamLength(streamLength)
{
}
@@ -50,6 +51,7 @@
int bitrate;
int sampleRate;
int channels;
+ uint streamLength;
};
////////////////////////////////////////////////////////////////////////////////
@@ -58,10 +60,16 @@
RIFF::WAV::Properties::Properties(const ByteVector &data, ReadStyle style) : \
AudioProperties(style) {
- d = new PropertiesPrivate;
+ d = new PropertiesPrivate();
read(data);
}
+RIFF::WAV::Properties::Properties(const ByteVector &data, uint streamLength, \
ReadStyle style) : AudioProperties(style) +{
+ d = new PropertiesPrivate(streamLength);
+ read(data);
+}
+
RIFF::WAV::Properties::~Properties()
{
delete d;
@@ -96,9 +104,9 @@
d->format = data.mid(0, 2).toShort(false);
d->channels = data.mid(2, 2).toShort(false);
d->sampleRate = data.mid(4, 4).toUInt(false);
- d->bitrate = data.mid(8, 4).toUInt(false) * 8 / 1024;
- // short bitsPerSample = data.mid(10, 2).toShort();
- // d->bitrate = (sampleRate * sampleSize * d->channels) / 1024.0;
- // d->length = sampleFrames / d->sampleRate;
+ uint byteRate = data.mid(8, 4).toUInt(false);
+ d->bitrate = byteRate * 8 / 1024;
+
+ d->length = byteRate > 0 ? d->streamLength / byteRate : 0;
}
--- trunk/kdesupport/taglib/taglib/riff/wav/wavproperties.h #1148613:1148614
@@ -26,6 +26,7 @@
#ifndef TAGLIB_WAVPROPERTIES_H
#define TAGLIB_WAVPROPERTIES_H
+#include "taglib.h"
#include "audioproperties.h"
namespace TagLib {
@@ -55,6 +56,12 @@
Properties(const ByteVector &data, ReadStyle style);
/*!
+ * Create an instance of WAV::Properties with the data read from the
+ * ByteVector \a data and the length calculated using \a streamLength.
+ */
+ Properties(const ByteVector &data, uint streamLength, ReadStyle style);
+
+ /*!
* Destroys this WAV::Properties instance.
*/
virtual ~Properties();
--- trunk/kdesupport/taglib/tests/CMakeLists.txt #1148613:1148614
@@ -12,6 +12,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mp4
${CMAKE_CURRENT_SOURCE_DIR}/../taglib/riff
${CMAKE_CURRENT_SOURCE_DIR}/../taglib/riff/aiff
+ ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/riff/wav
${CMAKE_CURRENT_SOURCE_DIR}/../taglib/trueaudio
${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ogg
${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ogg/vorbis
@@ -40,6 +41,7 @@
test_flac.cpp
test_ape.cpp
test_apetag.cpp
+ test_wav.cpp
)
IF(WITH_MP4)
SET(test_runner_SRCS ${test_runner_SRCS}
--- trunk/kdesupport/taglib/tests/test_riff.cpp #1148613:1148614
@@ -15,6 +15,7 @@
PublicRIFF(FileName file) : RIFF::File(file, BigEndian) {};
TagLib::uint chunkCount() { return RIFF::File::chunkCount(); };
TagLib::uint chunkOffset(TagLib::uint i) { return RIFF::File::chunkOffset(i); };
+ TagLib::uint chunkDataSize(TagLib::uint i) { return RIFF::File::chunkDataSize(i); \
}; ByteVector chunkName(TagLib::uint i) { return RIFF::File::chunkName(i); };
ByteVector chunkData(TagLib::uint i) { return RIFF::File::chunkData(i); };
void setChunkData(const ByteVector &name, const ByteVector &data) {
@@ -48,6 +49,7 @@
f = new PublicRIFF(filename.c_str());
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f->chunkName(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("foo"), f->chunkData(2));
+ CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f->chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0x1728 + 8), f->chunkOffset(2));
f->setChunkData("SSND", "abcd");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic