Merge branch 'release/v0.5.6' of https://github.com/mikrosimage/avTranscoder into develop

Clement Champetier · Clement Champetier · commit 9635e02d3174 · 2015-06-17T11:13:49.000+02:00
Conflicts:
	src/AvTranscoder/decoder/AudioDecoder.cpp
	src/AvTranscoder/decoder/VideoDecoder.cpp
	src/AvTranscoder/encoder/AudioEncoder.cpp
	src/AvTranscoder/encoder/VideoEncoder.cpp
	src/AvTranscoder/transcoder/StreamTranscoder.cpp
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -60,7 +60,7 @@ void AudioDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 	if( profile.count( constants::avProfileThreads ) )
 		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		codec.getOption( constants::avProfileThreads ).setInt( codec.getAVCodecContext().thread_count );
 
 	// set decoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -58,7 +58,7 @@ void VideoDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 	if( profile.count( constants::avProfileThreads ) )
 		codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		codec.getOption( constants::avProfileThreads ).setInt( codec.getAVCodecContext().thread_count );
 
 	// set decoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -52,7 +52,7 @@ void AudioEncoder::setupEncoder( const ProfileLoader::Profile& profile )
 	if( profile.count( constants::avProfileThreads ) )
 		_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		_codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		_codec.getOption( constants::avProfileThreads ).setInt( _codec.getAVCodecContext().thread_count );
 
 
 	// set encoder options
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -53,7 +53,7 @@ void VideoEncoder::setupEncoder( const ProfileLoader::Profile& profile )
 	if( profile.count( constants::avProfileThreads ) )
 		_codec.getOption( constants::avProfileThreads ).setString( profile.at( constants::avProfileThreads ) );
 	else
-		_codec.getOption( constants::avProfileThreads ).setString( "auto" );
+		_codec.getOption( constants::avProfileThreads ).setInt( _codec.getAVCodecContext().thread_count );
 
 	// set encoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -86,13 +86,13 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 void InputFile::seekAtFrame( const size_t frame )
 {
 	uint64_t position = frame / getFps() * AV_TIME_BASE;
-	_formatContext.seek( position, AVSEEK_FLAG_BACKWARD );
+	_formatContext.seek( position, AVSEEK_FLAG_ANY );
 }
 
 void InputFile::seekAtTime( const double time )
 {
 	uint64_t position = time * AV_TIME_BASE;
-	_formatContext.seek( position, AVSEEK_FLAG_BACKWARD );
+	_formatContext.seek( position, AVSEEK_FLAG_ANY );
 }
 
 void InputFile::activateStream( const size_t streamIndex, bool activate )
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -48,9 +48,9 @@ class AvExport InputFile
 	bool readNextPacket( CodedData& data, const size_t streamIndex );
 
 	/**
-	 * @brief Seek input stream at specified frame
-	 * @note clean also buffers in each InputStream
-	 * @return if next packet was read succefully
+	 * @brief Seek at a specific frame / time (in seconds)
+	 * @note Seek in file by using the default stream (according to ffmpeg)
+	 * @warning If the seek is done to a non key-frame, the decoding will start from the next key-frame
 	 **/
 	void seekAtFrame( const size_t frame );
 	void seekAtTime( const double time );
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -22,6 +22,7 @@ VideoProperties::VideoProperties( const FormatContext& formatContext, const size
 	, _pixelProperties()
 	, _isInterlaced( false )
 	, _isTopFieldFirst( false )
+	, _firstGopTimeCode( -1 )
 	, _gopStructure()
 {
 	if( _formatContext )
@@ -39,7 +40,10 @@ VideoProperties::VideoProperties( const FormatContext& formatContext, const size
 		_codec = avcodec_find_decoder( _codecContext->codec_id );
 
 	if( _codecContext )
+	{
 		_pixelProperties = PixelProperties( _codecContext->pix_fmt );
+		_firstGopTimeCode = _codecContext->timecode_frame_start;
+	}
 
 	if( level == eAnalyseLevelFirstGop )
 		analyseGopStructure( progress );
@@ -310,7 +314,7 @@ int64_t VideoProperties::getStartTimecode() const
 {
 	if( ! _codecContext )
 		throw std::runtime_error( "unknown codec context" );
-	return _codecContext->timecode_frame_start;
+	return _firstGopTimeCode;
 }
 
 std::string VideoProperties::getStartTimecodeString() const
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -110,6 +110,12 @@ class AvExport VideoProperties : public StreamProperties
 	bool _isTopFieldFirst;
 	std::vector< std::pair< char, bool > > _gopStructure;
 	//@}
+
+	/**
+	 * @brief GOP timecode of the first frame
+	 * @note  AVCodecContext stores the GOP timecode of the last decoded frame
+	 */
+	int64_t _firstGopTimeCode;
 };
 
 }
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -316,6 +316,9 @@ void StreamTranscoder::preProcessCodecLatency()
 	{
 		processFrame();
 	}
+
+	if( getProcessCase() == eProcessCaseRewrap )
+		_currentDecoder = NULL;
 }
 
 bool StreamTranscoder::processFrame()
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -506,7 +506,7 @@ void Transcoder::manageSwitchToGenerator()
 					_streamTranscoders.at( i )->canSwitchToGenerator( false );
 				break;
 			case eProcessMethodBasedOnDuration :
-				if( _streamTranscoders.at( i )->getDuration() > _outputDuration )
+				if( _streamTranscoders.at( i )->getDuration() >= _outputDuration )
 					_streamTranscoders.at( i )->canSwitchToGenerator( false );
 				else
 					_streamTranscoders.at( i )->canSwitchToGenerator( true );

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )`
`86`	`86`	`void InputFile::seekAtFrame( const size_t frame )`
`87`	`87`	`{`
`88`	`88`	`uint64_t position = frame / getFps() * AV_TIME_BASE;`
`89`		`- _formatContext.seek( position, AVSEEK_FLAG_BACKWARD );`
	`89`	`+ _formatContext.seek( position, AVSEEK_FLAG_ANY );`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`void InputFile::seekAtTime( const double time )`
`93`	`93`	`{`
`94`	`94`	`uint64_t position = time * AV_TIME_BASE;`
`95`		`- _formatContext.seek( position, AVSEEK_FLAG_BACKWARD );`
	`95`	`+ _formatContext.seek( position, AVSEEK_FLAG_ANY );`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void InputFile::activateStream( const size_t streamIndex, bool activate )`
Original file line number	Diff line number	Diff line change
`@@ -316,6 +316,9 @@ void StreamTranscoder::preProcessCodecLatency()`
`316`	`316`	`{`
`317`	`317`	`processFrame();`
`318`	`318`	`}`
	`319`	`+`
	`320`	`+ if( getProcessCase() == eProcessCaseRewrap )`
	`321`	`+ _currentDecoder = NULL;`
`319`	`322`	`}`
`320`	`323`
`321`	`324`	`bool StreamTranscoder::processFrame()`