OptionLoader: add format and codec context attributes

Clement Champetier · Clement Champetier · commit 163210e2d08e · 2014-06-11T14:31:55.000+02:00
* In loadOptions function, choose what ffmpeg / libav object on which
we'll scan AVOption: avFormat or avCodec.
* Update OptionChecker app: no need to get a codecContext from the
audioDesc of a stream of an InputFile !
diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -1,21 +1,14 @@
-#include <AvTranscoder/InputFile.hpp>
-#include <AvTranscoder/DatasStructures/AudioDesc.hpp>
-
 #include <AvTranscoder/OptionLoader.hpp>
+#include <AvTranscoder/Option.hpp>
 
 #include <string>
 #include <iostream>
 #include <utility> //pair
 
 int optionChecker( const std::string& inputfilename )
-{
-	avtranscoder::InputFile inputFile( inputfilename );
-	inputFile.analyse();
-	
-	avtranscoder::AudioDesc audioDesc( inputFile.getStream( 0 ).getAudioDesc() );
-	
+{	
 	avtranscoder::OptionLoader optionLoader;
-	optionLoader.loadOptions( audioDesc.getCodecContext(), 0, 0 );
+	optionLoader.loadOptions( 0, 0 );
 	
 	// display Options
 	for( auto option : optionLoader.getOptions() )
diff --git a/src/AvTranscoder/OptionLoader.cpp b/src/AvTranscoder/OptionLoader.cpp
@@ -17,17 +17,49 @@ namespace avtranscoder
 
 OptionLoader::OptionLoader()
 	: m_options()
+	, m_avFormatContext( NULL )
+	, m_avCodecContext( NULL )
 {
+	m_avFormatContext = avformat_alloc_context();
 	
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 53, 8, 0 )
+	m_avCodecContext = avcodec_alloc_context();
+	// deprecated in the same version
+	//m_avCodecContext = avcodec_alloc_context2( AVMEDIA_TYPE_UNKNOWN );
+#else
+	AVCodec* avCodec = NULL;
+	m_avCodecContext = avcodec_alloc_context3( avCodec );
+#endif
+}
+
+OptionLoader::~OptionLoader()
+{
+	avformat_free_context( m_avFormatContext );
+	avcodec_close( m_avCodecContext );
 }
 
-void OptionLoader::loadOptions( void* av_class, int req_flags, int rej_flags )
+void OptionLoader::loadOptions( int req_flags, int rej_flags )
 {
 	std::map<std::string, int> optionUnitToIndex;
 	std::vector<Option> childOptions;
 	
 	const AVOption* avOption = NULL;
-
+	
+	// get ffmpeg / libav object on which we'll scan AVOption
+	void* av_class = NULL;
+	if( ( req_flags & AV_OPT_FLAG_VIDEO_PARAM ) == AV_OPT_FLAG_VIDEO_PARAM ||
+		( req_flags & AV_OPT_FLAG_AUDIO_PARAM ) == AV_OPT_FLAG_AUDIO_PARAM ||
+		( req_flags & AV_OPT_FLAG_METADATA ) == AV_OPT_FLAG_METADATA ||
+		( req_flags & AV_OPT_FLAG_FILTERING_PARAM ) == AV_OPT_FLAG_FILTERING_PARAM ||
+		( req_flags & AV_OPT_FLAG_SUBTITLE_PARAM ) == AV_OPT_FLAG_SUBTITLE_PARAM )
+	{
+		av_class = (void*)m_avCodecContext;
+	}
+	else
+	{
+		av_class = (void*)m_avFormatContext;
+	}
+	
 	// iterate on options
 	while( ( avOption = av_opt_next( av_class, avOption ) ) != NULL )
 	{	
@@ -65,7 +97,7 @@ void OptionLoader::loadOptions( void* av_class, int req_flags, int rej_flags )
 		
 		m_options.at( indexParentOption ).appendChild( *it );
 		
-		// child to a Choice
+		// child of a Choice
 		if( m_options.at( indexParentOption ).getType() == TypeChoice )
 		{
 			if( it->getDefaultValueInt() == m_options.at( indexParentOption ).getDefaultValueInt() )
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
@@ -3,6 +3,14 @@
 
 #include <AvTranscoder/Option.hpp>
 
+extern "C" {
+#ifndef __STDC_CONSTANT_MACROS
+	#define __STDC_CONSTANT_MACROS
+#endif
+	#include <libavcodec/avcodec.h>
+	#include <libavformat/avformat.h>
+}
+
 #include <vector>
 
 namespace avtranscoder
@@ -16,16 +24,26 @@ class OptionLoader
 {
 public:
 	OptionLoader();
+	~OptionLoader();
 	
 	std::vector<Option>& getOptions() { return m_options; }
 	
+	const AVFormatContext* getFormatContext() const { return m_avFormatContext; }
+	const AVCodecContext* getCodecContext() const { return m_avCodecContext; }
+	
 	/**
-     * @param av_class: a libav / ffmpeg object which contains AVOption.
+	 * @brief: load array of Option depending on the flags.
+     * @param req_flags
+     * @param rej_flags
      */
-	void loadOptions( void* av_class, int req_flags, int rej_flags );
+	void loadOptions( int req_flags, int rej_flags );
 	
 private:
 	std::vector<Option> m_options;
+	
+	AVFormatContext* m_avFormatContext;
+	AVCodecContext* m_avCodecContext;
+
 };
 
 }
