Merge pull request mikrosimage#217 from cchampet/fix_AudioPropertiesGetNbSamples

cchampet · cchampet · commit 28852a79aa64 · 2015-08-26T16:30:21.000+02:00
AudioProperties: compute nbSamples if the info is unknown from ffmpeg
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -167,7 +167,10 @@ size_t AudioProperties::getNbSamples() const
 {
 	if( ! _formatContext )
 		throw std::runtime_error( "unknown format context" );
-	return _formatContext->streams[_streamIndex]->nb_frames;
+	size_t nbSamples = _formatContext->streams[_streamIndex]->nb_frames;
+	if(nbSamples == 0)
+		nbSamples = getSampleRate() * getChannels() * getDuration();
+	return nbSamples;
 }
 
 size_t AudioProperties::getTicksPerFrame() const
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -26,7 +26,7 @@ class AvExport AudioProperties : public StreamProperties
 	size_t getSampleRate() const;
 	size_t getChannels() const;
 	size_t getBitRate() const;  ///< 0 if unknown
-	size_t getNbSamples() const;  ///< 0 if unknown
+	size_t getNbSamples() const;
 
 	size_t getTicksPerFrame() const;
 
diff --git a/test/pyTest/testNbSamples.py b/test/pyTest/testNbSamples.py
@@ -50,7 +50,14 @@ def testNbSamplesAudioTranscode():
 	ouputFile = av.OutputFile( outputFileName )
 	transcoder = av.Transcoder( ouputFile )
 
-	transcoder.add( inputFileName, 0, "wave24b48kmono" )
+	# create custom profile
+	customProfile = av.ProfileMap()
+	customProfile[av.avProfileIdentificator] = "customProfile"
+	customProfile[av.avProfileIdentificatorHuman] = "custom profile"
+	customProfile[av.avProfileType] = av.avProfileTypeAudio
+	customProfile[av.avProfileCodec] = "pcm_s16le"
+
+	transcoder.add( inputFileName, 0, customProfile )
 
 	progress = av.ConsoleProgress()
 	transcoder.process( progress )

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,10 @@ size_t AudioProperties::getNbSamples() const`
`167`	`167`	`{`
`168`	`168`	`if( ! _formatContext )`
`169`	`169`	`throw std::runtime_error( "unknown format context" );`
`170`		`- return _formatContext->streams[_streamIndex]->nb_frames;`
	`170`	`+ size_t nbSamples = _formatContext->streams[_streamIndex]->nb_frames;`
	`171`	`+ if(nbSamples == 0)`
	`172`	`+ nbSamples = getSampleRate() * getChannels() * getDuration();`
	`173`	`+ return nbSamples;`
`171`	`174`	`}`
`172`	`175`
`173`	`176`	`size_t AudioProperties::getTicksPerFrame() const`