mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-04 08:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #354 from TsudaKageyu/opus-bitrate

Browse Source 
opus: Estimate the bitrate if possible
This commit is contained in:
Stephen F. Booth
2014-03-09 21:37:50 -04:00
parent a3d724af27 72cd379f30
commit cfb43223dc
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
taglib/ogg/opus/opusproperties.cpp
View File

@ -45,6 +45,7 @@ public:
file(f),
style(s),
length(0),
bitrate(0),
inputSampleRate(0),
channels(0),
opusVersion(0) {}
@ -52,6 +53,7 @@ public:
File *file;
ReadStyle style;
int length;
int bitrate;
int inputSampleRate;
int channels;
int opusVersion;
@ -79,7 +81,7 @@ int Opus::Properties::length() const
int Opus::Properties::bitrate() const
{
return 0;
return d->bitrate;
}
int Opus::Properties::sampleRate() const
@ -143,14 +145,16 @@ void Opus::Properties::read()
pos += 1;
const Ogg::PageHeader *first = d->file->firstPageHeader();
const Ogg::PageHeader *last = d->file->lastPageHeader();
const Ogg::PageHeader *last = d->file->lastPageHeader();
if(first && last) {
long long start = first->absoluteGranularPosition();
long long end = last->absoluteGranularPosition();
const long long start = first->absoluteGranularPosition();
const long long end = last->absoluteGranularPosition();
if(start >= 0 && end >= 0)
d->length = (int) ((end - start - preSkip) / 48000);
if(start >= 0 && end >= 0) {
d->length = (int)((end - start - preSkip) / 48000);
d->bitrate = (int)(d->file->length() * 8.0 / (1000.0 * d->length) + 0.5);
}
else {
debug("Opus::Properties::read() -- The PCM values for the start or "
"end of this file was incorrect.");

2
tests/test_opus.cpp
View File

@ -23,7 +23,7 @@ public:
{
Ogg::Opus::File f(TEST_FILE_PATH_C("correctness_gain_silent_output.opus"));
CPPUNIT_ASSERT_EQUAL(7, f.audioProperties()->length());
CPPUNIT_ASSERT_EQUAL(0, f.audioProperties()->bitrate());
CPPUNIT_ASSERT_EQUAL(41, f.audioProperties()->bitrate());
CPPUNIT_ASSERT_EQUAL(1, f.audioProperties()->channels());
CPPUNIT_ASSERT_EQUAL(48000, f.audioProperties()->sampleRate());
CPPUNIT_ASSERT_EQUAL(48000, ((Ogg::Opus::Properties *)f.audioProperties())->inputSampleRate());