Merge pull request #236 from cchampet/pyrewrap_addAudio

valnoel · valnoel · commit 9137c01bf30e · 2015-09-30T12:29:38.000+02:00
pyrewrap app:  add audio stream to the wrapping process
diff --git a/app/pyRewrap/pyrewrap.py b/app/pyRewrap/pyrewrap.py
@@ -77,7 +77,7 @@ def addStreamsToTranscoder(transcoder, streams):
         transcoder.add( args.inputFileName, stIndex )
 
 addStreamsToTranscoder(transcoder, inputFile.getProperties().getVideoProperties())
-# addStreamsToTranscoder(transcoder, inputFile.getProperties().getAudioProperties())
+addStreamsToTranscoder(transcoder, inputFile.getProperties().getAudioProperties())
 # addStreamsToTranscoder(transcoder, inputFile.getProperties().getDataProperties())
 
 # launch process
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -516,8 +516,8 @@ int VideoProperties::getLevel() const
 
 float VideoProperties::getFps() const
 {
-	Rational timeBase = getTimeBase();
-	float fps = timeBase.den / (double) timeBase.num;
+	const Rational timeBase = getTimeBase();
+	const float fps = timeBase.den / (double) timeBase.num;
 	if( std::isinf( fps ) )
 	{
 		std::ostringstream os;
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -55,6 +55,13 @@ class AvExport VideoProperties : public StreamProperties
 	int getProfile() const;
 	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
+	 * 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;
 
 	bool hasBFrames() const;
diff --git a/src/AvTranscoder/stream/OutputStream.cpp b/src/AvTranscoder/stream/OutputStream.cpp
@@ -16,7 +16,15 @@ OutputStream::OutputStream( OutputFile& outputFile, const size_t streamIndex )
 
 float OutputStream::getStreamDuration() const
 {
-	AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
+	const AVStream& outputStream = _outputFile->getFormatContext().getAVStream( _streamIndex );
+
+	// check floating point exception
+	if( outputStream.time_base.den == 0 || outputStream.pts.den == 0 )
+	{
+		LOG_WARN( "Cannot compute stream duration of output stream at index " << _streamIndex )
+		return 0.f;
+	}
+
 #if AVTRANSCODER_FFMPEG_DEPENDENCY && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(55, 40, 100)
 	// returns the pts of the last muxed packet, converted from timebase to seconds
 	return av_q2d( outputStream.time_base ) * av_stream_get_end_pts( &outputStream );

Original file line number	Diff line number	Diff line change
`@@ -516,8 +516,8 @@ int VideoProperties::getLevel() const`
`516`	`516`
`517`	`517`	`float VideoProperties::getFps() const`
`518`	`518`	`{`
`519`		`- Rational timeBase = getTimeBase();`
`520`		`- float fps = timeBase.den / (double) timeBase.num;`
	`519`	`+ const Rational timeBase = getTimeBase();`
	`520`	`+ const float fps = timeBase.den / (double) timeBase.num;`
`521`	`521`	`if( std::isinf( fps ) )`
`522`	`522`	`{`
`523`	`523`	`std::ostringstream os;`