modifications to build with MSVC 10

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 7d2bb97968da · 2014-02-24T18:41:33.000+01:00
diff --git a/app/SConscript b/app/SConscript
@@ -6,7 +6,7 @@ env = Environment().Clone()
 
 Import( 'env' )
 
-env.Program(
+avmeta = env.Program(
         'avmeta',
         Glob( 'avMeta/*.cpp' ),
         LIBS = [
@@ -29,3 +29,5 @@ env.Program(
                 'swscale',
                 ]
         )
+
+env.Depends( avmeta, sAvTranscoder )
diff --git a/src/AvTranscoder/ColorTransform.hpp b/src/AvTranscoder/ColorTransform.hpp
@@ -12,7 +12,7 @@ class SwsContext;
 namespace avtranscoder
 {
 
-class ColorTransform
+AvExport class ColorTransform
 {
 public:
 	ColorTransform();
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.hpp b/src/AvTranscoder/DatasStructures/AudioDesc.hpp
@@ -18,7 +18,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-class AudioDesc
+class AvExport AudioDesc
 {
 public:
 	AudioDesc( const std::string& codecName = "" );
diff --git a/src/AvTranscoder/DatasStructures/Image.hpp b/src/AvTranscoder/DatasStructures/Image.hpp
@@ -34,17 +34,17 @@ typedef std::vector< unsigned char > DataBuffer;
 // 	//EColorRange     eColorRange;
 // };
 
-class ImageDesc
+class AvExport ImageDesc
 {
 public:
 	ImageDesc()
 	{};
 
 	void setWidth ( const size_t width     ) { m_width = width; }
 	void setHeight( const size_t height    ) { m_height = height; }
-	void setPixel ( const Pixel& pixel     ) { m_pixel = pixel; }
+	void setPixel ( const Pixel  pixel     ) { m_pixel = pixel; }
 	void setDar   ( const size_t num, const size_t den ) { m_displayAspectRatio.num = num; m_displayAspectRatio.den = den; }
-	void setDar   ( const Ratio ratio ) { m_displayAspectRatio = ratio; }
+	void setDar   ( const Ratio  ratio     ) { m_displayAspectRatio = ratio; }
 
 	size_t               getWidth ()    const { return m_width;  }
 	size_t               getHeight()    const { return m_height; }
@@ -78,7 +78,7 @@ class ImageDesc
 	bool            m_topFieldFirst;
 };
 
-class Image
+class AvExport Image
 {
 public:
 	Image( const ImageDesc& ref )
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.hpp b/src/AvTranscoder/DatasStructures/VideoDesc.hpp
@@ -18,7 +18,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-class VideoDesc
+class AvExport VideoDesc
 {
 public:
 	VideoDesc( const std::string& codecName = "" );
diff --git a/src/AvTranscoder/InputFile.cpp b/src/AvTranscoder/InputFile.cpp
@@ -62,7 +62,7 @@ InputFile& InputFile::analyse()
 	m_properties.formatLongName = m_formatContext->iformat->long_name;
 	m_properties.streamsCount = m_formatContext->nb_streams;
 	m_properties.programsCount = m_formatContext->nb_programs;
-	m_properties.startTime = 1.0 * (uint)m_formatContext->start_time / AV_TIME_BASE;
+	m_properties.startTime = 1.0 * (unsigned int)m_formatContext->start_time / AV_TIME_BASE;
 	m_properties.duration = 1.0 * m_formatContext->duration / AV_TIME_BASE;
 	m_properties.bitRate = m_formatContext->bit_rate;
 	m_properties.packetSize = m_formatContext->packet_size;
diff --git a/src/AvTranscoder/InputFile.hpp b/src/AvTranscoder/InputFile.hpp
@@ -20,7 +20,7 @@ class AVCodecContext;
 namespace avtranscoder
 {
 
-class InputFile
+class AvExport InputFile
 {
 public:
 	InputFile( const std::string& filename );
diff --git a/src/AvTranscoder/InputStream.hpp b/src/AvTranscoder/InputStream.hpp
@@ -18,7 +18,7 @@ extern "C" {
 namespace avtranscoder
 {
 
-class InputStream
+class AvExport InputStream
 {
 public:
 	InputStream( const std::string& filename, const size_t streamIndex );
diff --git a/src/AvTranscoder/InputStreamAudio.hpp b/src/AvTranscoder/InputStreamAudio.hpp
@@ -7,7 +7,7 @@
 namespace avtranscoder
 {
 
-class InputStreamAudio
+class AvExport InputStreamAudio
 {
 public:
 	InputStreamAudio( const InputStream& inputStream );
diff --git a/src/AvTranscoder/InputStreamData.hpp b/src/AvTranscoder/InputStreamData.hpp
@@ -6,7 +6,7 @@
 namespace avtranscoder
 {
 
-class InputStreamData
+class AvExport InputStreamData
 {
 public:
 	InputStreamData(){};
diff --git a/src/AvTranscoder/InputStreamVideo.hpp b/src/AvTranscoder/InputStreamVideo.hpp
@@ -14,7 +14,7 @@ class AVFrame;
 namespace avtranscoder
 {
 
-class InputStreamVideo
+class AvExport InputStreamVideo
 {
 public:
 	InputStreamVideo( const InputStream& inputStream );
diff --git a/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp b/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp
@@ -11,6 +11,11 @@ extern "C" {
 #include <libavutil/pixdesc.h>
 }
 #include <iostream>
+#ifdef _MSC_VER
+#include <float.h>
+#define isnan _isnan
+#define isinf(x) (!_finite(x))
+#endif
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/OutputFile.hpp b/src/AvTranscoder/OutputFile.hpp
@@ -17,7 +17,7 @@ class AVCodecContext;
 namespace avtranscoder
 {
 
-class OutputFile
+class AvExport OutputFile
 {
 public:
 	OutputFile( const std::string& file = "" );
@@ -26,9 +26,6 @@ class OutputFile
 
 	void addVideoStream( const VideoDesc& videoDesc );
 
-
-	void addVideoStream( const std::string& codecName );
-
 	bool addAudioStream( );
 
 	bool wrap( const DataStream& data, const size_t streamId );
diff --git a/src/AvTranscoder/OutputStreamVideo.hpp b/src/AvTranscoder/OutputStreamVideo.hpp
@@ -23,14 +23,14 @@ class AVCodecContext;
 namespace avtranscoder
 {
 
-class OutputStreamVideo : public OutputStream
+class AvExport OutputStreamVideo : public OutputStream
 {
 public:
 	OutputStreamVideo();
 
 	bool setup();
 
-	void setVideoDesc( const VideoDesc& videoDesc );
+	//void setVideoDesc( const VideoDesc& videoDesc );
 
 	/**
 	 * @param[out] codecFrame blabla
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -10,6 +10,7 @@
 
 #include <AvTranscoder/DatasStructures/Pixel.hpp>
 #include <AvTranscoder/DatasStructures/Image.hpp>
+#include <AvTranscoder/DatasStructures/AudioFrame.hpp>
 #include <AvTranscoder/DatasStructures/VideoDesc.hpp>
 #include <AvTranscoder/DatasStructures/AudioDesc.hpp>
 #include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
@@ -40,6 +41,7 @@ namespace std {
 
 %include <AvTranscoder/DatasStructures/Pixel.hpp>
 %include <AvTranscoder/DatasStructures/Image.hpp>
+%include <AvTranscoder/DatasStructures/AudioFrame.hpp>
 %include <AvTranscoder/DatasStructures/VideoDesc.hpp>
 %include <AvTranscoder/DatasStructures/AudioDesc.hpp>
 %include <AvTranscoder/DatasStructures/DataStreamDesc.hpp>
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -3,6 +3,23 @@
 
 #include <string>
 
+#ifdef SWIG
+ #define AvExport
+#else
+#if ( defined( WIN32 ) || defined( WIN64 ) || defined( _WIN32 ) || defined( _WIN64 ) || defined( __WINDOWS__ ) || defined( __TOS_WIN__ ) || defined( __WIN32__ ) )
+ #define AvExport __declspec( dllexport )
+#elif defined( __GNUC__ )     // Add compiler definition here...
+ #if __GNUC__ - 0 > 3 || ( __GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 2 )
+  #define AvExport __attribute__ ( ( visibility( "default" ) ) )
+ #else
+  #define AvExport
+  #warning "AvExport not set because of a too old gcc version. The plug-in may not compile with the option -fvisible=hidden."
+ #endif
+#else
+ #error "AvExport not defined for this compiler..."
+#endif
+#endif
+
 namespace avtranscoder
 {
 
diff --git a/src/SConscript b/src/SConscript
@@ -6,36 +6,40 @@ Import( "envJava" )
 Import( "envPy" )
 
 sAvTranscoder = env.StaticLibrary(
-    'AvTranscoder',
+    'sAvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ) ,
     LIBS = [
         'libavutil',
         'libavcodec',
         'libavformat',
         'libswscale',
-        'pthread',
+        #'pthread',
     ]
 )
 
-AvTranscoder = env.SharedLibrary(
+SharedAvTranscoder = env.SharedLibrary(
     'AvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ) ,
     LIBS = [
         'libavutil',
         'libavcodec',
         'libavformat',
         'libswscale',
-        'pthread',
+        #'pthread',
     ]
 )
 
-# jAvTranscoder = envJava.SharedLibrary(
-#         'jAvTranscoder',
-#         source=['AvTranscoder/avTranscoder.i'],
-#         LIBS=[ 
-#             sAvTranscoder
-#         ],
-#     )
+jAvTranscoder = envJava.SharedLibrary(
+        'jAvTranscoder',
+        source=['AvTranscoder/avTranscoder.i'],
+        LIBS=[ 
+            sAvTranscoder,
+            'libavutil',
+            'libavcodec',
+            'libavformat',
+            'libswscale',
+        ],
+    )
 
 # pyAvTranscoder = envPy.SharedLibrary(
 #         'pyAvTranscoder',
@@ -59,5 +63,5 @@ AvTranscoder = env.SharedLibrary(
 # env.Depends( avTranscoder_jar, avTranscoder_class )
 
 Export( { 'sAvTranscoder' : sAvTranscoder } )
-Export( { 'AvTranscoder'  : AvTranscoder } )
+Export( { 'AvTranscoder'  : 'AvTranscoder' } )
 # Export( { 'AvTranscoder_jar': avTranscoder_class } )

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ env = Environment().Clone()`
`6`	`6`
`7`	`7`	`Import( 'env' )`
`8`	`8`
`9`		`-env.Program(`
	`9`	`+avmeta = env.Program(`
`10`	`10`	`'avmeta',`
`11`	`11`	`Glob( 'avMeta/*.cpp' ),`
`12`	`12`	`LIBS = [`
`@@ -29,3 +29,5 @@ env.Program(`
`29`	`29`	`'swscale',`
`30`	`30`	`]`
`31`	`31`	`)`
	`32`	`+`
	`33`	`+env.Depends( avmeta, sAvTranscoder )`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class SwsContext;`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
`14`	`14`
`15`		`-class ColorTransform`
	`15`	`+AvExport class ColorTransform`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`	`18`	`ColorTransform();`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ extern "C" {`
`18`	`18`	`namespace avtranscoder`
`19`	`19`	`{`
`20`	`20`
`21`		`-class AudioDesc`
	`21`	`+class AvExport AudioDesc`
`22`	`22`	`{`
`23`	`23`	`public:`
`24`	`24`	`AudioDesc( const std::string& codecName = "" );`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class AVCodecContext;`
`20`	`20`	`namespace avtranscoder`
`21`	`21`	`{`
`22`	`22`
`23`		`-class InputFile`
	`23`	`+class AvExport InputFile`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`	`26`	`InputFile( const std::string& filename );`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
`9`	`9`
`10`		`-class InputStreamAudio`
	`10`	`+class AvExport InputStreamAudio`
`11`	`11`	`{`
`12`	`12`	`public:`
`13`	`13`	`InputStreamAudio( const InputStream& inputStream );`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace avtranscoder`
`7`	`7`	`{`
`8`	`8`
`9`		`-class InputStreamData`
	`9`	`+class AvExport InputStreamData`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`	`12`	`InputStreamData(){};`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class AVFrame;`
`14`	`14`	`namespace avtranscoder`
`15`	`15`	`{`
`16`	`16`
`17`		`-class InputStreamVideo`
	`17`	`+class AvExport InputStreamVideo`
`18`	`18`	`{`
`19`	`19`	`public:`
`20`	`20`	`InputStreamVideo( const InputStream& inputStream );`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,11 @@ extern "C" {`
`11`	`11`	`#include <libavutil/pixdesc.h>`
`12`	`12`	`}`
`13`	`13`	`#include <iostream>`
	`14`	`+#ifdef _MSC_VER`
	`15`	`+#include <float.h>`
	`16`	`+#define isnan _isnan`
	`17`	`+#define isinf(x) (!_finite(x))`
	`18`	`+#endif`
`14`	`19`
`15`	`20`	`namespace avtranscoder`
`16`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class AVCodecContext;`
`17`	`17`	`namespace avtranscoder`
`18`	`18`	`{`
`19`	`19`
`20`		`-class OutputFile`
	`20`	`+class AvExport OutputFile`
`21`	`21`	`{`
`22`	`22`	`public:`
`23`	`23`	`OutputFile( const std::string& file = "" );`
`@@ -26,9 +26,6 @@ class OutputFile`
`26`	`26`
`27`	`27`	`void addVideoStream( const VideoDesc& videoDesc );`
`28`	`28`
`29`		`-`
`30`		`- void addVideoStream( const std::string& codecName );`
`31`		`-`
`32`	`29`	`bool addAudioStream( );`
`33`	`30`
`34`	`31`	`bool wrap( const DataStream& data, const size_t streamId );`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ class AVCodecContext;`
`23`	`23`	`namespace avtranscoder`
`24`	`24`	`{`
`25`	`25`
`26`		`-class OutputStreamVideo : public OutputStream`
	`26`	`+class AvExport OutputStreamVideo : public OutputStream`
`27`	`27`	`{`
`28`	`28`	`public:`
`29`	`29`	`OutputStreamVideo();`
`30`	`30`
`31`	`31`	`bool setup();`
`32`	`32`
`33`		`- void setVideoDesc( const VideoDesc& videoDesc );`
	`33`	`+ //void setVideoDesc( const VideoDesc& videoDesc );`
`34`	`34`
`35`	`35`	`/**`
`36`	`36`	`* @param[out] codecFrame blabla`