Transcoder: can add a stream with a custum profile

Clement Champetier · Clement Champetier · commit 8ea50c6e0622 · 2014-06-30T14:22:37.000+02:00
* Transcoder: 3 ways to add a stream, which call the private function
add( const InputStreamDesc&amp; streamDefinition ).
* This impacts:
     * StreamTranscoder: init with a ProfileDesc instead of a
profileName.
     * OutputEssence (and the subclasses OutputVideo and OutputAudio):
set profile with a ProfileDesc instead of a profileName.
     * swig avTranscoder.i: include Profile because of includes in
output essence source files.
     * avTranscoder app.: can't update the profile with only the
profileName.
     * optionChecker app.: set the profile with the profileDesc.
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -16,6 +16,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 
 	// av_log_set_level( AV_LOG_DEBUG );
 
+	Profile profile( true );
 	ProgressListener p;
 
 	InputFile input( inputfilename );
@@ -29,7 +30,7 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 
 	// init video encoder
 	OutputVideo outputVideo;
-	outputVideo.setProfile( "xdcamhd422" );
+	outputVideo.setProfile( profile.getProfile( "xdcamhd422" ) );
 	Image imageToEncode( outputVideo.getVideoDesc().getImageDesc() );
 	
 	DataStream codedImage;
diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
@@ -25,13 +25,13 @@ int main( int argc, char** argv )
 		if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
 		{
 			avtranscoder::OutputVideo outputVideo;
-			outputVideo.setProfile( profile.find( avtranscoder::Profile::avProfileIdentificator )->second );
+			outputVideo.setProfile( profile );
 		}
 
 		if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )
 		{
 			avtranscoder::OutputAudio outputAudio;
-			outputAudio.setProfile( profile.find( avtranscoder::Profile::avProfileIdentificator )->second );
+			outputAudio.setProfile( profile );
 		}
 
 	}
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
@@ -166,14 +166,10 @@ bool OutputAudio::encodeFrame( DataStream& codedFrame )
 #endif
 }
 
-void OutputAudio::setProfile( const std::string& profile )
+void OutputAudio::setProfile( Profile::ProfileDesc& desc )
 {
-	Profile p;
-	p.loadProfiles();
-	Profile::ProfileDesc profDesc = p.getProfile( profile );
-
-	_audioDesc.setAudioCodec( profDesc["codec"] );
-	_audioDesc.setAudioParameters( 48000, 2, av_get_sample_fmt( profDesc["sample_fmt"].c_str() ) );
+	_audioDesc.setAudioCodec( desc["codec"] );
+	_audioDesc.setAudioParameters( 48000, 2, av_get_sample_fmt( desc["sample_fmt"].c_str() ) );
 
 	setup();
 }
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.hpp b/src/AvTranscoder/EssenceStream/OutputAudio.hpp
@@ -2,9 +2,12 @@
 #define _AV_TRANSCODER_ESSENCE_STREAM_OUTPUT_AUDIO_HPP_
 
 #include "OutputEssence.hpp"
+
 #include <AvTranscoder/DatasStructures/AudioDesc.hpp>
 #include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
 
+#include <AvTranscoder/Profile.hpp>
+
 namespace avtranscoder
 {
 
@@ -25,7 +28,7 @@ class OutputAudio : public OutputEssence
 	 */
 	bool encodeFrame( DataStream& codedFrame );
 	
-	void setProfile( const std::string& profile );
+	void setProfile( Profile::ProfileDesc& desc );
 
 	AudioDesc& getAudioDesc() { return _audioDesc; }
 
diff --git a/src/AvTranscoder/EssenceStream/OutputEssence.hpp b/src/AvTranscoder/EssenceStream/OutputEssence.hpp
@@ -14,6 +14,8 @@ extern "C" {
 #include <AvTranscoder/DatasStructures/Frame.hpp>
 #include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
 
+#include <AvTranscoder/Profile.hpp>
+
 namespace avtranscoder
 {
 
@@ -50,9 +52,9 @@ class AvExport OutputEssence
 	/**
 	 * @brief Set the profile for the encoder
 	 * @note see Profile to get list of supported profiles
-	 * @param profile selected profile name
+	 * @param desc description of the selected profile
 	 */
-	virtual void setProfile( const std::string& profile ) = 0;
+	virtual void setProfile( Profile::ProfileDesc& desc ) = 0;
 
 };
 
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.cpp b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
@@ -176,19 +176,13 @@ bool OutputVideo::encodeFrame( DataStream& codedFrame )
 #endif
 }
 
-void OutputVideo::setProfile( const std::string& profile )
+void OutputVideo::setProfile( Profile::ProfileDesc& desc )
 {
-	Profile p;
-
-	p.loadProfiles();
-
-	Profile::ProfileDesc prof = p.getProfile( profile );
-
-	_videoDesc.setVideoCodec( prof[ "codec" ] );
+	_videoDesc.setVideoCodec( desc[ "codec" ] );
 	_videoDesc.setTimeBase( 1, 25 ); // 25 fps
-	_videoDesc.setImageParameters( 1920, 1080, av_get_pix_fmt( prof[ "pix_fmt" ].c_str() ) );
+	_videoDesc.setImageParameters( 1920, 1080, av_get_pix_fmt( desc[ "pix_fmt" ].c_str() ) );
 
-	for( Profile::ProfileDesc::iterator it = prof.begin(); it != prof.end(); ++it )
+	for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator )
 			continue;
@@ -217,7 +211,7 @@ void OutputVideo::setProfile( const std::string& profile )
 
 	setup();
 
-	for( Profile::ProfileDesc::iterator it = prof.begin(); it != prof.end(); ++it )
+	for( Profile::ProfileDesc::iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator )
 			continue;
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.hpp b/src/AvTranscoder/EssenceStream/OutputVideo.hpp
@@ -13,6 +13,8 @@ extern "C" {
 #include <AvTranscoder/DatasStructures/VideoDesc.hpp>
 #include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
 
+#include <AvTranscoder/Profile.hpp>
+
 #include <string>
 #include <vector>
 
@@ -41,10 +43,10 @@ class AvExport OutputVideo : public OutputEssence
 	 */
 	bool encodeFrame( DataStream& codedFrame );
 
+	void setProfile( Profile::ProfileDesc& desc );
+	
 	VideoDesc& getVideoDesc() { return _videoDesc; }
 
-	void setProfile( const std::string& profile );
-
 private:
 	VideoDesc _videoDesc;
 };
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -27,9 +27,10 @@ StreamTranscoder::~StreamTranscoder()
 		delete _outputEssence;
 }
 
-void StreamTranscoder::init( const std::string& profile )
+void StreamTranscoder::init( const Profile::ProfileDesc& profileDesc )
 {
-	_transcodeStream = profile.size();
+	const std::string profileName = profileDesc.find( Profile::avProfileIdentificator )->second;
+	_transcodeStream = profileName.size();
 	
 	switch( _stream->getStreamType() )
 	{
@@ -39,7 +40,7 @@ void StreamTranscoder::init( const std::string& profile )
 			_inputEssence->setup();
 
 			// re-wrap only, get output descriptor from input
-			if( profile.empty() )
+			if( profileName.empty() )
 			{
 				_outputFile->addVideoStream( _stream->getVideoDesc() );
 				break;
@@ -48,7 +49,8 @@ void StreamTranscoder::init( const std::string& profile )
 			OutputVideo* outputVideo = new OutputVideo();
 			_outputEssence = outputVideo;
 
-			_outputEssence->setProfile( profile );
+			Profile::ProfileDesc prof = profileDesc;
+			_outputEssence->setProfile( prof );
 			_outputFile->addVideoStream( outputVideo->getVideoDesc() );
 			_videoFrameBuffer = new Image( outputVideo->getVideoDesc().getImageDesc() );
 			_frameBuffer = _videoFrameBuffer;
@@ -61,7 +63,7 @@ void StreamTranscoder::init( const std::string& profile )
 			_inputEssence->setup();
 
 			// re-wrap only, get output descriptor from input
-			if( profile.empty() )
+			if( profileName.empty() )
 			{
 				_outputFile->addAudioStream( _stream->getAudioDesc() );
 				break;
@@ -70,7 +72,8 @@ void StreamTranscoder::init( const std::string& profile )
 			OutputAudio* outputAudio = new OutputAudio();
 			_outputEssence = outputAudio;
 
-			_outputEssence->setProfile( profile );
+			Profile::ProfileDesc prof = profileDesc;
+			_outputEssence->setProfile( prof );
 			_outputFile->addAudioStream( outputAudio->getAudioDesc() );
 			_audioFrameBuffer = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
 			_frameBuffer = _audioFrameBuffer;
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
@@ -11,6 +11,7 @@
 
 #include <AvTranscoder/File/OutputFile.hpp>
 
+#include <AvTranscoder/Profile.hpp>
 
 namespace avtranscoder
 {
@@ -21,7 +22,7 @@ class StreamTranscoder
 	StreamTranscoder( InputStream& stream, OutputFile& outputFile, const size_t& streamId );
 	~StreamTranscoder();
 
-	void init( const std::string& profile );
+	void init( const Profile::ProfileDesc& profileDesc );
 
 	bool processFrame();
 
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -9,6 +9,7 @@ namespace avtranscoder
 
 Transcoder::Transcoder( OutputFile& outputFile )
 	: _outputFile( outputFile )
+	, _profile( true )
 {
 	_outputFile.setup();
 }
@@ -31,8 +32,36 @@ Transcoder::~Transcoder()
 	}
 }
 
-void Transcoder::add( const std::string& filename, const size_t streamIndex, const std::string& profile )
+void Transcoder::add( const std::string& filename, const size_t streamIndex, const std::string& profileName )
 {
+	InputStreamDesc streamDesc( streamIndex, filename, profileName );
+	add( streamDesc );
+}
+
+void Transcoder::add( const std::string& filename, const size_t streamIndex, const Profile::ProfileDesc& profileDesc )
+{
+	_profile.update( profileDesc );
+	
+	InputStreamDesc streamDesc( streamIndex, filename, profileDesc );
+	add( streamDesc );
+}
+
+void Transcoder::add( const InputStreamsDesc& streamDefs )
+{
+	for( size_t streamDest = 0; streamDest < streamDefs.size(); ++streamDest )
+	{
+		add( streamDefs.at( streamDest ) );
+	}
+	if( _inputStreams.size() != _streamTranscoders.size() )
+		throw std::runtime_error( "_inputStreams and _streamTranscoders must have the same number of streams" );
+}
+
+void Transcoder::add( const InputStreamDesc& streamDefinition )
+{
+	const std::string filename( streamDefinition.filename );
+	const size_t streamIndex = streamDefinition.streamId;
+	const Profile::ProfileDesc profileDesc = streamDefinition.transcodeProfile;
+	
 	if( ! filename.length() )
 	{
 		try
@@ -82,15 +111,15 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 		case AVMEDIA_TYPE_VIDEO:
 		{
 			StreamTranscoder* streamTranscoder = new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, _streamTranscoders.size() );
-			streamTranscoder->init( profile );
+			streamTranscoder->init( profileDesc );
 			_streamTranscoders.push_back( streamTranscoder );
 			_inputStreams.push_back( & referenceFile->getStream( streamIndex ) );
 			break;
 		}
 		case AVMEDIA_TYPE_AUDIO:
 		{
 			StreamTranscoder* streamTranscoder = new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, _streamTranscoders.size() );
-			streamTranscoder->init( profile );
+			streamTranscoder->init( profileDesc );
 			_streamTranscoders.push_back( streamTranscoder );
 			_inputStreams.push_back( & referenceFile->getStream( streamIndex ) );
 			break;
@@ -106,18 +135,6 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 	return;
 }
 
-void Transcoder::add( const InputStreamsDesc& streamDefs )
-{
-	for( size_t streamDest = 0; streamDest < streamDefs.size(); ++streamDest )
-	{
-		add( streamDefs.at( streamDest ).filename,
-		     streamDefs.at( streamDest ).streamId,
-		     streamDefs.at( streamDest ).transcodeProfile );
-	}
-	if( _inputStreams.size() != _streamTranscoders.size() )
-		throw std::runtime_error( "error during settings streams and transcoders" );
-}
-
 
 bool Transcoder::processFrame()
 {
diff --git a/src/AvTranscoder/Transcoder/Transcoder.hpp b/src/AvTranscoder/Transcoder/Transcoder.hpp
@@ -6,6 +6,7 @@
 #include <AvTranscoder/CodedStream/InputStream.hpp>
 #include <AvTranscoder/ProgressListener.hpp>
 #include <AvTranscoder/DummyInputStream.hpp>
+#include <AvTranscoder/Profile.hpp>
 
 #include <string>
 #include <vector>
@@ -22,29 +23,63 @@ class Transcoder
 	struct InputStreamDesc {
 		size_t streamId;
 		std::string filename;
-		std::string transcodeProfile;
+		Profile::ProfileDesc transcodeProfile;
 
-		InputStreamDesc( const size_t& sId, const std::string& filename, const std::string& profile )
+		InputStreamDesc( const size_t& sId, const std::string& filename, const Profile::ProfileDesc& profile )
 			: streamId( sId )
 			, filename( filename )
 			, transcodeProfile( profile )
 		{
 		}
+		
+		InputStreamDesc( const size_t& sId, const std::string& filename, const std::string& profileName )
+			: streamId( sId )
+			, filename( filename )
+		{
+			try
+			{
+				Profile p( true );
+				transcodeProfile = p.getProfile( profileName );
+			}
+			// if the profile doesn't exist
+			catch( std::exception& e )
+			{
+				Profile::ProfileDesc emptyDesc;
+				emptyDesc[ Profile::avProfileIdentificator ] = "";
+				emptyDesc[ Profile::avProfileIdentificatorHuman ] = "";
+				
+				transcodeProfile = emptyDesc;
+			}
+		}
 	};
 
 	typedef std::vector< InputStreamDesc > InputStreamsDesc;
 
 	Transcoder( OutputFile& outputFile );
 	~Transcoder();
 
-	void add( const std::string& filename, const size_t streamIndex, const std::string& profile );
+	/**
+	 * @brief Add a stream and set a profile
+	 * @note If profile is empty, add a dummy stream.
+	 */
+	void add( const std::string& filename, const size_t streamIndex, const std::string& profileName = "" );
+	/**
+	 * @brief Add a srteam and set a custom profile
+	 * @note Profile will be updated, be sure to pass unique profile name.
+	 */
+	void add( const std::string& filename, const size_t streamIndex, const Profile::ProfileDesc& profileDesc );
+	/**
+	 * @brief Add a list of streams.
+	 */
 	void add( const InputStreamsDesc& streamDefs );
 
 	bool processFrame();
 
 	void process( ProgressListener& progress );
 
 private:
+	void add( const InputStreamDesc& streamDefinition );
+	
 	bool getStreamsNextPacket( std::vector< DataStream >& dataStreams );
 
 private:
@@ -55,6 +90,8 @@ class Transcoder
 	std::vector< StreamTranscoder* > _streamTranscoders;
 	
 	std::vector< DummyInputStream* > _dummyInputStreams;
+	
+	Profile _profile;
 };
 
 }
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@ int main( int argc, char** argv )`
`25`	`25`	`if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )`
`26`	`26`	`{`
`27`	`27`	`avtranscoder::OutputVideo outputVideo;`
`28`		`- outputVideo.setProfile( profile.find( avtranscoder::Profile::avProfileIdentificator )->second );`
	`28`	`+ outputVideo.setProfile( profile );`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )`
`32`	`32`	`{`
`33`	`33`	`avtranscoder::OutputAudio outputAudio;`
`34`		`- outputAudio.setProfile( profile.find( avtranscoder::Profile::avProfileIdentificator )->second );`
	`34`	`+ outputAudio.setProfile( profile );`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,14 +166,10 @@ bool OutputAudio::encodeFrame( DataStream& codedFrame )`
`166`	`166`	`#endif`
`167`	`167`	`}`
`168`	`168`
`169`		`-void OutputAudio::setProfile( const std::string& profile )`
	`169`	`+void OutputAudio::setProfile( Profile::ProfileDesc& desc )`
`170`	`170`	`{`
`171`		`- Profile p;`
`172`		`- p.loadProfiles();`
`173`		`- Profile::ProfileDesc profDesc = p.getProfile( profile );`
`174`		`-`
`175`		`- _audioDesc.setAudioCodec( profDesc["codec"] );`
`176`		`- _audioDesc.setAudioParameters( 48000, 2, av_get_sample_fmt( profDesc["sample_fmt"].c_str() ) );`
	`171`	`+ _audioDesc.setAudioCodec( desc["codec"] );`
	`172`	`+ _audioDesc.setAudioParameters( 48000, 2, av_get_sample_fmt( desc["sample_fmt"].c_str() ) );`
`177`	`173`
`178`	`174`	`setup();`
`179`	`175`	`}`