OutputFile: update setProfile

Clement Champetier · Clement Champetier · commit 9c1534a0b1ec · 2014-07-29T17:45:15.000+02:00
* avProfileFormat is necessary in a format profileDesc.
* Update _outputFormat depending on avProfileFormat in the profile.
diff --git a/src/AvTranscoder/File/OutputFile.cpp b/src/AvTranscoder/File/OutputFile.cpp
@@ -33,7 +33,8 @@ OutputFile::OutputFile( const std::string& filename )
 bool OutputFile::setup()
 {
 	av_register_all();
-	_outputFormat = av_guess_format( NULL, _filename.c_str(), NULL);
+	if( ! _outputFormat )
+		_outputFormat = av_guess_format( NULL, _filename.c_str(), NULL);
 
 	if( ! _outputFormat )
 	{
@@ -182,14 +183,26 @@ bool OutputFile::endWrap( )
 
 
 void OutputFile::setProfile( const Profile::ProfileDesc& desc )
-{	
+{
+	if( ! desc.count( Profile::avProfileFormat ) )
+	{
+		throw std::runtime_error( "The profile " + desc.find( Profile::avProfileIdentificatorHuman )->second + " is invalid." );
+	}
+	
+	if( ! matchFormat( desc.find( Profile::avProfileFormat )->second, _filename ) )
+	{
+		throw std::runtime_error( "Invalid format according to the file extension." );
+	}
+	_outputFormat = av_guess_format( desc.find( Profile::avProfileFormat )->second.c_str(), _filename.c_str(), NULL);
+	
 	ParamSet paramSet( _formatContext );
 	
 	for( Profile::ProfileDesc::const_iterator it = desc.begin(); it != desc.end(); ++it )
 	{
 		if( (*it).first == Profile::avProfileIdentificator ||
 			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType )
+			(*it).first == Profile::avProfileType ||
+			(*it).first == Profile::avProfileFormat )
 			continue;
 		
 		try
@@ -208,7 +221,8 @@ void OutputFile::setProfile( const Profile::ProfileDesc& desc )
 	{
 		if( (*it).first == Profile::avProfileIdentificator ||
 			(*it).first == Profile::avProfileIdentificatorHuman ||
-			(*it).first == Profile::avProfileType )
+			(*it).first == Profile::avProfileType ||
+			(*it).first == Profile::avProfileFormat )
 			continue;
 
 		try
