Add a first version of setProfile method into OutputStreamAudio

Valentin Noel · Valentin Noel · commit 9f9dc1a35774 · 2014-06-12T16:48:00.000+02:00
diff --git a/src/AvTranscoder/OutputStreamAudio.cpp b/src/AvTranscoder/OutputStreamAudio.cpp
@@ -9,6 +9,8 @@ extern "C" {
 #include <libavutil/avutil.h>
 }
 
+#include "Profile.hpp"
+
 namespace avtranscoder
 {
 
@@ -19,6 +21,7 @@ OutputStreamAudio::OutputStreamAudio()
 
 bool OutputStreamAudio::setup()
 {
+	std::cout << "[OutputStreamAudio::setup] ..." << std::endl;
 	av_register_all();  // Warning: should be called only once
 
 	AVCodecContext* codecContext( m_audioDesc.getCodecContext() );
@@ -160,4 +163,17 @@ bool OutputStreamAudio::encodeFrame( DataStream& codedFrame )
 #endif
 }
 
+void OutputStreamAudio::setProfile( const std::string& profile )
+{
+	Profile p;
+	p.loadAudioProfiles();
+	Profile::ProfileDesc profDesc = p.getProfile( profile );
+
+	m_audioDesc.setAudioCodec( profDesc["codec"] );
+	m_audioDesc.setAudioParameters( 48000, 2, av_get_sample_fmt( profDesc["sample_fmt"].c_str() ) );
+
+	setup();
 }
+
+}
+
diff --git a/src/AvTranscoder/OutputStreamAudio.hpp b/src/AvTranscoder/OutputStreamAudio.hpp
@@ -26,6 +26,8 @@ class OutputStreamAudio : public OutputStream
 	 */
 	bool encodeFrame( DataStream& codedFrame );
 	
+	void setProfile( const std::string& profile );
+
 	AudioDesc& getAudioDesc() { return m_audioDesc; }
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ extern "C" {`
`9`	`9`	`#include <libavutil/avutil.h>`
`10`	`10`	`}`
`11`	`11`
	`12`	`+#include "Profile.hpp"`
	`13`	`+`
`12`	`14`	`namespace avtranscoder`
`13`	`15`	`{`
`14`	`16`
`@@ -19,6 +21,7 @@ OutputStreamAudio::OutputStreamAudio()`
`19`	`21`
`20`	`22`	`bool OutputStreamAudio::setup()`
`21`	`23`	`{`
	`24`	`+ std::cout << "[OutputStreamAudio::setup] ..." << std::endl;`
`22`	`25`	`av_register_all(); // Warning: should be called only once`
`23`	`26`
`24`	`27`	`AVCodecContext* codecContext( m_audioDesc.getCodecContext() );`
`@@ -160,4 +163,17 @@ bool OutputStreamAudio::encodeFrame( DataStream& codedFrame )`
`160`	`163`	`#endif`
`161`	`164`	`}`
`162`	`165`
	`166`	`+void OutputStreamAudio::setProfile( const std::string& profile )`
	`167`	`+{`
	`168`	`+ Profile p;`
	`169`	`+ p.loadAudioProfiles();`
	`170`	`+ Profile::ProfileDesc profDesc = p.getProfile( profile );`
	`171`	`+`
	`172`	`+ m_audioDesc.setAudioCodec( profDesc["codec"] );`
	`173`	`+ m_audioDesc.setAudioParameters( 48000, 2, av_get_sample_fmt( profDesc["sample_fmt"].c_str() ) );`
	`174`	`+`
	`175`	`+ setup();`
`163`	`176`	`}`
	`177`	`+`
	`178`	`+}`
	`179`	`+`