Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Calculate duration of FLAC streams

This commit is contained in:
Martchus 2016-05-22 22:27:36 +02:00
parent 53f0903c3b
commit 0dc6d59240
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flac/flacstream.cpp
View File

@ -99,6 +99,7 @@ void FlacStream::internalParseHeader()
m_samplingFrequency = streamInfo.samplingFrequency();
m_sampleCount = streamInfo.totalSampleCount();
m_bitsPerSample = streamInfo.bitsPerSample();
m_duration = TimeSpan::fromSeconds(static_cast<double>(m_sampleCount) / m_samplingFrequency);
} else {
addNotification(NotificationType::Critical, "\"METADATA_BLOCK_STREAMINFO\" is truncated and will be ignored.", context);
}

9
ogg/oggstream.cpp
View File

@ -224,6 +224,15 @@ void OggStream::internalParseHeader()
m_channelCount = streamInfo.channelCount();
m_samplingFrequency = streamInfo.samplingFrequency();
m_sampleCount = streamInfo.totalSampleCount();
if(!m_sampleCount && iterator.areAllPagesFetched()) {
const auto &pages = iterator.pages();
const auto firstPage = find_if(pages.cbegin(), pages.cend(), pred);
const auto lastPage = find_if(pages.crbegin(), pages.crend(), pred);
if(firstPage != pages.cend() && lastPage != pages.crend()) {
m_sampleCount = lastPage->absoluteGranulePosition() - firstPage->absoluteGranulePosition();
}
}
m_duration = TimeSpan::fromSeconds(static_cast<double>(m_sampleCount) / m_samplingFrequency);
hasIdentificationHeader = true;
} else {
addNotification(NotificationType::Critical, "FLAC-to-Ogg mapping header appears more then once. Oversupplied occurrence will be ignored.", context);

2
tests/overall.cpp
View File

@ -1058,6 +1058,7 @@ void OverallTests::checkFlacTestfile1()
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
CPPUNIT_ASSERT(track->duration().minutes() == 4);
}
const auto tags = m_fileInfo.tags();
switch(m_tagStatus) {
@ -1099,6 +1100,7 @@ void OverallTests::checkFlacTestfile2()
CPPUNIT_ASSERT(track->channelCount() == 2);
CPPUNIT_ASSERT(track->samplingFrequency() == 44100);
CPPUNIT_ASSERT(track->bitsPerSample() == 16);
CPPUNIT_ASSERT(track->duration().minutes() == 4);
}
const auto tags = m_fileInfo.tags();
switch(m_tagStatus) {