get sample_rate and channels from audio profiles

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 4e36bc91af47 · 2014-07-02T08:15:06.000-04:00
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
@@ -169,7 +169,9 @@ bool OutputAudio::encodeFrame( DataStream& codedFrame )
 void OutputAudio::setProfile( Profile::ProfileDesc& desc )
 {
 	_audioDesc.setAudioCodec( desc["codec"] );
-	_audioDesc.setAudioParameters( 48000, 1, av_get_sample_fmt( desc["sample_fmt"].c_str() ) );
+	size_t sample_rate = atoi( desc["sample_rate"].c_str() );
+	size_t channels = atoi( desc["channels"].c_str() );
+	_audioDesc.setAudioParameters( sample_rate, channels, av_get_sample_fmt( desc["sample_fmt"].c_str() ) );
 
 	setup();
 }
diff --git a/src/AvTranscoder/Profiles/Wave.hpp b/src/AvTranscoder/Profiles/Wave.hpp
@@ -6,26 +6,30 @@ namespace avtranscoder
 
 void loadWave( Profile::ProfilesDesc& profiles )
 {
-	Profile::ProfileDesc wave24bits;
+	Profile::ProfileDesc wave24b48kMono;
 
-	wave24bits[ Profile::avProfileIdentificator ] = "wave24bits";
-	wave24bits[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits";
-	wave24bits[ Profile::avProfileType ] = Profile::avProfileTypeAudio;
+	wave24b48kMono[ Profile::avProfileIdentificator ] = "wave24b48kMono";
+	wave24b48kMono[ Profile::avProfileIdentificatorHuman ] = "Wave 24bits 48kHz mono";
+	wave24b48kMono[ Profile::avProfileType ] = Profile::avProfileTypeAudio;
 
-	wave24bits[ "codec" ] = "pcm_s24le";
-	wave24bits[ "sample_fmt" ] = "s32";
+	wave24b48kMono[ "codec" ] = "pcm_s24le";
+	wave24b48kMono[ "sample_fmt" ] = "s32";
+	wave24b48kMono[ "sample_rate" ] = "48000";
+	wave24b48kMono[ "channels" ] = "1";
 
-	Profile::ProfileDesc wave16bits;
+	Profile::ProfileDesc wave16b48kMono;
 
-	wave16bits[ Profile::avProfileIdentificator ] = "wave16bits";
-	wave16bits[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits";
-	wave16bits[ Profile::avProfileType ] = Profile::avProfileTypeAudio;
+	wave16b48kMono[ Profile::avProfileIdentificator ] = "wave16b48kMono";
+	wave16b48kMono[ Profile::avProfileIdentificatorHuman ] = "Wave 16bits 48kHz mono";
+	wave16b48kMono[ Profile::avProfileType ] = Profile::avProfileTypeAudio;
 
-	wave16bits[ "codec" ] = "pcm_s16le";
-	wave16bits[ "sample_fmt" ] = "s16";
+	wave16b48kMono[ "codec" ] = "pcm_s16le";
+	wave16b48kMono[ "sample_fmt" ] = "s16";
+	wave16b48kMono[ "sample_rate" ] = "48000";
+	wave16b48kMono[ "channels" ] = "1";
 
-	profiles.push_back( wave24bits );
-	profiles.push_back( wave16bits );
+	profiles.push_back( wave24b48kMono );
+	profiles.push_back( wave16b48kMono );
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,9 @@ bool OutputAudio::encodeFrame( DataStream& codedFrame )`
`169`	`169`	`void OutputAudio::setProfile( Profile::ProfileDesc& desc )`
`170`	`170`	`{`
`171`	`171`	`_audioDesc.setAudioCodec( desc["codec"] );`
`172`		`- _audioDesc.setAudioParameters( 48000, 1, av_get_sample_fmt( desc["sample_fmt"].c_str() ) );`
	`172`	`+ size_t sample_rate = atoi( desc["sample_rate"].c_str() );`
	`173`	`+ size_t channels = atoi( desc["channels"].c_str() );`
	`174`	`+ _audioDesc.setAudioParameters( sample_rate, channels, av_get_sample_fmt( desc["sample_fmt"].c_str() ) );`
`173`	`175`
`174`	`176`	`setup();`
`175`	`177`	`}`