Merge pull request #122 from cchampet/fix_binding_ratio_v2

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 89236814252f · 2014-10-27T05:05:20.000-07:00
Swig binding: fix Rational
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -9,6 +9,8 @@
 
 %include "AvTranscoder/swig/avException.i"
 %include "AvTranscoder/swig/avExport.i"
+%include "AvTranscoder/swig/avDocumentation.i"
+%include "AvTranscoder/swig/avRational.i"
 
 %{
 #include <AvTranscoder/Profile.hpp>
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -12,6 +12,7 @@ extern "C" {
 #include <libavformat/version.h>
 #include <libavcodec/version.h>
 #include <libavcodec/avcodec.h>
+#include <libavutil/rational.h>
 }
 
 #include <string>
diff --git a/src/AvTranscoder/mediaProperty/mediaProperty.hpp b/src/AvTranscoder/mediaProperty/mediaProperty.hpp
@@ -3,10 +3,6 @@
 
 #include <AvTranscoder/common.hpp>
 
-extern "C" {
-#include <libavutil/rational.h>
-}
-
 #include <string>
 #include <vector>
 #include <map>
diff --git a/src/AvTranscoder/swig/avDocumentation.i b/src/AvTranscoder/swig/avDocumentation.i
@@ -0,0 +1,2 @@
+/* Python-specific documentation. */
+%feature("autodoc", "3");
diff --git a/src/AvTranscoder/swig/avRational.i b/src/AvTranscoder/swig/avRational.i
@@ -0,0 +1,7 @@
+/**
+ * Rational number numerator/denominator.
+ */
+typedef struct AVRational{
+    int num; ///< numerator
+    int den; ///< denominator
+} AVRational;
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -110,12 +110,12 @@ def testRewrapVideoStream():
 	assert_equals( src_videoStream.endianess, dst_videoStream.endianess )
 	assert_equals( src_videoStream.startTimecode, dst_videoStream.startTimecode )
 
-	#assert_equals( src_videoStream.timeBase.num, dst_videoStream.timeBase.num )
-	#assert_equals( src_videoStream.timeBase.den, dst_videoStream.timeBase.den )
-	#assert_equals( src_videoStream.sar.num, dst_videoStream.sar.num )
-	#assert_equals( src_videoStream.sar.den, dst_videoStream.sar.den )
-	#assert_equals( src_videoStream.dar.num, dst_videoStream.dar.num )
-	#assert_equals( src_videoStream.dar.den, dst_videoStream.dar.den )
+	assert_equals( src_videoStream.timeBase.num, dst_videoStream.timeBase.num )
+	assert_equals( src_videoStream.timeBase.den, dst_videoStream.timeBase.den )
+	assert_equals( src_videoStream.sar.num, dst_videoStream.sar.num )
+	assert_equals( src_videoStream.sar.den, dst_videoStream.sar.den )
+	assert_equals( src_videoStream.dar.num, dst_videoStream.dar.num )
+	assert_equals( src_videoStream.dar.den, dst_videoStream.dar.den )
 	
 	assert_equals( src_videoStream.streamId, dst_videoStream.streamId )
 	assert_equals( src_videoStream.codecId, dst_videoStream.codecId )

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ extern "C" {`
`12`	`12`	`#include <libavformat/version.h>`
`13`	`13`	`#include <libavcodec/version.h>`
`14`	`14`	`#include <libavcodec/avcodec.h>`
	`15`	`+#include <libavutil/rational.h>`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`#include <string>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+/* Python-specific documentation. */`
	`2`	`+%feature("autodoc", "3");`