OptionLoader: get all pixel formats supported by all video codecs

Clement Champetier · Clement Champetier · commit 8a98e1aaf94a · 2014-06-23T15:06:50.000+02:00
* To do this, call getPixelFormats function with no videoCodec informed
(empty string by default).
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -276,28 +276,35 @@ std::vector<std::string> OptionLoader::getPixelFormats ( const std::string& vide
 {
 	std::vector<std::string> pixelFormats;
 	
-	AVCodec* videoCodec = avcodec_find_encoder_by_name( videoCodecName.c_str() );
-	
-	if( videoCodec->pix_fmts == 0 )
+	// all video codec concerned
+	if( videoCodecName == "" )
 	{
-		for( int pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++ )
+		for( int pix_fmt = 0; pix_fmt < PIX_FMT_NB; ++pix_fmt )
 		{
-			const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[pix_fmt];
+			const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[pix_fmt];
 			if( ! pix_desc->name )
 				continue;
 			pixelFormats.push_back( std::string( pix_desc->name ) );
 		}
-		return pixelFormats;
 	}
-	
-	int i = 0;
-	while( videoCodec->pix_fmts[i] != -1 )
+	// specific video codec
+	else
 	{
-		const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ videoCodec->pix_fmts[i] ];
-		pixelFormats.push_back( std::string( pix_desc->name ) );
-		i++;
+		AVCodec* videoCodec = avcodec_find_encoder_by_name( videoCodecName.c_str() );
+
+		if( videoCodec->pix_fmts != NULL )
+		{
+			size_t pix_fmt = 0;
+			while( videoCodec->pix_fmts[pix_fmt] != -1 )
+			{
+				const AVPixFmtDescriptor* pix_desc = &av_pix_fmt_descriptors[ videoCodec->pix_fmts[pix_fmt] ];
+				if( ! pix_desc->name )
+					continue;
+				pixelFormats.push_back( std::string( pix_desc->name ) );
+				++pix_fmt;
+			}
+		}
 	}
-	
 	return pixelFormats;
 }
 
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
@@ -63,8 +63,9 @@ class OptionLoader
 	
 	/**
 	 *  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;
+	std::vector<std::string> getPixelFormats( const std::string& videoCodecName = "" ) const;
 	
 private:
 	/**
