avTranscoder · MarcAntoine-Arnaud · Oct 16, 2014 · Sep 24, 2014 · Sep 17, 2014 · Sep 17, 2014
diff --git a/app/avTranscoder/avTranscoder.cpp b/app/avTranscoder/avTranscoder.cpp
@@ -4,11 +4,15 @@
 
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
+
+#include <AvTranscoder/frame/Frame.hpp>
+
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
 #include <AvTranscoder/essenceStream/AvOutputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvOutputVideo.hpp>
-#include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
+
+#include <AvTranscoder/transform/VideoTransform.hpp>
 
 #include <AvTranscoder/progress/ConsoleProgress.hpp>
 
@@ -28,15 +32,15 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 
 	// init video decoders
 	AvInputVideo inputVideo( input.getStream( 0 ) );
-	VideoFrameDesc VideoFrameDesc = input.getStream( 0 ).getVideoDesc().getVideoFrameDesc();
+	VideoFrameDesc VideoFrameDesc = input.getStream( 0 ).getVideoCodec().getVideoFrameDesc();
 	VideoFrame sourceImage( VideoFrameDesc );
 
 	// init video encoder
 	AvOutputVideo outputVideo;
 	outputVideo.setProfile( profile.getProfile( "xdcamhd422" ), VideoFrameDesc );
-	VideoFrame imageToEncode( outputVideo.getVideoDesc().getVideoFrameDesc() );
+	VideoFrame imageToEncode( outputVideo.getVideoCodec().getVideoFrameDesc() );
 
-	DataStream codedImage;
+	CodedData codedImage;
 
 	// setup wrapper
 	//mxftkwrapper::MxftkOutputFile of( outputFilename );
@@ -49,11 +53,11 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
 		exit( -1 );
 	}
 
-	of.addVideoStream( outputVideo.getVideoDesc() );
+	of.addVideoStream( outputVideo.getVideoCodec() );
 
 	of.beginWrap();
 
-	VideoEssenceTransform ct;
+	VideoTransform ct;
 
 
 	// Encodage/transcodage

diff --git a/app/avplay/AvReader.hpp b/app/avplay/AvReader.hpp
@@ -4,7 +4,7 @@
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
-#include <AvTranscoder/essenceTransform/VideoEssenceTransform.hpp>
+#include <AvTranscoder/transform/VideoTransform.hpp>
 #include <AvTranscoder/mediaProperty/printMediaProperty.hpp>
 
 #include <AvTranscoder/progress/ConsoleProgress.hpp>
@@ -31,7 +31,7 @@ class AvReader : public Reader
 
 		_inputVideo->setup();
 
-		_sourceImage = new avtranscoder::VideoFrame( _inputFile.getStream( _videoStream ).getVideoDesc().getVideoFrameDesc() );
+		_sourceImage = new avtranscoder::VideoFrame( _inputFile.getStream( _videoStream ).getVideoCodec().getVideoFrameDesc() );
 
 		_pixel.setBitsPerPixel( getComponents() * getBitDepth() );
 		_pixel.setComponents( getComponents() );
@@ -80,7 +80,7 @@ class AvReader : public Reader
 	{
 		++_currentFrame;
 		_inputVideo->readNextFrame( *_sourceImage );
-		_videoEssenceTransform.convert( *_sourceImage, *_imageToDisplay );
+		_videoTransform.convert( *_sourceImage, *_imageToDisplay );
 		return (const char*)_imageToDisplay->getPtr();
 	}
 
@@ -114,7 +114,7 @@ class AvReader : public Reader
 	avtranscoder::Pixel          _pixel;
 	avtranscoder::VideoFrameDesc _videoFrameDescToDisplay;
 
-	avtranscoder::VideoEssenceTransform _videoEssenceTransform;
+	avtranscoder::VideoTransform _videoTransform;
 	size_t _videoStream;
 };
 

diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp
@@ -15,8 +15,7 @@ static const std::string dummyPixelFormat = "yuv420p";
 static const std::string dummyVideoCodec = "mpeg2video";
 static const std::string dummyAudioCodec = "pcm_s16le";
 
-// bool verbose = false;
-bool verbose = true;
+bool verbose = false;
 
 void parseConfigFile( const std::string& configFilename, avtranscoder::Transcoder& transcoder, avtranscoder::Profile& profile )
 {
@@ -55,7 +54,7 @@ void parseConfigFile( const std::string& configFilename, avtranscoder::Transcode
 					std::cout << std::endl;
 				}
 
-				// dummy stream, need a CodedDesc (audio or video)
+				// dummy stream, need a ICodec (audio or video)
 				if( ! filename.length() )
 				{
 					// video
@@ -66,10 +65,10 @@ void parseConfigFile( const std::string& configFilename, avtranscoder::Transcode
 					avtranscoder::Pixel inputPixel( dummyPixelFormat );
 					imageDesc.setPixel( inputPixel );
 
-					avtranscoder::VideoDesc inputVideoDesc( dummyVideoCodec );
-					inputVideoDesc.setImageParameters( imageDesc );
+					avtranscoder::VideoCodec inputVideoCodec( avtranscoder::eCodecTypeEncoder, dummyVideoCodec );
+					inputVideoCodec.setImageParameters( imageDesc );
 
-					transcoder.add( filename, streamIndex, subStreamIndex, transcodeProfile, inputVideoDesc );
+					transcoder.add( filename, streamIndex, subStreamIndex, transcodeProfile, inputVideoCodec );
 				}
 				else
 				{

diff --git a/app/optionChecker/optionChecker.cpp b/app/optionChecker/optionChecker.cpp
@@ -1,13 +1,16 @@
-#include <AvTranscoder/option/OptionLoader.hpp>
+#include <AvTranscoder/util.hpp>
+#include <AvTranscoder/option/Context.hpp>
+#include <AvTranscoder/option/CodecContext.hpp>
 #include <AvTranscoder/option/Option.hpp>
+#include <AvTranscoder/file/InputFile.hpp>
 
 #include <string>
 #include <iostream>
 #include <map>
 #include <vector>
-#include <utility> //pair
+#include <utility>
 
-void displayOptions( avtranscoder::OptionLoader::OptionArray& options )
+void displayOptions( const std::vector<avtranscoder::Option>& options )
 {
 	for( auto option : options )
 	{
@@ -20,74 +23,89 @@ void displayOptions( avtranscoder::OptionLoader::OptionArray& options )
 
 		// get default value
 
-		if( option.getType() == avtranscoder::TypeInt )
+		if( option.getType() == avtranscoder::eOptionBaseTypeInt )
 		{
-			std::cout << "DefaultValue: " << option.getDefaultValueInt() << std::endl;
+			std::cout << "DefaultValue: " << option.getDefaultInt() << std::endl;
 		}
-		else if( option.getType() == avtranscoder::TypeBool )
+		else if( option.getType() == avtranscoder::eOptionBaseTypeBool )
 		{
-			std::cout << "DefaultValue: " << option.getDefaultValueBool() << std::endl;
+			std::cout << "DefaultValue: " << option.getDefaultBool() << std::endl;
 		}
-		else if( option.getType() == avtranscoder::TypeDouble )
+		else if( option.getType() == avtranscoder::eOptionBaseTypeDouble )
 		{
-			std::cout << "DefaultValue: " << option.getDefaultValueDouble() << std::endl;
+			std::cout << "DefaultValue: " << option.getDefaultDouble() << std::endl;
 		}
-		else if( option.getType() == avtranscoder::TypeRatio )
+		else if( option.getType() == avtranscoder::eOptionBaseTypeRatio )
 		{
-			std::cout << "DefaultValue: " << option.getDefaultValueRatio().first << ", " << option.getDefaultValueRatio().second << std::endl;
+			std::cout << "DefaultValue: " << option.getDefaultRatio().first << ", " << option.getDefaultRatio().second << std::endl;
 		}
-		else if( option.getType() == avtranscoder::TypeString )
+		else if( option.getType() == avtranscoder::eOptionBaseTypeString )
 		{
-			std::cout << "DefaultValue: " << option.getDefaultValueString() << std::endl;
+			std::cout << "DefaultValue: " << option.getDefaultString() << std::endl;
 		}
-		else if( option.getType() == avtranscoder::TypeChoice )
+		else if( option.getType() == avtranscoder::eOptionBaseTypeChoice )
 		{
-			std::cout << "Nb choices: " << option.getNbChilds() << std::endl;
+			std::cout << "Nb choices: " << option.getChilds().size() << std::endl;
 			std::cout << "Default choice index: " << option.getDefaultChildIndex() << std::endl;
-			for(size_t i = 0; i < option.getNbChilds(); ++i )
+			for(size_t i = 0; i < option.getChilds().size(); ++i )
 				std::cout << "Choice " << i << ": " << 
-					option.getChild( i ).getName() << " // " << 
-					option.getChild( i ).getHelp() << std::endl;
+					option.getChildAtIndex( i ).getName() << " // " << 
+					option.getChildAtIndex( i ).getHelp() << std::endl;
 		}
-		else if( option.getType() == avtranscoder::TypeGroup )
+		else if( option.getType() == avtranscoder::eOptionBaseTypeGroup )
 		{
-			std::cout << "Nb choices: " << option.getNbChilds() << std::endl;
-			for(size_t i = 0; i < option.getNbChilds(); ++i )
+			std::cout << "Nb choices: " << option.getChilds().size() << std::endl;
+			for(size_t i = 0; i < option.getChilds().size(); ++i )
 				std::cout << "Element " << i << ": " << 
-					option.getChild( i ).getName() << " // " <<
-					option.getChild( i ).getDefaultValueBool() << std::endl;
+					option.getChildAtIndex( i ).getName() << " // " <<
+					option.getChildAtIndex( i ).getDefaultBool() << std::endl;
 		}
 	}
 }
 
 void optionChecker( const std::string& inputfilename )
-{	
-	avtranscoder::OptionLoader optionLoader;
-
-	//avtranscoder::OptionLoader::OptionArray optionsArray = optionLoader.loadOptions( AV_OPT_FLAG_AUDIO_PARAM );
-	avtranscoder::OptionLoader::OptionMap optionsMap = optionLoader.loadOutputFormatOptions();
-
-	//displayOptions( optionsArray );
-	for( avtranscoder::OptionLoader::OptionMap::iterator it = optionsMap.begin();
-		it != optionsMap.end();
-		++it )
-	{
-		std::cout << "----- " << it->first << " -----" << std::endl;
-		displayOptions( it->second );
-	}
+{
+	avtranscoder::InputFile file( inputfilename );
+
+	// format options
+	avtranscoder::Context formatContext( &file.getFormatContext() );
+	std::vector<avtranscoder::Option> formatOptions = formatContext.getOptions();
+	displayOptions( formatOptions );
+
+	// codec options
+	avtranscoder::CodecContext codecContext( AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM );
+	std::vector<avtranscoder::Option> codecOptions = codecContext.getOptions();
+	displayOptions( codecOptions );
+
+	// pixel formats
+//	std::vector<std::string> pixelFormats = avtranscoder::getPixelFormats();
+//	for( size_t i = 0; i < pixelFormats.size(); ++i )
+//	{
+//		std::cout << "----- " << pixelFormats[i] << " -----" << std::endl;
+//	}
+
+	// options per format
+//	std::map< std::string, std::vector<avtranscoder::Option> > optionsPerFormat = avtranscoder::getOutputFormatOptions();
+//	for( std::map< std::string, std::vector<avtranscoder::Option> >::iterator it = optionsPerFormat.begin();
+//		it != optionsPerFormat.end();
+//		++it )
+//	{
+//		std::cout << "----- " << it->first << " -----" << std::endl;
+//		displayOptions( it->second );
+//	}
 }
 
 int main( int argc, char** argv )
 {
+	std::cout << "start ..." << std::endl;
+
 	if( argc <= 1 )
 	{
 		std::cout << "audiorewrapper require a media filename" << std::endl;
 		std::cout << "example: audioWrap file.ext" << std::endl;
 		return( -1 );
 	}
 
-	std::cout << "start ..." << std::endl;
-
 	try
 	{
 		optionChecker( argv[1] );

diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
@@ -28,13 +28,13 @@ int main( int argc, char** argv )
 			if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
 			{
 				avtranscoder::AvOutputVideo outputVideo;
-				outputVideo.setProfile( profile, outputVideo.getVideoDesc().getVideoFrameDesc() );
+				outputVideo.setProfile( profile, outputVideo.getVideoCodec().getVideoFrameDesc() );
 			}
 
 			if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )
 			{
 				avtranscoder::AvOutputAudio outputAudio;
-				outputAudio.setProfile( profile, outputAudio.getAudioDesc().getFrameDesc() );
+				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getFrameDesc() );
 			}
 		}
 		catch( ... )

diff --git a/src/AvTranscoder/Library.cpp b/src/AvTranscoder/Library.cpp
@@ -1,9 +1,6 @@
 #include "Library.hpp"
 
 extern "C" {
-#ifndef __STDC_CONSTANT_MACROS
-    #define __STDC_CONSTANT_MACROS
-#endif
 #include <libavutil/version.h>
 #include <libavcodec/version.h>
 #include <libswscale/version.h>

diff --git a/src/AvTranscoder/Library.hpp b/src/AvTranscoder/Library.hpp
@@ -1,11 +1,11 @@
 #ifndef _AV_TRANSCODER_DESCRIPTION_HPP_
 #define _AV_TRANSCODER_DESCRIPTION_HPP_
 
+#include "common.hpp"
+
 #include <vector>
 #include <string>
 
-#include "common.hpp"
-
 namespace avtranscoder
 {
 

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -15,16 +15,15 @@
 
 #include <AvTranscoder/Profile.hpp>
 
-#include <AvTranscoder/essenceStructures/Pixel.hpp>
-#include <AvTranscoder/essenceStructures/Frame.hpp>
-#include <AvTranscoder/essenceStructures/VideoFrame.hpp>
-#include <AvTranscoder/essenceStructures/AudioFrame.hpp>
+#include <AvTranscoder/frame/Pixel.hpp>
+#include <AvTranscoder/frame/Frame.hpp>
+#include <AvTranscoder/frame/VideoFrame.hpp>
+#include <AvTranscoder/frame/AudioFrame.hpp>
 
-#include <AvTranscoder/codedStructures/CodedDesc.hpp>
-#include <AvTranscoder/codedStructures/VideoDesc.hpp>
-#include <AvTranscoder/codedStructures/AudioDesc.hpp>
-#include <AvTranscoder/codedStructures/DataDesc.hpp>
-#include <AvTranscoder/codedStructures/DataStream.hpp>
+#include <AvTranscoder/codec/ICodec.hpp>
+#include <AvTranscoder/codec/VideoCodec.hpp>
+#include <AvTranscoder/codec/AudioCodec.hpp>
+#include <AvTranscoder/codec/DataCodec.hpp>
 
 #include <AvTranscoder/mediaProperty/mediaProperty.hpp>
 
@@ -89,17 +88,15 @@ namespace std {
 
 %include <AvTranscoder/Profile.hpp>
 
-%include <AvTranscoder/essenceStructures/Pixel.hpp>
-%include <AvTranscoder/essenceStructures/Frame.hpp>
-%include <AvTranscoder/essenceStructures/VideoFrame.hpp>
-%include <AvTranscoder/essenceStructures/AudioFrame.hpp>
-
-%include <AvTranscoder/codedStructures/CodedDesc.hpp>
-%include <AvTranscoder/codedStructures/VideoDesc.hpp>
-%include <AvTranscoder/codedStructures/AudioDesc.hpp>
-%include <AvTranscoder/codedStructures/DataDesc.hpp>
-%include <AvTranscoder/codedStructures/DataStream.hpp>
+%include <AvTranscoder/frame/Pixel.hpp>
+%include <AvTranscoder/frame/Frame.hpp>
+%include <AvTranscoder/frame/VideoFrame.hpp>
+%include <AvTranscoder/frame/AudioFrame.hpp>
 
+%include <AvTranscoder/codec/ICodec.hpp>
+%include <AvTranscoder/codec/VideoCodec.hpp>
+%include <AvTranscoder/codec/AudioCodec.hpp>
+%include <AvTranscoder/codec/DataCodec.hpp>
 
 %include <AvTranscoder/mediaProperty/mediaProperty.hpp>