Merge pull request #167 from cchampet/dev_ManageOffsetOnRewrap

valnoel · valnoel · commit 3ed4962843a4 · 2015-04-22T14:21:07.000+02:00
Manage offset on rewrap
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -70,7 +70,7 @@ bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )
 
 bool AudioGenerator::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
-	return false;
+	return decodeNextFrame( frameBuffer );
 }
 
 }
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -22,7 +22,8 @@ namespace avtranscoder
 
 StreamTranscoder::StreamTranscoder(
 		IInputStream& inputStream,
-		IOutputFile& outputFile
+		IOutputFile& outputFile,
+		const double offset
 	)
 	: _inputStream( &inputStream )
 	, _outputStream( NULL )
@@ -34,7 +35,7 @@ StreamTranscoder::StreamTranscoder(
 	, _outputEncoder( NULL )
 	, _transform( NULL )
 	, _subStreamIndex( -1 )
-	, _offset( 0 )
+	, _offset( offset )
 	, _canSwitchToGenerator( false )
 {
 	// create a re-wrapping case
@@ -213,8 +214,6 @@ StreamTranscoder::StreamTranscoder(
 			break;
 		}
 	}
-	if( offset )
-		switchToGeneratorDecoder();
 }
 
 StreamTranscoder::StreamTranscoder(
@@ -327,6 +326,31 @@ void StreamTranscoder::preProcessCodecLatency()
 
 bool StreamTranscoder::processFrame()
 {
+	// Manage offset
+	if( _offset > 0 )
+	{
+		bool endOfOffset = _outputStream->getStreamDuration() >= _offset;
+		if( endOfOffset )
+		{
+			LOG_INFO( "End of offset" )
+
+			if( _inputDecoder )
+				switchToInputDecoder();
+			else
+				_currentDecoder = NULL;
+			_offset = 0;
+		}
+		else
+		{
+			// process generator
+			if( _currentDecoder != _generator )
+			{
+				LOG_INFO( "Switch to generator to process offset" )
+				switchToGeneratorDecoder();
+			}
+		}
+	}
+
 	if( isRewrapCase() )
 		return processRewrap();
 
@@ -337,9 +361,17 @@ bool StreamTranscoder::processRewrap()
 {
 	assert( _inputStream  != NULL );
 	assert( _outputStream != NULL );
-	
+	assert( _inputDecoder == NULL );
+
 	LOG_DEBUG( "Rewrap a frame" )
 
+	// if switched to generator, process frame
+	if( _currentDecoder == _generator )
+	{
+		return processTranscode();
+	}
+
+	LOG_DEBUG( "read next packet" )
 	CodedData data;
 	if( ! _inputStream->readNextPacket( data ) )
 	{
@@ -351,6 +383,7 @@ bool StreamTranscoder::processRewrap()
 		return false;
 	}
 
+	LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )
 	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
 
 	switch( wrappingStatus )
@@ -378,19 +411,7 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 
 	LOG_DEBUG( "Transcode a frame" )
 
-	// check offset
-	if( _offset )
-	{
-		bool endOfOffset = _outputStream->getStreamDuration() >= _offset;
-		if( endOfOffset )
-		{
-			// switch to essence from input stream
-			switchToInputDecoder();
-			// reset offset
-			_offset = 0;
-		}
-	}
-
+	LOG_DEBUG( "decode next frame" )
 	bool decodingStatus = false;
 	if( subStreamIndex < 0 )
 		decodingStatus = _currentDecoder->decodeNextFrame( *_sourceBuffer );
@@ -421,8 +442,8 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	}
 
 	LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )
-
 	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
+
 	switch( wrappingStatus )
 	{
 		case IOutputStream::eWrappingSuccess:
@@ -439,12 +460,16 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 
 void StreamTranscoder::switchToGeneratorDecoder()
 {
+	LOG_INFO( "Switch to generator decoder" )
+
 	_currentDecoder = _generator;
 	assert( _currentDecoder != NULL );
 }
 
 void StreamTranscoder::switchToInputDecoder()
 {
+	LOG_INFO( "Switch to input decoder" )
+
 	_currentDecoder = _inputDecoder;
 	assert( _currentDecoder != NULL );
 }
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -29,7 +29,7 @@ class AvExport StreamTranscoder
 	 * @brief rewrap stream
 	 * @note offset feature when rewrap a stream is not supported
 	 **/
-	StreamTranscoder( IInputStream& inputStream, IOutputFile& outputFile );
+	StreamTranscoder( IInputStream& inputStream, IOutputFile& outputFile, const double offset = 0 );
 
 	/**
 	 * @brief transcode stream
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -41,7 +41,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 		if( filename.length() == 0 )
 			throw std::runtime_error( "Can't re-wrap a stream without filename indicated" );
 
-		addRewrapStream( filename, streamIndex );
+		addRewrapStream( filename, streamIndex, offset );
 	}
 	// Transcode
 	else
@@ -60,7 +60,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 		if( filename.length() == 0 )
 			throw std::runtime_error( "Can't re-wrap a stream without filename indicated" );
 		
-		addRewrapStream( filename, streamIndex );
+		addRewrapStream( filename, streamIndex, offset );
 	}
 	// Transcode
 	else
@@ -107,7 +107,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 		// Re-wrap
 		if( subStreamIndex < 0 )
 		{
-			addRewrapStream( filename, streamIndex );
+			addRewrapStream( filename, streamIndex, offset );
 		}
 		// Transcode (transparent for the user)
 		else
@@ -138,7 +138,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con
 		// Re-wrap
 		if( subStreamIndex < 0 )
 		{
-			addRewrapStream( filename, streamIndex );
+			addRewrapStream( filename, streamIndex, offset );
 		}
 		// Transcode (transparent for the user)
 		else
@@ -198,7 +198,6 @@ void Transcoder::preProcessCodecLatency()
 {
 	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
 	{
-		std::stringstream os;
 		LOG_DEBUG( "Init stream " << streamIndex )
 		_streamTranscoders.at( streamIndex )->preProcessCodecLatency();
 	}
@@ -243,8 +242,8 @@ void Transcoder::process( IProgress& progress )
 	preProcessCodecLatency();
 
 	double outputDuration = getOutputDuration();
+	LOG_DEBUG( "Output duration of the process will be " << outputDuration )
 
-	std::stringstream os;
 	size_t frame = 0;
 	bool frameProcessed = true;
 	while( frameProcessed )
@@ -278,13 +277,13 @@ void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const si
 	_outputDuration = outputDuration;
 }
 
-void Transcoder::addRewrapStream( const std::string& filename, const size_t streamIndex )
+void Transcoder::addRewrapStream( const std::string& filename, const size_t streamIndex, const double offset )
 {
-	LOG_INFO( "Add rewrap stream from file '" << filename << "' / index=" << streamIndex )
+	LOG_INFO( "Add rewrap stream from file '" << filename << "' / index=" << streamIndex << " / offset=" << offset << "s"  )
 
 	InputFile* referenceFile = addInputFile( filename, streamIndex );
 
-	_streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile ) );
+	_streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, offset ) );
 	_streamTranscoders.push_back( _streamTranscodersAllocated.back() );
 }
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -148,7 +148,7 @@ class AvExport Transcoder
 	void setProcessMethod( const EProcessMethod eProcessMethod, const size_t indexBasedStream = 0, const double outputDuration = 0 );
 
 private:
-	void addRewrapStream( const std::string& filename, const size_t streamIndex );
+	void addRewrapStream( const std::string& filename, const size_t streamIndex, const double offset );
 
 	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const double offset );
 	void addTranscodeStream( const std::string& filename, const size_t streamIndex, const int subStreamIndex, const ProfileLoader::Profile& profile, const double offset = 0 );

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )`
`70`	`70`
`71`	`71`	`bool AudioGenerator::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )`
`72`	`72`	`{`
`73`		`- return false;`
	`73`	`+ return decodeNextFrame( frameBuffer );`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`41`	`41`	`if( filename.length() == 0 )`
`42`	`42`	`throw std::runtime_error( "Can't re-wrap a stream without filename indicated" );`
`43`	`43`
`44`		`- addRewrapStream( filename, streamIndex );`
	`44`	`+ addRewrapStream( filename, streamIndex, offset );`
`45`	`45`	`}`
`46`	`46`	`// Transcode`
`47`	`47`	`else`
`@@ -60,7 +60,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`60`	`60`	`if( filename.length() == 0 )`
`61`	`61`	`throw std::runtime_error( "Can't re-wrap a stream without filename indicated" );`
`62`	`62`
`63`		`- addRewrapStream( filename, streamIndex );`
	`63`	`+ addRewrapStream( filename, streamIndex, offset );`
`64`	`64`	`}`
`65`	`65`	`// Transcode`
`66`	`66`	`else`
`@@ -107,7 +107,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`107`	`107`	`// Re-wrap`
`108`	`108`	`if( subStreamIndex < 0 )`
`109`	`109`	`{`
`110`		`- addRewrapStream( filename, streamIndex );`
	`110`	`+ addRewrapStream( filename, streamIndex, offset );`
`111`	`111`	`}`
`112`	`112`	`// Transcode (transparent for the user)`
`113`	`113`	`else`
`@@ -138,7 +138,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`138`	`138`	`// Re-wrap`
`139`	`139`	`if( subStreamIndex < 0 )`
`140`	`140`	`{`
`141`		`- addRewrapStream( filename, streamIndex );`
	`141`	`+ addRewrapStream( filename, streamIndex, offset );`
`142`	`142`	`}`
`143`	`143`	`// Transcode (transparent for the user)`
`144`	`144`	`else`
`@@ -198,7 +198,6 @@ void Transcoder::preProcessCodecLatency()`
`198`	`198`	`{`
`199`	`199`	`for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )`
`200`	`200`	`{`
`201`		`- std::stringstream os;`
`202`	`201`	`LOG_DEBUG( "Init stream " << streamIndex )`
`203`	`202`	`_streamTranscoders.at( streamIndex )->preProcessCodecLatency();`
`204`	`203`	`}`
`@@ -243,8 +242,8 @@ void Transcoder::process( IProgress& progress )`
`243`	`242`	`preProcessCodecLatency();`
`244`	`243`
`245`	`244`	`double outputDuration = getOutputDuration();`
	`245`	`+ LOG_DEBUG( "Output duration of the process will be " << outputDuration )`
`246`	`246`
`247`		`- std::stringstream os;`
`248`	`247`	`size_t frame = 0;`
`249`	`248`	`bool frameProcessed = true;`
`250`	`249`	`while( frameProcessed )`
`@@ -278,13 +277,13 @@ void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const si`
`278`	`277`	`_outputDuration = outputDuration;`
`279`	`278`	`}`
`280`	`279`
`281`		`-void Transcoder::addRewrapStream( const std::string& filename, const size_t streamIndex )`
	`280`	`+void Transcoder::addRewrapStream( const std::string& filename, const size_t streamIndex, const double offset )`
`282`	`281`	`{`
`283`		`- LOG_INFO( "Add rewrap stream from file '" << filename << "' / index=" << streamIndex )`
	`282`	`+ LOG_INFO( "Add rewrap stream from file '" << filename << "' / index=" << streamIndex << " / offset=" << offset << "s" )`
`284`	`283`
`285`	`284`	`InputFile* referenceFile = addInputFile( filename, streamIndex );`
`286`	`285`
`287`		`- _streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile ) );`
	`286`	`+ _streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, offset ) );`
`288`	`287`	`_streamTranscoders.push_back( _streamTranscodersAllocated.back() );`
`289`	`288`	`}`
`290`	`289`