avTranscoder · cchampet · Oct 31, 2014 · Oct 31, 2014 · Oct 31, 2014 · Oct 31, 2014
diff --git a/app/genericProcessor/genericProcessor.cpp b/app/genericProcessor/genericProcessor.cpp
@@ -114,7 +114,6 @@ int main( int argc, char** argv )
 		// set verbose of all stream
 		transcoder.setVerbose( verbose );
 		transcoder.setProcessMethod( avtranscoder::eProcessMethodLongest );
-		//transcoder.setOutputFps( 12 );
 		transcoder.init();
 
 		if( verbose )

diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
@@ -34,7 +34,7 @@ int main( int argc, char** argv )
 			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )
 			{
 				avtranscoder::AvOutputAudio outputAudio;
-				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getFrameDesc() );
+				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );
 			}
 		}
 		catch( ... )

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -40,6 +40,8 @@
 #include <AvTranscoder/essenceStream/IInputEssence.hpp>
 #include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 #include <AvTranscoder/essenceStream/AvInputVideo.hpp>
+#include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
+#include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
 
 #include <AvTranscoder/file/InputFile.hpp>
 #include <AvTranscoder/file/OutputFile.hpp>
@@ -59,6 +61,7 @@ namespace std {
 %template(ChannelVector)   vector< avtranscoder::Channel >;
 %template(ProfileMap)      map< string, string >;
 %template(ProfilesVector)  vector< map< string, string > >;
+%template(DataBuffer)      std::vector< unsigned char >;
 }
 
 %include "AvTranscoder/progress/progress.i"
@@ -90,6 +93,8 @@ namespace std {
 %include <AvTranscoder/essenceStream/IInputEssence.hpp>
 %include <AvTranscoder/essenceStream/AvInputAudio.hpp>
 %include <AvTranscoder/essenceStream/AvInputVideo.hpp>
+%include <AvTranscoder/essenceStream/GeneratorVideo.hpp>
+%include <AvTranscoder/essenceStream/GeneratorAudio.hpp>
 
 %include <AvTranscoder/file/InputFile.hpp>
 %include <AvTranscoder/file/OutputFile.hpp>

diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -20,7 +20,7 @@ AudioCodec::AudioCodec( const ICodec& codec )
 {
 }
 
-AudioFrameDesc AudioCodec::getFrameDesc() const
+AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
 	assert( _codecContext != NULL );
 	AudioFrameDesc audioFrameDesc;
@@ -33,24 +33,6 @@ AudioFrameDesc AudioCodec::getFrameDesc() const
 	return audioFrameDesc;
 }
 
-const size_t AudioCodec::getSampleRate() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->sample_rate;
-}
-
-const size_t AudioCodec::getChannels() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->channels;
-}
-
-const AVSampleFormat AudioCodec::getAVSampleFormat() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->sample_fmt;
-}
-
 void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )
 {
 	setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getAVSampleFormat() );

diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -14,11 +14,8 @@ class AvExport AudioCodec : public ICodec
 	AudioCodec( const ECodecType type, const AVCodecID codecId );
 	AudioCodec( const ICodec& codec );
 
-	AudioFrameDesc getFrameDesc() const;
-	const size_t getSampleRate() const;
-	const size_t getChannels() const;
-	const AVSampleFormat getAVSampleFormat() const;
-
+	AudioFrameDesc getAudioFrameDesc() const;
+
 	void setAudioParameters( const AudioFrameDesc& audioFrameDesc );
 	void setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat );
 };

diff --git a/src/AvTranscoder/codec/VideoCodec.cpp b/src/AvTranscoder/codec/VideoCodec.cpp
@@ -23,14 +23,16 @@ VideoCodec::VideoCodec( const ICodec& codec )
 VideoFrameDesc VideoCodec::getVideoFrameDesc() const
 {
 	assert( _codecContext != NULL );
-	VideoFrameDesc VideoFrameDesc;
+
+	VideoFrameDesc videoFrameDesc;
+	videoFrameDesc.setWidth ( _codecContext->width  );
+	videoFrameDesc.setHeight( _codecContext->height );
+	videoFrameDesc.setDar( _codecContext->width, _codecContext->height );
+
 	Pixel pixel( _codecContext->pix_fmt );
+	videoFrameDesc.setPixel( pixel );
 
-	VideoFrameDesc.setWidth ( _codecContext->width  );
-	VideoFrameDesc.setHeight( _codecContext->height );
-	VideoFrameDesc.setPixel ( pixel );
-	VideoFrameDesc.setDar   ( _codecContext->height, _codecContext->width );
-	return VideoFrameDesc;
+	return videoFrameDesc;
 }
 
 std::pair< size_t, size_t > VideoCodec::getTimeBase() const

diff --git a/src/AvTranscoder/codedStream/AvInputStream.cpp b/src/AvTranscoder/codedStream/AvInputStream.cpp
@@ -17,7 +17,6 @@ AvInputStream::AvInputStream( InputFile& inputFile, const size_t streamIndex )
 	: IInputStream( )
 	, _inputFile( &inputFile )
 	, _codec( NULL )
-	, _packetDuration( 0 )
 	, _streamIndex( streamIndex )
 	, _bufferized( false )
 {
@@ -98,7 +97,6 @@ void AvInputStream::addPacket( AVPacket& packet )
 	//std::cout << "add packet for stream " << _streamIndex << std::endl;
 	CodedData data;
 	_streamCache.push_back( data );
-	_packetDuration = packet.duration;
 
 	if( ! _bufferized )
 		return;
@@ -166,11 +164,6 @@ double AvInputStream::getDuration() const
 	return 1.0 * _inputFile->getFormatContext().duration / AV_TIME_BASE;
 }
 
-double AvInputStream::getPacketDuration() const
-{
-	return _packetDuration * av_q2d( _inputFile->getFormatContext().streams[_streamIndex]->time_base );
-}
-
 void AvInputStream::clearBuffering()
 {
 	_streamCache.clear();

diff --git a/src/AvTranscoder/codedStream/AvInputStream.hpp b/src/AvTranscoder/codedStream/AvInputStream.hpp
@@ -30,7 +30,6 @@ class AvExport AvInputStream : public IInputStream
 	AVMediaType getStreamType() const;
 
 	double getDuration() const;
-	double getPacketDuration() const;
 
 	void addPacket( AVPacket& packet );
 
@@ -43,14 +42,13 @@ class AvExport AvInputStream : public IInputStream
 	AVStream* getAVStream() const;
 
 private:
-	InputFile*       _inputFile;
-	std::vector<CodedData> _streamCache;
-
+	InputFile* _inputFile;  ///< Has link (no ownership)
 	ICodec* _codec;  ///< Has ownership
 
-	int              _packetDuration;
-	size_t           _streamIndex;
-	bool             _bufferized;
+	std::vector<CodedData> _streamCache;
+
+	size_t _streamIndex;  ///<  Index of the stream in the input file
+	bool _bufferized;  ///< If the stream is bufferized
 };
 
 }

diff --git a/src/AvTranscoder/codedStream/AvOutputStream.hpp b/src/AvTranscoder/codedStream/AvOutputStream.hpp
@@ -18,9 +18,9 @@ class AvExport AvOutputStream : public IOutputStream
 	bool wrap( const CodedData& data );
 
 private:
-	OutputFile*      _outputFile;
+	OutputFile* _outputFile;  ///< Has link (no ownership)
 
-	size_t           _streamIndex;
+	size_t _streamIndex;  ///<  Index of the stream in the output file
 };
 
 }

diff --git a/src/AvTranscoder/codedStream/IInputStream.hpp b/src/AvTranscoder/codedStream/IInputStream.hpp
@@ -26,7 +26,6 @@ class IInputStream
 	virtual AVMediaType getStreamType() const = 0;
 
 	virtual double getDuration() const = 0;
-	virtual double getPacketDuration() const = 0;
 
 	virtual void setBufferred( const bool bufferized ) = 0;
 

diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
@@ -20,9 +20,9 @@ namespace avtranscoder
 AvInputAudio::AvInputAudio( AvInputStream& inputStream ) 
 	: IInputEssence()
 	, _inputStream   ( &inputStream )
-	, _codec( eCodecTypeDecoder, inputStream.getAudioCodec().getCodecId() )
+	, _codec( &inputStream.getAudioCodec() )
 	, _frame         ( NULL )
-	, _selectedStream( -1 )
+	, _selectedStream( inputStream.getStreamIndex() )
 {
 }
 
@@ -46,10 +46,10 @@ AvInputAudio::~AvInputAudio()
 
 void AvInputAudio::setup()
 {
-	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
-	AVCodec* avCodec = _codec.getAVCodec();
+	AVCodecContext* avCodecContext = _codec->getAVCodecContext();
+	AVCodec* avCodec = _codec->getAVCodec();
 
-	avCodecContext->channels = _inputStream->getAudioCodec().getChannels();
+	avCodecContext->channels = _inputStream->getAudioCodec().getAudioFrameDesc().getChannels();
 
 	int ret = avcodec_open2( avCodecContext, avCodec, NULL );
 
@@ -82,10 +82,10 @@ void AvInputAudio::setup()
 
 bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 {
-	if( ! getNextFrame() )
+	if( ! decodeNextFrame() )
 		return false;
 
-	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
+	AVCodecContext* avCodecContext = _codec->getAVCodecContext();
 
 	size_t decodedSize = av_samples_get_buffer_size(
 		NULL, avCodecContext->channels,
@@ -116,14 +116,14 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer )
 
 bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
-	if( ! getNextFrame() )
+	if( ! decodeNextFrame() )
 		return false;
 
 	const int output_nbChannels = 1;
 	const int output_align = 1;
-	size_t decodedSize = av_samples_get_buffer_size(NULL, output_nbChannels, _frame->nb_samples, _codec.getAVCodecContext()->sample_fmt, output_align);
+	size_t decodedSize = av_samples_get_buffer_size(NULL, output_nbChannels, _frame->nb_samples, _codec->getAVCodecContext()->sample_fmt, output_align);
 
-	size_t nbSubStreams = _codec.getAVCodecContext()->channels;
+	size_t nbSubStreams = _codec->getAVCodecContext()->channels;
 	size_t bytePerSample = av_get_bytes_per_sample( (AVSampleFormat)_frame->format );
 
 	if( subStreamIndex > nbSubStreams - 1 )
@@ -156,7 +156,7 @@ bool AvInputAudio::readNextFrame( Frame& frameBuffer, const size_t subStreamInde
 	return true;
 }
 
-bool AvInputAudio::getNextFrame()
+bool AvInputAudio::decodeNextFrame()
 {
 	int got_frame = 0;
 	while( ! got_frame )
@@ -172,7 +172,7 @@ bool AvInputAudio::getNextFrame()
 		packet.data         = data.getPtr();
 		packet.size         = data.getSize();
 
-		int ret = avcodec_decode_audio4( _codec.getAVCodecContext(), _frame, &got_frame, &packet );
+		int ret = avcodec_decode_audio4( _codec->getAVCodecContext(), _frame, &got_frame, &packet );
 
 		if( ret < 0 )
 		{

diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.hpp b/src/AvTranscoder/essenceStream/AvInputAudio.hpp
@@ -23,13 +23,13 @@ class AvExport AvInputAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	bool getNextFrame();
+	bool decodeNextFrame();
 
-	AvInputStream*     _inputStream;
-	AudioCodec _codec;
-	AVFrame*           _frame;
+	AvInputStream* _inputStream;  ///< Stream from which we read next frames
+	const AudioCodec* _codec;  ///< Audio decoder. Has link (no ownership)
+	AVFrame* _frame;  ///< Libav object to store decoded data
 
-	int                _selectedStream;
+	int _selectedStream;  ///< Index of the selected stream in the input file
 };
 
 }

diff --git a/src/AvTranscoder/essenceStream/AvInputVideo.cpp b/src/AvTranscoder/essenceStream/AvInputVideo.cpp
@@ -20,9 +20,9 @@ namespace avtranscoder
 AvInputVideo::AvInputVideo( AvInputStream& inputStream )
 	: IInputEssence()
 	, _inputStream   ( &inputStream )
-	, _codec( eCodecTypeDecoder, inputStream.getVideoCodec().getCodecId() )
+	, _codec( &inputStream.getVideoCodec() )
 	, _frame         ( NULL )
-	, _selectedStream( -1 )
+	, _selectedStream( inputStream.getStreamIndex() )
 {
 }
 
@@ -45,8 +45,8 @@ AvInputVideo::~AvInputVideo()
 
 void AvInputVideo::setup()
 {
-	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
-	AVCodec* avCodec = _codec.getAVCodec();
+	AVCodecContext* avCodecContext = _codec->getAVCodecContext();
+	AVCodec* avCodec = _codec->getAVCodec();
 
 	// if( avCodec->capabilities & CODEC_CAP_TRUNCATED )
 	// 	avCodecContext->flags |= CODEC_FLAG_TRUNCATED;
@@ -77,12 +77,36 @@ void AvInputVideo::setup()
 
 bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 {
-	int got_frame = 0;
+	if( ! decodeNextFrame() )
+		return false;
+
+	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
+
+	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
+	if( ! decodedSize )
+		return false;
+
+	if( imageBuffer.getBuffer().size() != decodedSize )
+		imageBuffer.getBuffer().resize( decodedSize );
+
+	// Copy pixel data from an AVPicture into one contiguous buffer.
+	avpicture_layout( (AVPicture*)_frame, (AVPixelFormat)_frame->format, _frame->width, _frame->height, &imageBuffer.getBuffer()[0], frameBuffer.getBuffer().size() );
+
+	return true;
+}
+
+bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
+{
+	return false;
+}
 
+bool AvInputVideo::decodeNextFrame()
+{
+	int got_frame = 0;
 	while( ! got_frame )
 	{
 		CodedData data;
-		if( ! _inputStream->readNextPacket( data ) )
+		if( ! _inputStream->readNextPacket( data ) ) // error or end of file
 			return false;
 
 		AVPacket packet;
@@ -92,7 +116,7 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 		packet.data         = data.getPtr();
 		packet.size         = data.getSize();
 
-		int ret = avcodec_decode_video2( _codec.getAVCodecContext(), _frame, &got_frame, &packet );
+		int ret = avcodec_decode_video2( _codec->getAVCodecContext(), _frame, &got_frame, &packet );
 
 		if( ret < 0 )
 		{
@@ -104,32 +128,17 @@ bool AvInputVideo::readNextFrame( Frame& frameBuffer )
 
 		av_free_packet( &packet );
 	}
-
-	VideoFrame& imageBuffer = static_cast<VideoFrame&>( frameBuffer );
-
-	size_t decodedSize = avpicture_get_size( (AVPixelFormat)_frame->format, _frame->width, _frame->height );
-	if( imageBuffer.getBuffer().size() != decodedSize )
-		imageBuffer.getBuffer().resize( decodedSize );
-
-	// Copy pixel data from an AVPicture into one contiguous buffer.
-	avpicture_layout( (AVPicture*)_frame, (AVPixelFormat)_frame->format, _frame->width, _frame->height, &imageBuffer.getBuffer()[0], frameBuffer.getBuffer().size() );
-
 	return true;
 }
 
-bool AvInputVideo::readNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
-{
-	return false;
-}
-
 void AvInputVideo::flushDecoder()
 {
-	avcodec_flush_buffers( _codec.getAVCodecContext() );
+	avcodec_flush_buffers( _codec->getAVCodecContext() );
 }
 
 void AvInputVideo::setProfile( const ProfileLoader::Profile& profile )
 {
-	Context codecContext( _codec.getAVCodecContext() );
+	Context codecContext( _codec->getAVCodecContext() );
 
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{