Merge pull request #36 from cchampet/fix_audioProperties_getBitRate

valnoel · valnoel · commit 9d0960a6fb7c · 2015-01-12T13:41:42.000+01:00
AudioProperties: fix getBitRate
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -1,7 +1,5 @@
 #include "AudioProperties.hpp"
 
-#include <stdexcept>
-
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -10,6 +8,8 @@ extern "C" {
 #include <libavutil/channel_layout.h>
 }
 
+#include <stdexcept>
+
 namespace avtranscoder
 {
 
@@ -151,7 +151,9 @@ size_t AudioProperties::getBitRate() const
 {
 	if( ! _codecContext )
 		throw std::runtime_error( "unknown codec context" );
-	return _codecContext->bit_rate;
+	int bitsPerSample = av_get_bits_per_sample( _codecContext->codec_id );
+	size_t bitRate = bitsPerSample ? _codecContext->sample_rate * _codecContext->channels * bitsPerSample : _codecContext->bit_rate;
+	return bitRate;
 }
 
 size_t AudioProperties::getNbSamples() const

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`#include "AudioProperties.hpp"`
`2`	`2`
`3`		`-#include <stdexcept>`
`4`		`-`
`5`	`3`	`extern "C" {`
`6`	`4`	`#include <libavcodec/avcodec.h>`
`7`	`5`	`#include <libavformat/avformat.h>`
`@@ -10,6 +8,8 @@ extern "C" {`
`10`	`8`	`#include <libavutil/channel_layout.h>`
`11`	`9`	`}`
`12`	`10`
	`11`	`+#include <stdexcept>`
	`12`	`+`
`13`	`13`	`namespace avtranscoder`
`14`	`14`	`{`
`15`	`15`
`@@ -151,7 +151,9 @@ size_t AudioProperties::getBitRate() const`
`151`	`151`	`{`
`152`	`152`	`if( ! _codecContext )`
`153`	`153`	`throw std::runtime_error( "unknown codec context" );`
`154`		`- return _codecContext->bit_rate;`
	`154`	`+ int bitsPerSample = av_get_bits_per_sample( _codecContext->codec_id );`
	`155`	`+ size_t bitRate = bitsPerSample ? _codecContext->sample_rate * _codecContext->channels * bitsPerSample : _codecContext->bit_rate;`
	`156`	`+ return bitRate;`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`size_t AudioProperties::getNbSamples() const`