Merge branch 'dev_OptionLoader' into dev_Dummy

Clement Champetier · Clement Champetier · commit 1f7805c0b7ed · 2014-07-18T17:58:56.000+02:00
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.cpp b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
@@ -195,12 +195,6 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im
 		throw std::runtime_error( "The profile " + desc[ Profile::avProfileIdentificatorHuman ] + " is invalid." );
 	}
 	
-	if( ( desc.count( Profile::avProfileWidth ) && std::strtoul( desc[ Profile::avProfileWidth ].c_str(), NULL, 0 ) != imageDesc.getWidth() ) || 
-		( desc.count( Profile::avProfileHeight ) && std::strtoul( desc[ Profile::avProfileHeight ].c_str(), NULL, 0 ) != imageDesc.getHeight() ) )
-	{
-		throw std::runtime_error( "Invalid imageDesc with the profile " + desc[ Profile::avProfileIdentificatorHuman ] + "." );
-	}
-	
 	_videoDesc.setVideoCodec( desc[ Profile::avProfileCodec ] );
 	
 	const size_t frameRate = std::strtoul( desc[ Profile::avProfileFrameRate ].c_str(), NULL, 0 );
@@ -215,8 +209,6 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im
 			(*it).first == Profile::avProfileType ||
 			(*it).first == Profile::avProfileCodec ||
 			(*it).first == Profile::avProfilePixelFormat ||
-			(*it).first == Profile::avProfileWidth ||
-			(*it).first == Profile::avProfileHeight ||
 			(*it).first == Profile::avProfileFrameRate )
 			continue;
 
@@ -239,8 +231,6 @@ void OutputVideo::setProfile( Profile::ProfileDesc& desc, const avtranscoder::Im
 			(*it).first == Profile::avProfileType ||
 			(*it).first == Profile::avProfileCodec ||
 			(*it).first == Profile::avProfilePixelFormat ||
-			(*it).first == Profile::avProfileWidth ||
-			(*it).first == Profile::avProfileHeight ||
 			(*it).first == Profile::avProfileFrameRate )
 			continue;
 
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -353,4 +353,14 @@ std::vector<std::string> OptionLoader::getSampleFormats( const std::string& audi
 	return sampleFormats;
 }
 
+AVPixelFormat OptionLoader::getAVPixelFormat( const std::string& pixelFormat )
+{
+	return av_get_pix_fmt( pixelFormat.c_str() );
+}
+
+AVSampleFormat OptionLoader::getAVSampleFormat( const std::string& sampleFormat )
+{
+	return av_get_sample_fmt( sampleFormat.c_str() );
+}
+
 }
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
@@ -63,17 +63,29 @@ class OptionLoader
 
 public:
 	/**
-	 *  Get array of pixel format supported by a video codec.
+	 *  @brief Get array of pixel format supported by video codec.
 	 *  @param videoCodecName: the video codec name (empty if not indicated, and so get all pixel formats supported by all video codecs).
 	 */
 	static std::vector<std::string> getPixelFormats( const std::string& videoCodecName = "" );
 	
 	/**
-	 *  Get array of sample format supported by an audio codec.
+	 *  @brief Get array of sample format supported by an audio codec.
 	 *  @param audioCodecName: the audio codec name (empty if not indicated, and so get all sample formats supported by all audio codecs).
 	 */
 	static std::vector<std::string> getSampleFormats( const std::string& audioCodecName = "" );
 	
+	/**
+	 * @brief Get the corresponding AVPixelFormat from the pixel format name
+	 * @param pixelFormat the name of the pixel format
+     */
+	static AVPixelFormat getAVPixelFormat( const std::string& pixelFormat );
+	
+	/**
+	 * @brief Get the corresponding AVSampleFormat from the sample format name
+	 * @param sampleFormat the name of the sample format
+     */
+	static AVSampleFormat getAVSampleFormat( const std::string& sampleFormat );
+	
 private:
 	/**
 	 * @brief: load array of Option depending on the flags.
diff --git a/src/AvTranscoder/Profile.cpp b/src/AvTranscoder/Profile.cpp
@@ -25,8 +25,6 @@ const std::string Profile::avProfileSampleFormat( "sample_fmt" );
 const std::string Profile::avProfileFrameRate( "r" );
 const std::string Profile::avProfileSampleRate( "ar" );
 const std::string Profile::avProfileChannel( "ac" );
-const std::string Profile::avProfileWidth( "width" );
-const std::string Profile::avProfileHeight( "height" );
 
 Profile::Profile( bool autoload )
 {
diff --git a/src/AvTranscoder/Profile.hpp b/src/AvTranscoder/Profile.hpp
@@ -25,9 +25,6 @@ class Profile
 	static const std::string avProfileFrameRate;
 	static const std::string avProfileSampleRate;
 	static const std::string avProfileChannel;
-	
-	static const std::string avProfileWidth;
-	static const std::string avProfileHeight;
 
 public:
 	// typedef std::pair< std::string, std::string > KeyDesc;

Original file line number	Diff line number	Diff line change
`@@ -353,4 +353,14 @@ std::vector<std::string> OptionLoader::getSampleFormats( const std::string& audi`
`353`	`353`	`return sampleFormats;`
`354`	`354`	`}`
`355`	`355`
	`356`	`+AVPixelFormat OptionLoader::getAVPixelFormat( const std::string& pixelFormat )`
	`357`	`+{`
	`358`	`+ return av_get_pix_fmt( pixelFormat.c_str() );`
	`359`	`+}`
	`360`	`+`
	`361`	`+AVSampleFormat OptionLoader::getAVSampleFormat( const std::string& sampleFormat )`
	`362`	`+{`
	`363`	`+ return av_get_sample_fmt( sampleFormat.c_str() );`
	`364`	`+}`
	`365`	`+`
`356`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ const std::string Profile::avProfileSampleFormat( "sample_fmt" );`
`25`	`25`	`const std::string Profile::avProfileFrameRate( "r" );`
`26`	`26`	`const std::string Profile::avProfileSampleRate( "ar" );`
`27`	`27`	`const std::string Profile::avProfileChannel( "ac" );`
`28`		`-const std::string Profile::avProfileWidth( "width" );`
`29`		`-const std::string Profile::avProfileHeight( "height" );`
`30`	`28`
`31`	`29`	`Profile::Profile( bool autoload )`
`32`	`30`	`{`