Transcoder: change way to add Dummy

Clement Champetier · Clement Champetier · commit 9d296c762865 · 2014-07-21T15:24:01.000+02:00
* 2 new "add(...)" functions, the only ones which can create dummy
streams (from a profileDesc and an EssenceDesc). When the user tries to
create a dummy stream with an empty file name and no EssenceDesc
indicated, there is no add.
* Update comments to fit to this new behavior.
diff --git a/src/AvTranscoder/Transcoder/Transcoder.cpp b/src/AvTranscoder/Transcoder/Transcoder.cpp
@@ -54,8 +54,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 	if( ! filename.length() )
 	{
 		if( _verbose )
-			std::cout << "add encoding stream for dummy input" << std::endl;
-		addDummyStream( profileDesc );
+			std::cerr << "can't add a stream with no filename indicated" << std::endl;
 		return;
 	}
 
@@ -64,6 +63,22 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, Pro
 	addTranscodeStream( filename, streamIndex, profileDesc );
 }
 
+void Transcoder::add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc )
+{
+	_profile.update( profileDesc );
+	if( ! filename.length() )
+	{
+		if( _verbose )
+			std::cout << "add dummy stream" << std::endl;
+		addDummyStream( profileDesc, essenceDesc );
+		return;
+	}
+	
+	if( _verbose )
+		std::cout << "add transcoding stream" << std::endl;
+	addTranscodeStream( filename, streamIndex, profileDesc );
+}
+
 void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const std::string& profileName )
 {
 	if( subStreamIndex < 0 )
@@ -87,18 +102,41 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 
 void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc )
 {
+	_profile.update( profileDesc );
+	
 	if( subStreamIndex < 0 )
 	{
 		add( filename, streamIndex, profileDesc );
 		return;
 	}
+	
+	if( ! filename.length() )
+	{
+		if( _verbose )
+			std::cerr << "can't add a stream with no filename indicated" << std::endl;
+		return;
+	}
+
+	if( _verbose )
+		std::cout << "add transcoding stream for substream " << subStreamIndex << std::endl;
+	addTranscodeStream( filename, streamIndex, subStreamIndex, profileDesc );
+}
 
+void Transcoder::add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc )
+{
 	_profile.update( profileDesc );
+	
+	if( subStreamIndex < 0 )
+	{
+		add( filename, streamIndex, profileDesc );
+		return;
+	}
+	
 	if( ! filename.length() )
 	{
 		if( _verbose )
-			std::cout << "add encoding stream for dummy input" << std::endl;
-		addDummyStream( profileDesc );
+			std::cout << "add dummy stream" << std::endl;
+		addDummyStream( profileDesc, essenceDesc );
 		return;
 	}
 
@@ -253,20 +291,24 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 	}
 }
 
-void Transcoder::addDummyStream( Profile::ProfileDesc& profile )
+void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, EssenceDesc& essenceDesc )
 {
 	if( ! profile.count( Profile::avProfileType ) )
 		throw std::runtime_error( "unable to found stream type (audio, video, etc.)" );
 
 	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeAudio )
 	{
 		_dummyAudio.push_back( new DummyAudio() );
+		_dummyAudio.back()->setAudioDesc( static_cast<AudioDesc>( essenceDesc ) );
+		
 		_streamTranscoders.push_back( new StreamTranscoder( *_dummyAudio.back(), _outputFile, profile ) );
 	}
 
 	if( profile.find( Profile::avProfileType )->second == Profile::avProfileTypeVideo )
 	{
 		_dummyVideo.push_back( new DummyVideo() );
+		_dummyVideo.back()->setVideoDesc( static_cast<VideoDesc>( essenceDesc ) );
+		
 		_streamTranscoders.push_back( new StreamTranscoder( *_dummyVideo.back(), _outputFile, profile ) );
 	}
 }
diff --git a/src/AvTranscoder/Transcoder/Transcoder.hpp b/src/AvTranscoder/Transcoder/Transcoder.hpp
@@ -27,7 +27,7 @@ class Transcoder
 
 	/**
 	 * @brief Add a stream and set a profile
-	 * @note If profile is empty, add a dummy stream.
+	 * @note If profileName is empty, rewrap.
 	 */
 	void add( const std::string& filename, const size_t streamIndex, const std::string& profileName = "" );
 
@@ -36,11 +36,15 @@ class Transcoder
 	 * @note Profile will be updated, be sure to pass unique profile name.
 	 */
 	void add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc );
-
+	/*
+	 * @note If filename is empty, add a dummy stream.
+	 */
+	void add( const std::string& filename, const size_t streamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc );
+	
 	/**
 	 * @brief Add a stream and set a profile
-	 * @note If profile is empty, add a dummy stream.
 	 * @note If subStreamIndex is negative, no substream a selected it's the stream. 
+	 * @note If profileName is empty, rewrap.
 	 */
 	void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const std::string& profileName = "" );
 
@@ -50,6 +54,10 @@ class Transcoder
 	 * @note If subStreamIndex is negative, no substream a selected it's the stream.
 	 */
 	void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc );
+	/**
+	 * @note If filename is empty, add a dummy stream.
+	 */
+	void add( const std::string& filename, const size_t streamIndex, const int subStreamIndex, Profile::ProfileDesc& profileDesc, EssenceDesc& essenceDesc );
 
 	void add( StreamTranscoder& stream );
 	
@@ -67,7 +75,7 @@ class Transcoder
 
 	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const size_t subStreamIndex, Profile::ProfileDesc& profile );
 
-	void addDummyStream( Profile::ProfileDesc& profile );
+	void addDummyStream( const Profile::ProfileDesc& profile, EssenceDesc& essenceDesc );
 
 	InputFile* addInputFile( const std::string& filename, const size_t streamIndex );
 
