Transcoder: can use offset on rewrap

Clement Champetier · Clement Champetier · commit 1976816d8683 · 2015-04-22T10:57:06.000+02:00
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(
@@ -325,7 +324,32 @@ void StreamTranscoder::preProcessCodecLatency()
 
 bool StreamTranscoder::processFrame()
 {
-	if( ! _currentDecoder )
+	// 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( ! _inputDecoder )
 	{
 		return processRewrap();
 	}
@@ -341,9 +365,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 ) )
 	{
@@ -355,6 +387,7 @@ bool StreamTranscoder::processRewrap()
 		return false;
 	}
 
+	LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )
 	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
 
 	switch( wrappingStatus )
@@ -382,19 +415,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 == -1 )
 		decodingStatus = _currentDecoder->decodeNextFrame( *_sourceBuffer );
@@ -425,8 +446,8 @@ bool StreamTranscoder::processTranscode( const int subStreamIndex )
 	}
 
 	LOG_DEBUG( "wrap (" << data.getSize() << " bytes)" )
-
 	IOutputStream::EWrappingStatus wrappingStatus = _outputStream->wrap( data );
+
 	switch( wrappingStatus )
 	{
 		case IOutputStream::eWrappingSuccess:
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
@@ -42,7 +42,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
@@ -61,7 +61,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
@@ -108,7 +108,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
@@ -139,7 +139,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
@@ -279,13 +279,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
`@@ -42,7 +42,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`42`	`42`	`if( filename.length() == 0 )`
`43`	`43`	`throw std::runtime_error( "Can't re-wrap a stream without filename indicated" );`
`44`	`44`
`45`		`- addRewrapStream( filename, streamIndex );`
	`45`	`+ addRewrapStream( filename, streamIndex, offset );`
`46`	`46`	`}`
`47`	`47`	`// Transcode`
`48`	`48`	`else`
`@@ -61,7 +61,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`61`	`61`	`if( filename.length() == 0 )`
`62`	`62`	`throw std::runtime_error( "Can't re-wrap a stream without filename indicated" );`
`63`	`63`
`64`		`- addRewrapStream( filename, streamIndex );`
	`64`	`+ addRewrapStream( filename, streamIndex, offset );`
`65`	`65`	`}`
`66`	`66`	`// Transcode`
`67`	`67`	`else`
`@@ -108,7 +108,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`108`	`108`	`// Re-wrap`
`109`	`109`	`if( subStreamIndex < 0 )`
`110`	`110`	`{`
`111`		`- addRewrapStream( filename, streamIndex );`
	`111`	`+ addRewrapStream( filename, streamIndex, offset );`
`112`	`112`	`}`
`113`	`113`	`// Transcode (transparent for the user)`
`114`	`114`	`else`
`@@ -139,7 +139,7 @@ void Transcoder::add( const std::string& filename, const size_t streamIndex, con`
`139`	`139`	`// Re-wrap`
`140`	`140`	`if( subStreamIndex < 0 )`
`141`	`141`	`{`
`142`		`- addRewrapStream( filename, streamIndex );`
	`142`	`+ addRewrapStream( filename, streamIndex, offset );`
`143`	`143`	`}`
`144`	`144`	`// Transcode (transparent for the user)`
`145`	`145`	`else`
`@@ -279,13 +279,13 @@ void Transcoder::setProcessMethod( const EProcessMethod eProcessMethod, const si`
`279`	`279`	`_outputDuration = outputDuration;`
`280`	`280`	`}`
`281`	`281`
`282`		`-void Transcoder::addRewrapStream( const std::string& filename, const size_t streamIndex )`
	`282`	`+void Transcoder::addRewrapStream( const std::string& filename, const size_t streamIndex, const double offset )`
`283`	`283`	`{`
`284`		`- LOG_INFO( "Add rewrap stream from file '" << filename << "' / index=" << streamIndex )`
	`284`	`+ LOG_INFO( "Add rewrap stream from file '" << filename << "' / index=" << streamIndex << " / offset=" << offset << "s" )`
`285`	`285`
`286`	`286`	`InputFile* referenceFile = addInputFile( filename, streamIndex );`
`287`	`287`
`288`		`- _streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile ) );`
	`288`	`+ _streamTranscodersAllocated.push_back( new StreamTranscoder( referenceFile->getStream( streamIndex ), _outputFile, offset ) );`
`289`	`289`	`_streamTranscoders.push_back( _streamTranscodersAllocated.back() );`
`290`	`290`	`}`
`291`	`291`