pyTest of rewrap: fix check of format

Clement Champetier · Clement Champetier · commit 260618ad8925 · 2015-01-13T14:26:00.000+01:00
Get the format name of the input, and set it to the output file.
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -23,7 +23,7 @@ class AvExport FileProperties
 	FileProperties( const FormatContext& formatContext );
 
 	std::string getFilename() const;
-	std::string getFormatName() const;
+	std::string getFormatName() const;  ///< A comma separated list of short names for the format
 	std::string getFormatLongName() const;
 
 	size_t getProgramsCount() const;
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -8,23 +8,22 @@ def testRewrapAudioStream():
 	"""
 	Rewrap one audio stream.
 	"""
+        # get src file of wrap
 	inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_FILE']
-	outputFileName = "testRewrapAudioStream.wav"
+	src_inputFile = av.InputFile( inputFileName )
+	progress = av.NoDisplayProgress()
+	src_inputFile.analyse( progress )
+	src_properties = src_inputFile.getProperties()
+	src_audioStream = src_properties.getAudioProperties()[0]
 
+	formatList = src_properties.getFormatName().split(",")
+	outputFileName = "testRewrapAudioStream." + formatList[0]
 	ouputFile = av.OutputFile( outputFileName )
-	transcoder = av.Transcoder( ouputFile )
 
+	transcoder = av.Transcoder( ouputFile )
 	transcoder.add( inputFileName, 0, "" )
-
-	progress = av.NoDisplayProgress()
 	transcoder.process( progress )
 
-	# get src file of wrap
-	src_inputFile = av.InputFile( inputFileName )
-	src_inputFile.analyse( progress )
-	src_properties = src_inputFile.getProperties()
-	src_audioStream = src_properties.getAudioProperties()[0]
-
 	# get dst file of wrap
 	dst_inputFile = av.InputFile( outputFileName )
 	dst_inputFile.analyse( progress, av.eAnalyseLevelHeader )
@@ -65,23 +64,22 @@ def testRewrapVideoStream():
 	"""
 	Rewrap one video stream.
 	"""
+	# get src file of wrap
 	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
-	outputFileName = "testRewrapVideoStream.avi"
+	src_inputFile = av.InputFile( inputFileName )
+	progress = av.NoDisplayProgress()
+	src_inputFile.analyse( progress )
+	src_properties = src_inputFile.getProperties()	
+        src_videoStream = src_properties.getVideoProperties()[0]
 
+	formatList = src_properties.getFormatName().split(",")
+	outputFileName = "testRewrapVideoStream." + formatList[0]
 	ouputFile = av.OutputFile( outputFileName )
-	transcoder = av.Transcoder( ouputFile )
 
+	transcoder = av.Transcoder( ouputFile )
 	transcoder.add( inputFileName, 0, "" )
-
-	progress = av.NoDisplayProgress()
 	transcoder.process( progress )
 
-	# get src file of wrap
-	src_inputFile = av.InputFile( inputFileName )
-	src_inputFile.analyse( progress )
-	src_properties = src_inputFile.getProperties()	
-        src_videoStream = src_properties.getVideoProperties()[0]
-
 	# get dst file of wrap
 	dst_inputFile = av.InputFile( outputFileName )
 	dst_inputFile.analyse( progress )
