Merge pull request #248 from cchampet/fix_getFps

valnoel · valnoel · commit 0f8be9261b04 · 2015-10-07T13:47:41.000+02:00
Fix get fps
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -516,17 +516,7 @@ int VideoProperties::getLevel() const
 
 float VideoProperties::getFps() const
 {
-	const Rational timeBase = getTimeBase();
-	const float fps = timeBase.den / (double) timeBase.num;
-	if( std::isinf( fps ) )
-	{
-		std::ostringstream os;
-		os << "unable to retrieve a correct fps (found value: ";
-		os << fps;
-		os << ")";
-		throw std::runtime_error( os.str() );
-	}
-	return fps;
+	return av_q2d( _formatContext->streams[_streamIndex]->avg_frame_rate );
 }
 
 bool VideoProperties::hasBFrames() const
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -56,11 +56,11 @@ class AvExport VideoProperties : public StreamProperties
 	int getLevel() const;
 
 	/**
-	 * @brief Corresponds to the compute of the 'tbn' by ffmpeg.
-	 * tbn = the time base in AVStream that has come from the container
+	 * @brief Corresponds to the 'fps' returned by ffprobe.
+	 * fps = the average framerate that has come from the AVStream
+	 * tbn = the time base in AVStream that has come from the AVStream
 	 * tbc = the time base in AVCodecContext for the codec used for a particular stream
 	 * tbr = tbr is guessed from the video stream and is the value users want to see when they look for the video frame rate
-	 * @return 
 	 */
 	float getFps() const;
 
diff --git a/test/pyTest/testEProcessMethod.py b/test/pyTest/testEProcessMethod.py
@@ -1,9 +1,9 @@
 import os
 
 # Check if environment is setup to run the tests
-if os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_MOV_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None:
+if os.environ.get('AVTRANSCODER_TEST_VIDEO_AVI_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_MOV_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None:
 	from nose.plugins.skip import SkipTest
-	raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_FILE / AVTRANSCODER_TEST_AUDIO_MOV_FILE / AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
+	raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_AVI_FILE / AVTRANSCODER_TEST_AUDIO_MOV_FILE / AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
 
 from nose.tools import *
 
@@ -17,7 +17,7 @@ def testEProcessMethodShortest():
 	"""
 	Process with method eProcessMethodShortest, check output duration.
 	"""
-	inputFileName_longest = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName_longest = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
         inputFileName_shortest = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
 	outputFileName = "testEProcessMethodShortest.mov"
 
@@ -46,7 +46,7 @@ def testEProcessMethodLongest():
 	"""
 	Process with method eProcessMethodLongest, check output duration.
 	"""
-	inputFileName_longest = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName_longest = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
         inputFileName_shortest = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
 	outputFileName = "testEProcessMethodLongest.mov"
 
@@ -75,7 +75,7 @@ def testEProcessMethodBasedOnStream():
 	"""
 	Process with method testEProcessMethodBasedOnStream, check output duration.
 	"""
-	inputFileName_first = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName_first = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
         inputFileName_second = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
         inputFileName_third = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
 	outputFileName = "testEProcessMethodShortest.mov"
@@ -106,7 +106,7 @@ def testEProcessMethodBasedOnDuration():
 	"""
 	Process with method eProcessMethodBasedOnDuration, check output duration.
 	"""
-	inputFileName_first = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName_first = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
         inputFileName_second = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
         inputFileName_third = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
 	outputFileName = "testEProcessMethodBasedOnDuration.mov"
diff --git a/test/pyTest/testNbFrames.py b/test/pyTest/testNbFrames.py
@@ -1,9 +1,9 @@
 import os
 
 # Check if environment is setup to run the tests
-if os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None:
+if os.environ.get('AVTRANSCODER_TEST_VIDEO_AVI_FILE') is None:
 	from nose.plugins.skip import SkipTest
-	raise SkipTest("Need to define environment variable AVTRANSCODER_TEST_VIDEO_FILE")
+	raise SkipTest("Need to define environment variable AVTRANSCODER_TEST_VIDEO_AVI_FILE")
 
 from nose.tools import *
 
@@ -17,7 +17,7 @@ def testNbFramesVideoRewrap():
 	"""
 	Rewrap one video stream, check nb frames.
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testNbFramesVideoRewrap.mov"
 
 	ouputFile = av.OutputFile( outputFileName )
@@ -44,7 +44,7 @@ def testNbFramesVideoTranscode():
 	"""
 	Transcode one video stream (to h264), check nb frames.
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testNbFramesVideoTranscode.mov"
 
 	ouputFile = av.OutputFile( outputFileName )
diff --git a/test/pyTest/testOffset.py b/test/pyTest/testOffset.py
@@ -1,9 +1,9 @@
 import os
 
 # Check if environment is setup to run the tests
-if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_MOV_FILE') is None or os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None:
+if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or os.environ.get('AVTRANSCODER_TEST_AUDIO_MOV_FILE') is None or os.environ.get('AVTRANSCODER_TEST_VIDEO_AVI_FILE') is None:
 	from nose.plugins.skip import SkipTest
-	raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_FILE / AVTRANSCODER_TEST_AUDIO_MOV_FILE / AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
+	raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_AVI_FILE / AVTRANSCODER_TEST_AUDIO_MOV_FILE / AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
 
 from nose.tools import *
 
@@ -138,7 +138,7 @@ def testTranscodeVideoPositiveOffset():
 	"""
 	Transcode one video stream (profile mpeg2) with offset at the beginning of the process.
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testTranscodeVideoPositiveOffset.mov"
         offset = 10
 
@@ -168,7 +168,7 @@ def testTranscodeVideoNegativeOffset():
 	"""
 	Transcode one video stream (profile mpeg2) with a negative offset at the beginning of the process.
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testTranscodeVideoNegativeOffset.mov"
         offset = -5.5
 
@@ -198,7 +198,7 @@ def testRewrapVideoPositiveOffset():
 	"""
 	Rewrap one video stream with offset at the beginning of the process.
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testRewrapVideoPositiveOffset.mov"
         offset = 10
 
@@ -228,7 +228,7 @@ def testRewrapVideoNegativeOffset():
 	"""
 	Rewrap one video stream with a negative offset at the beginning of the process.
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testRewrapVideoNegativeOffset.mov"
         offset = -5.5
 
diff --git a/test/pyTest/testProperties.py b/test/pyTest/testProperties.py
@@ -1,9 +1,9 @@
 import os
 
 # Check if environment is setup to run the tests
-if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None:
+if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or os.environ.get('AVTRANSCODER_TEST_VIDEO_MP4_FILE') is None:
 	from nose.plugins.skip import SkipTest
-	raise SkipTest("Need to define environment variable AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
+	raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_AUDIO_WAVE_FILE / AVTRANSCODER_TEST_VIDEO_MP4_FILE")
 
 from nose.tools import *
 
@@ -63,3 +63,63 @@ def testAddImpossibleMetadata():
 
 	assert_not_in( metadata_to_check, properties.getMetadatas() )
 
+
+def testCheckVideoProperties():
+	"""
+	Check properties of a video stream.
+	"""
+	# get src file
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_MP4_FILE']
+	inputFile = av.InputFile( inputFileName )
+	properties = inputFile.getProperties()
+	videoStream = properties.getVideoProperties()[0]
+
+	expectedTotalBitRate = 3249739
+	expectedVideoBitRate = 3247981
+
+	expectedCodecName = 'h264'
+	expectedWidth = 1920
+	expectedHeight = 1080
+	expectedNbFrames = 241
+	expectedDuration = 10.04
+	expectedFps = 24
+
+	assert_equals( properties.getBitRate(), expectedTotalBitRate )
+	assert_equals( videoStream.getBitRate(), expectedVideoBitRate )
+
+	assert_equals( videoStream.getCodecName(), expectedCodecName )
+	assert_equals( videoStream.getWidth(), expectedWidth )
+	assert_equals( videoStream.getHeight(), expectedHeight )
+	assert_equals( videoStream.getNbFrames(), expectedNbFrames )
+	assert_equals( round(videoStream.getDuration(), 2), expectedDuration )
+	assert_equals( videoStream.getFps(), expectedFps )
+
+def testCheckAudioProperties():
+	"""
+	Check properties of an audio stream.
+	"""
+	# get src file
+	inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+	inputFile = av.InputFile( inputFileName )
+	properties = inputFile.getProperties()
+	audioStream = properties.getAudioProperties()[0]
+
+	expectedTotalBitRate = 4608040
+	expectedAudioBitRate = 4608000
+
+	expectedCodecName = 'pcm_s16le'
+	expectedSamples = 5760000
+	expectedDuration = 20
+	expectedChannels = 6
+	expectedChannelLayout = '5.1'
+	expectedSampleRate = 48000
+
+	assert_equals( properties.getBitRate(), expectedTotalBitRate )
+	assert_equals( audioStream.getBitRate(), expectedAudioBitRate )
+
+	assert_equals( audioStream.getCodecName(), expectedCodecName )
+	assert_equals( audioStream.getNbSamples(), expectedSamples )
+	assert_equals( round(audioStream.getDuration(), 2), expectedDuration )
+	assert_equals( audioStream.getChannels(), expectedChannels )
+	assert_equals( audioStream.getChannelLayout(), expectedChannelLayout )
+	assert_equals( audioStream.getSampleRate(), expectedSampleRate )
diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -1,9 +1,9 @@
 import os
 
 # Check if environment is setup to run the tests
-if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None:
+if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or os.environ.get('AVTRANSCODER_TEST_VIDEO_AVI_FILE') is None:
 	from nose.plugins.skip import SkipTest
-	raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_FILE and AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
+	raise SkipTest("Need to define environment variables AVTRANSCODER_TEST_VIDEO_AVI_FILE and AVTRANSCODER_TEST_AUDIO_WAVE_FILE")
 
 from nose.tools import *
 
@@ -62,7 +62,7 @@ def testRewrapVideoStream():
 	Rewrap one video stream.
 	"""
 	# get src file of wrap
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	src_inputFile = av.InputFile( inputFileName )
 	progress = av.NoDisplayProgress()
 	src_inputFile.analyse( progress )
diff --git a/test/pyTest/testTranscoderTranscodeVideo.py b/test/pyTest/testTranscoderTranscodeVideo.py
@@ -1,9 +1,9 @@
 import os
 
 # Check if environment is setup to run the tests
-if os.environ.get('AVTRANSCODER_TEST_VIDEO_FILE') is None:
+if os.environ.get('AVTRANSCODER_TEST_VIDEO_AVI_FILE') is None:
 	from nose.plugins.skip import SkipTest
-	raise SkipTest("Need to define environment variable AVTRANSCODER_TEST_VIDEO_FILE")
+	raise SkipTest("Need to define environment variable AVTRANSCODER_TEST_VIDEO_AVI_FILE")
 
 from nose.tools import *
 
@@ -17,7 +17,7 @@ def testTranscodeDnxhd120():
 	"""
 	Transcode one video stream (profile dnxhd120).
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testTranscodeDnxhd120.mxf"
 
 	ouputFile = av.OutputFile( outputFileName )
@@ -44,7 +44,7 @@ def testTranscodeDnxhd185():
 	"""
 	Transcode one video stream (profile dnxhd185).
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testTranscodeDnxhd185.mxf"
 
 	ouputFile = av.OutputFile( outputFileName )
@@ -71,7 +71,7 @@ def testTranscodeDnxhd185x():
 	"""
 	Transcode one video stream (profile dnxhd185x).
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testTranscodeDnxhd185x.mxf"
 
 	ouputFile = av.OutputFile( outputFileName )
@@ -98,7 +98,7 @@ def testTranscodeYUV420():
 	"""
 	Process one video stream (custom profile of encoding, with pixel format YUV420).
 	"""
-	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_FILE']
+	inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_AVI_FILE']
 	outputFileName = "testTranscodeYUV420.avi"
 
 	ouputFile = av.OutputFile( outputFileName )
diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh
@@ -9,7 +9,8 @@ export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPA
 
 # Get assets
 git clone https://github.com/avTranscoder/avTranscoder-data.git
-export AVTRANSCODER_TEST_VIDEO_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_480p_stereo.avi
+export AVTRANSCODER_TEST_VIDEO_AVI_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_480p_stereo.avi
+export AVTRANSCODER_TEST_VIDEO_MP4_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_HD.mp4
 export AVTRANSCODER_TEST_AUDIO_WAVE_FILE=`pwd`/avTranscoder-data/audio/frequenciesPerChannel.wav
 export AVTRANSCODER_TEST_AUDIO_MOV_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_1080p_5_1.mov
 
