Merge pull request #226 from cchampet/dev_transcoderDefaultContructor

cchampet · cchampet · commit 0c33927a12c8 · 2016-02-15T13:55:08.000+01:00
SWIG: fixed some unknown types
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -17,18 +17,17 @@
 %include "AvTranscoder/swig/avOperator.i"
 
 %{
-#include <AvTranscoder/Library.hpp>
 #include <AvTranscoder/log.hpp>
 %}
 
 %include "AvTranscoder/progress/progress.i"
 %include "AvTranscoder/properties/properties.i"
-%include "AvTranscoder/data/data.i"
 %include "AvTranscoder/profile/profile.i"
+%include "AvTranscoder/data/data.i"
 
-%include <AvTranscoder/Library.hpp>
 %include <AvTranscoder/log.hpp>
 
+%include "AvTranscoder/library.i"
 %include "AvTranscoder/option.i"
 %include "AvTranscoder/util.i"
 %include "AvTranscoder/codec/codec.i"
diff --git a/src/AvTranscoder/library.i b/src/AvTranscoder/library.i
@@ -0,0 +1,15 @@
+%{
+#include <AvTranscoder/Library.hpp>
+%}
+
+namespace std {
+// Allow vector of object with no default constructor
+%ignore vector< avtranscoder::Library >::vector(size_type); 
+%ignore vector< avtranscoder::Library >::resize;
+
+// Create instantiations of a template classes
+%template(Libraries) vector< avtranscoder::Library >;
+%template(IntVector) vector< size_t >;
+}
+
+%include <AvTranscoder/Library.hpp>
diff --git a/src/AvTranscoder/option.i b/src/AvTranscoder/option.i
@@ -9,7 +9,7 @@ namespace std {
 
 // Create instantiations of a template classes
 %template(OptionArray) vector< avtranscoder::Option >;
-%template(IntPair) pair< size_t, size_t >;
+%template(IntPair) pair< int, int >;
 }
 
 %include <AvTranscoder/Option.hpp>
diff --git a/src/AvTranscoder/properties/properties.i b/src/AvTranscoder/properties/properties.i
@@ -46,6 +46,9 @@ namespace std {
 %template(ChannelVector)   vector< avtranscoder::Channel >;
 }
 
+%include <AvTranscoder/file/util.hpp>
+%include <AvTranscoder/file/FormatContext.hpp>
+
 %include <AvTranscoder/properties/util.hpp>
 %include <AvTranscoder/properties/FileProperties.hpp>
 %include <AvTranscoder/properties/PixelProperties.hpp>
diff --git a/src/AvTranscoder/transcoder/transcoder.i b/src/AvTranscoder/transcoder/transcoder.i
@@ -3,5 +3,7 @@
 #include <AvTranscoder/transcoder/Transcoder.hpp>
 %}
 
+%template(StreamTranscoderVector) std::vector< avtranscoder::StreamTranscoder* >;
+
 %include <AvTranscoder/transcoder/StreamTranscoder.hpp>
 %include <AvTranscoder/transcoder/Transcoder.hpp>
diff --git a/test/pyTest/testLibrary.py b/test/pyTest/testLibrary.py
@@ -0,0 +1,33 @@
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+
+def testListLibraries():
+    """
+    Check name and license of libraries.
+    """
+    librariesName = set(["avtranscoder", "avutil", "avformat", "avcodec", "avresample", "swresample", "swscale", "avfilter"])
+
+    for library in av.getLibraries():
+        libraryName = library.getName()
+        if libraryName == "avtranscoder":
+            assert_equals(library.getLicense(), "GPL v2 or LGPL v2.1")
+        assert_in(libraryName, librariesName)
+        librariesName.remove(libraryName)
+
+    # avresample or swresample, if avtranscoder depends on libav or ffmpeg
+    assert_equals(len(librariesName), 1)
+
+
+def testSupportedExtensions():
+    """
+    Check if we can access the supported extensions.
+    These numbers of input/output extensions correspond to the features implemented in common libraries (not in third parties).
+    @note Tested with ffmpeg-2.4.2
+    """
+    inputExtensions = av.getInputExtensions()
+    outputExtensions = av.getOutputExtensions()
+    
+    assert_greater_equal(len(inputExtensions), 162)
+    assert_greater_equal(len(outputExtensions), 184)

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace std {`
`9`	`9`
`10`	`10`	`// Create instantiations of a template classes`
`11`	`11`	`%template(OptionArray) vector< avtranscoder::Option >;`
`12`		`-%template(IntPair) pair< size_t, size_t >;`
	`12`	`+%template(IntPair) pair< int, int >;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`%include <AvTranscoder/Option.hpp>`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ namespace std {`
`46`	`46`	`%template(ChannelVector) vector< avtranscoder::Channel >;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+%include <AvTranscoder/file/util.hpp>`
	`50`	`+%include <AvTranscoder/file/FormatContext.hpp>`
	`51`	`+`
`49`	`52`	`%include <AvTranscoder/properties/util.hpp>`
`50`	`53`	`%include <AvTranscoder/properties/FileProperties.hpp>`
`51`	`54`	`%include <AvTranscoder/properties/PixelProperties.hpp>`