OptionLoader: getPixelFormats and getSampleFormats are static

Clement Champetier · Clement Champetier · commit e07fb930647a · 2014-07-18T10:42:02.000+02:00
You can get the list of pixel formats and sample formats without an
instance of OptionLoader.

Conflicts:

	src/AvTranscoder/OptionLoader.cpp
	src/AvTranscoder/OptionLoader.hpp
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -276,7 +276,7 @@ OptionLoader::OptionArray OptionLoader::loadOptions( void* av_class, int req_fla
 	return options;
 }
 
-std::vector<std::string> OptionLoader::getPixelFormats( const std::string& videoCodecName ) const
+std::vector<std::string> OptionLoader::getPixelFormats( const std::string& videoCodecName )
 {
 	std::vector<std::string> pixelFormats;
 	
@@ -322,4 +322,34 @@ std::vector<std::string> OptionLoader::getPixelFormats( const std::string& video
 	return pixelFormats;
 }
 
+std::vector<std::string> OptionLoader::getSampleFormats( const std::string& audioCodecName )
+{
+	std::vector<std::string> sampleFormats;
+	
+	if( audioCodecName.empty() )
+	{
+		for( size_t sampleFormat = 0; sampleFormat < AV_SAMPLE_FMT_NB; ++sampleFormat)
+		{
+			sampleFormats.push_back( av_get_sample_fmt_name( static_cast<AVSampleFormat>( sampleFormat ) ) );
+		}
+	}
+	else
+	{
+		const AVCodec* audioCodec = avcodec_find_encoder_by_name( audioCodecName.c_str() );
+		if( audioCodec && audioCodec->sample_fmts != NULL )
+		{
+			size_t sample_fmt = 0;
+			while( audioCodec->sample_fmts[sample_fmt] != -1 )
+			{
+				const char* sampleFormatName = av_get_sample_fmt_name( audioCodec->sample_fmts[sample_fmt] );
+				if( sampleFormatName )
+					sampleFormats.push_back( std::string( sampleFormatName ) );
+				sample_fmt++;
+			}
+		}
+	}
+	
+	return sampleFormats;
+}
+
 }
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
@@ -60,12 +60,19 @@ class OptionLoader
 	
 	std::vector<std::string>& getAudioCodecsLongNames() { return _audioCodecsLongNames; }
 	std::vector<std::string>& getAudioCodecsShortNames() { return _audioCodecsShortNames; }
-	
+
+public:
 	/**
 	 *  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).
 	 */
-	std::vector<std::string> getPixelFormats( const std::string& videoCodecName = "" ) const;
+	static std::vector<std::string> getPixelFormats( const std::string& videoCodecName = "" );
+	
+	/**
+	 *  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 = "" );
 	
 private:
 	/**
