Wrapping: return wrapping process status

Valentin Noel · Valentin Noel · commit 6b1682c2657d · 2014-11-21T17:34:41.000+01:00
diff --git a/src/AvTranscoder/codedStream/AvOutputStream.cpp b/src/AvTranscoder/codedStream/AvOutputStream.cpp
@@ -14,7 +14,7 @@ AvOutputStream::AvOutputStream( OutputFile& outputFile, const size_t streamIndex
 {
 }
 
-bool AvOutputStream::wrap( const CodedData& data )
+IOutputStream::EWrappingStatus AvOutputStream::wrap( const CodedData& data )
 {
 	assert( _outputFile != NULL );
 	return _outputFile->wrap( data, _streamIndex );
diff --git a/src/AvTranscoder/codedStream/AvOutputStream.hpp b/src/AvTranscoder/codedStream/AvOutputStream.hpp
@@ -15,7 +15,7 @@ class AvExport AvOutputStream : public IOutputStream
 
 	size_t getStreamIndex() const { return _streamIndex; }
 
-	bool wrap( const CodedData& data );
+	IOutputStream::EWrappingStatus wrap( const CodedData& data );
 
 private:
 	OutputFile*      _outputFile;
diff --git a/src/AvTranscoder/codedStream/IOutputStream.hpp b/src/AvTranscoder/codedStream/IOutputStream.hpp
@@ -11,11 +11,22 @@ namespace avtranscoder
 class IOutputStream
 {
 public:
+
+	/**
+	 * @brief define wrapping result status
+	 **/
+	enum EWrappingStatus
+	{
+		eWrappingSuccess = 0,
+		eWrappingWaitingForData,
+		eWrappingError,
+	};
+
 	virtual ~IOutputStream() {};
 
 	virtual size_t getStreamIndex() const = 0;
 
-	virtual bool wrap( const CodedData& data ) = 0;
+	virtual EWrappingStatus wrap( const CodedData& data ) = 0;
 };
 
 }
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -145,10 +145,10 @@ bool OutputFile::beginWrap( )
 	return true;
 }
 
-bool OutputFile::wrap( const CodedData& data, const size_t streamId )
+IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const size_t streamId )
 {
 	if( ! data.getSize() )
-		return true;
+		return IOutputStream::eWrappingSuccess;
 	if( _verbose )
 		std::cout << "wrap on stream " << streamId << " (" << data.getSize() << " bytes for frame " << _frameCount.at( streamId ) << ")" << std::endl;
 	AVPacket packet;
@@ -174,14 +174,14 @@ bool OutputFile::wrap( const CodedData& data, const size_t streamId )
 		msg += err;
 		// throw std::runtime_error( msg );
 		std::cout << msg << std::endl;
-		return false;
+		return IOutputStream::eWrappingError;
 	}
 
 	av_free_packet( &packet );
 
 	_packetCount++;
 	_frameCount.at( streamId )++;
-	return true;
+	return IOutputStream::eWrappingSuccess;
 }
 
 bool OutputFile::endWrap( )
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -86,7 +86,7 @@ class AvExport OutputFile
 	 * @param data coded packet information for the current stream
 	 * @param streamId refers to the stream in output ressource
 	**/
-	virtual bool wrap( const CodedData& data, const size_t streamId );
+	virtual IOutputStream::EWrappingStatus wrap( const CodedData& data, const size_t streamId );
 
 	/**
 	 * @brief Finalize the end of the wrapping

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ AvOutputStream::AvOutputStream( OutputFile& outputFile, const size_t streamIndex`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`-bool AvOutputStream::wrap( const CodedData& data )`
	`17`	`+IOutputStream::EWrappingStatus AvOutputStream::wrap( const CodedData& data )`
`18`	`18`	`{`
`19`	`19`	`assert( _outputFile != NULL );`
`20`	`20`	`return _outputFile->wrap( data, _streamIndex );`