adding Data stream processing

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit e211239be73e · 2014-08-08T15:05:04.000+02:00
diff --git a/src/AvTranscoder/CodedStream/AvInputStream.cpp b/src/AvTranscoder/CodedStream/AvInputStream.cpp
@@ -131,6 +131,12 @@ AudioDesc AvInputStream::getAudioDesc() const
 	return desc;
 }
 
+DataDesc AvInputStream::getDataDesc() const
+{
+	DataDesc desc;
+	return desc;
+}
+
 AVMediaType AvInputStream::getStreamType() const
 {
 	return _inputFile->getStreamType( _streamIndex );
diff --git a/src/AvTranscoder/CodedStream/AvInputStream.hpp b/src/AvTranscoder/CodedStream/AvInputStream.hpp
@@ -33,6 +33,7 @@ class AvExport AvInputStream : public InputStream
 	// Stream properties
 	VideoDesc getVideoDesc() const;
 	AudioDesc getAudioDesc() const;
+	DataDesc  getDataDesc()  const;
 
 	AVMediaType getStreamType() const;
 
diff --git a/src/AvTranscoder/CodedStream/InputStream.hpp b/src/AvTranscoder/CodedStream/InputStream.hpp
@@ -4,6 +4,7 @@
 #include <AvTranscoder/CodedStructures/DataStream.hpp>
 #include <AvTranscoder/CodedStructures/AudioDesc.hpp>
 #include <AvTranscoder/CodedStructures/VideoDesc.hpp>
+#include <AvTranscoder/CodedStructures/DataDesc.hpp>
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/CodedStructures/DataDesc.cpp b/src/AvTranscoder/CodedStructures/DataDesc.cpp
@@ -0,0 +1,21 @@
+#include "DataDesc.hpp"
+
+namespace avtranscoder
+{
+
+DataDesc::DataDesc( const std::string& codecName )
+	: CodedDesc( "" )
+{
+}
+
+DataDesc::DataDesc( const AVCodecID codecId )
+	: CodedDesc( "" )
+{
+}
+
+DataDesc::DataDesc( const CodedDesc& essenceDesc )
+	: CodedDesc( "" )
+{
+}
+
+}
diff --git a/src/AvTranscoder/CodedStructures/DataDesc.hpp b/src/AvTranscoder/CodedStructures/DataDesc.hpp
@@ -0,0 +1,22 @@
+#ifndef _AV_TRANSCODER_CODED_STRUCTURES_DATA_DESC_HPP_
+#define _AV_TRANSCODER_CODED_STRUCTURES_DATA_DESC_HPP_
+
+#include "CodedDesc.hpp"
+#include <AvTranscoder/common.hpp>
+
+#include <string>
+
+namespace avtranscoder
+{
+
+class AvExport DataDesc : public CodedDesc
+{
+public:
+	DataDesc( const std::string& codecName = "" );
+	DataDesc( const AVCodecID codecId );
+	DataDesc( const CodedDesc& essenceDesc );
+};
+
+}
+
+#endif
diff --git a/src/AvTranscoder/File/OutputFile.cpp b/src/AvTranscoder/File/OutputFile.cpp
@@ -110,6 +110,21 @@ OutputStream& OutputFile::addAudioStream( const AudioDesc& audioDesc )
 	return *_outputStreams.back();
 }
 
+OutputStream& OutputFile::addDataStream( const DataDesc& dataDesc )
+{
+	assert( _formatContext != NULL );
+
+	if( ( _stream = avformat_new_stream( _formatContext, dataDesc.getCodec() ) ) == NULL )
+	{
+		throw std::runtime_error( "unable to add new data stream" );
+	}
+
+	AvOutputStream* avOutputStream = new AvOutputStream( *this, _formatContext->nb_streams - 1 );
+	_outputStreams.push_back( avOutputStream );
+
+	return *_outputStreams.back();
+}
+
 OutputStream& OutputFile::getStream( const size_t streamId )
 {
 	if( streamId >= _outputStreams.size() )
@@ -135,6 +150,8 @@ bool OutputFile::beginWrap( )
 
 bool OutputFile::wrap( const DataStream& data, const size_t streamId )
 {
+	if( ! data.getSize() )
+		return true;
 	if( _verbose )
 		std::cout << "wrap on stream " << streamId << " (" << data.getSize() << " bytes for frame " << _frameCount.at( streamId ) << ")" << std::endl;
 	AVPacket packet;
@@ -149,8 +166,8 @@ bool OutputFile::wrap( const DataStream& data, const size_t streamId )
 	// packet.dts = _frameCount.at( streamId );
 	// packet.pts = ;
 
-	int ret = av_write_frame( _formatContext, &packet );
-	// int ret = av_interleaved_write_frame( _formatContext, &packet );
+	// int ret = av_write_frame( _formatContext, &packet );
+	int ret = av_interleaved_write_frame( _formatContext, &packet );
 
 	if( ret != 0 )
 	{
diff --git a/src/AvTranscoder/File/OutputFile.hpp b/src/AvTranscoder/File/OutputFile.hpp
@@ -6,6 +6,7 @@
 #include <AvTranscoder/CodedStructures/DataStream.hpp>
 #include <AvTranscoder/CodedStructures/VideoDesc.hpp>
 #include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/CodedStructures/DataDesc.hpp>
 
 #include <AvTranscoder/CodedStream/AvOutputStream.hpp>
 
@@ -59,6 +60,13 @@ class AvExport OutputFile
 	**/
 	virtual OutputStream& addAudioStream( const AudioDesc& audioDesc );
 
+	/**
+	 * @brief Add an data output stream using the description.
+	 * @note call setup() before adding any stream
+	 * @param dataDesc description of output stream
+	**/
+	virtual OutputStream& addDataStream( const DataDesc& dataDesc );
+
 	/**
 	 * @brief get the output stream description.
 	 * @param streamId select the output stream
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.cpp b/src/AvTranscoder/Transcoder/StreamTranscoder.cpp
@@ -198,15 +198,15 @@ StreamTranscoder::StreamTranscoder(
 		AudioFrameDesc inputAudioFrameDesc = static_cast<DummyAudio*>( _inputEssence )->getAudioDesc().getFrameDesc();
 		outputAudio->setProfile( profile, inputAudioFrameDesc );
 		
-		static_cast<DummyAudio*>( _inputEssence )->setAudioDesc( outputAudio->getAudioDesc() );
+		static_cast<DummyAudio*>( _dummyEssence )->setAudioDesc( outputAudio->getAudioDesc() );
 		
 		_outputStream = &outputFile.addAudioStream( outputAudio->getAudioDesc() );
 		_sourceBuffer = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
 		_frameBuffer  = new AudioFrame( outputAudio->getAudioDesc().getFrameDesc() );
 
 		_transform = new AudioEssenceTransform();
 		
-		_currentEssence = _inputEssence;
+		_currentEssence = _dummyEssence;
 		return;
 	}
 
diff --git a/src/AvTranscoder/Transcoder/StreamTranscoder.hpp b/src/AvTranscoder/Transcoder/StreamTranscoder.hpp
@@ -43,12 +43,17 @@ class StreamTranscoder
 	 */
 	bool processFrame();
 
+	bool processLastFrame();
+
 	bool isTranscodeStream() const { return _transcodeStream; }
 
 	void setVerbose( bool verbose = true ){ _verbose = verbose; }
 
 	void switchToDummyEssence();
 	void switchToInputEssence();
+
+	bool isDummyEssence() { return _dummyEssence == _currentEssence; }
+
 	void setInfinityProcess( bool infinity = true ){ _infiniteProcess = infinity; }
 
 private:
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -21,6 +21,7 @@
 #include <AvTranscoder/CodedStructures/CodedDesc.hpp>
 #include <AvTranscoder/CodedStructures/VideoDesc.hpp>
 #include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+#include <AvTranscoder/CodedStructures/DataDesc.hpp>
 #include <AvTranscoder/CodedStructures/DataStream.hpp>
 
 #include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>
@@ -77,6 +78,7 @@ namespace std {
 %include <AvTranscoder/CodedStructures/CodedDesc.hpp>
 %include <AvTranscoder/CodedStructures/VideoDesc.hpp>
 %include <AvTranscoder/CodedStructures/AudioDesc.hpp>
+%include <AvTranscoder/CodedStructures/DataDesc.hpp>
 %include <AvTranscoder/CodedStructures/DataStream.hpp>
 
 %include <AvTranscoder/Metadatas/MediaMetadatasStructures.hpp>

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,12 @@ AudioDesc AvInputStream::getAudioDesc() const`
`131`	`131`	`return desc;`
`132`	`132`	`}`
`133`	`133`
	`134`	`+DataDesc AvInputStream::getDataDesc() const`
	`135`	`+{`
	`136`	`+ DataDesc desc;`
	`137`	`+ return desc;`
	`138`	`+}`
	`139`	`+`
`134`	`140`	`AVMediaType AvInputStream::getStreamType() const`
`135`	`141`	`{`
`136`	`142`	`return _inputFile->getStreamType( _streamIndex );`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#include <AvTranscoder/CodedStructures/DataStream.hpp>`
`5`	`5`	`#include <AvTranscoder/CodedStructures/AudioDesc.hpp>`
`6`	`6`	`#include <AvTranscoder/CodedStructures/VideoDesc.hpp>`
	`7`	`+#include <AvTranscoder/CodedStructures/DataDesc.hpp>`
`7`	`8`
`8`	`9`	`namespace avtranscoder`
`9`	`10`	`{`