Transcoder: call init in process method

Clement Champetier · Clement Champetier · commit 51cf36ef12de · 2014-12-03T15:54:16.000+01:00
* No need to expect the user to call init() before process().
* Note: the init() method can be called several times with no side
effects.
* Update pyTest.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -259,7 +259,7 @@ StreamTranscoder::~StreamTranscoder()
 
 void StreamTranscoder::init()
 {
-	// rewrap
+	// rewrap case: no need to take care of the latency of codec
 	if( ! _inputEssence )
 		return;
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -282,9 +282,10 @@ void Transcoder::process( IProgress& progress )
 	{
 		throw std::runtime_error( "missing input streams in transcoder" );
 	}
-	
+
 	if( _verbose )
 		std::cout << "begin transcoding" << std::endl;
+	init();
 	
 	_outputFile.beginWrap();
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -112,7 +112,9 @@ class AvExport Transcoder
 
 	/**
 	 * @brief Process all the streams, and ended the process depending on the transcode politic.
-	 * @param progress
+	 * @note The function manages all process: init(), beginWrap(), processFrame()s, and endWrap().
+	 * @param progress: choose a progress, or create your own in C++ or in bindings by inherit IProgress class.
+	 * @see IProgress
 	 */
 	void process( IProgress& progress );
 
diff --git a/test/pyTest/testTranscoderAdd.py b/test/pyTest/testTranscoderAdd.py
@@ -25,6 +25,5 @@ def testAddStreamTranscoder():
 
 	# process
 	progress = av.NoDisplayProgress()
-	transcoder.init()
 	transcoder.process( progress )
 
diff --git a/test/pyTest/testTranscoderTranscode.py b/test/pyTest/testTranscoderTranscode.py
@@ -17,7 +17,6 @@ def testTranscodeWave24b48kmono():
 
 	transcoder.add( inputFileName, 0, "wave24b48kmono" )
 
-	transcoder.init()
 	progress = av.ConsoleProgress()
 	transcoder.process( progress )
 
@@ -47,7 +46,6 @@ def testTranscodeWave16b48kmono():
 
 	transcoder.add( inputFileName, 0, "wave16b48kmono" )
 
-	transcoder.init()
 	progress = av.ConsoleProgress()
 	transcoder.process( progress )
 
@@ -77,7 +75,6 @@ def testTranscodeWave16b48kmono():
 
 # 	transcoder.add( inputFileName, 0, "dnxhd120" )
 
-# 	transcoder.init()
 # 	progress = av.ConsoleProgress()
 # 	transcoder.process( progress )
 
@@ -106,7 +103,6 @@ def testTranscodeWave16b48kmono():
 
 # 	transcoder.add( inputFileName, 0, "dnxhd185" )
 
-# 	transcoder.init()
 # 	progress = av.ConsoleProgress()
 # 	transcoder.process( progress )
 
@@ -135,7 +131,6 @@ def testTranscodeWave16b48kmono():
 
 # 	transcoder.add( inputFileName, 0, "dnxhd185x" )
 
-# 	transcoder.init()
 # 	progress = av.ConsoleProgress()
 # 	transcoder.process( progress )
 
@@ -164,7 +159,6 @@ def testTranscodeWave16b48kmono():
 
 # 	transcoder.add( inputFileName, 0, "xdcamhd422" )
 
-# 	transcoder.init()
 # 	progress = av.ConsoleProgress()
 # 	transcoder.process( progress )
 
@@ -213,7 +207,6 @@ def testTranscodeWave16b48kmono():
 
 # 	transcoder.add( inputFileName, 0, customProfile )
 
-# 	transcoder.init()
 # 	progress = av.ConsoleProgress()
 # 	transcoder.process( progress )
 

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ StreamTranscoder::~StreamTranscoder()`
`259`	`259`
`260`	`260`	`void StreamTranscoder::init()`
`261`	`261`	`{`
`262`		`- // rewrap`
	`262`	`+ // rewrap case: no need to take care of the latency of codec`
`263`	`263`	`if( ! _inputEssence )`
`264`	`264`	`return;`
`265`	`265`
Original file line number	Diff line number	Diff line change
`@@ -282,9 +282,10 @@ void Transcoder::process( IProgress& progress )`
`282`	`282`	`{`
`283`	`283`	`throw std::runtime_error( "missing input streams in transcoder" );`
`284`	`284`	`}`
`285`		`-`
	`285`	`+`
`286`	`286`	`if( _verbose )`
`287`	`287`	`std::cout << "begin transcoding" << std::endl;`
	`288`	`+ init();`
`288`	`289`
`289`	`290`	`_outputFile.beginWrap();`
`290`	`291`