avTranscoder · MarcAntoine-Arnaud · Oct 23, 2014 · Sep 1, 2014 · Sep 1, 2014 · Oct 6, 2014
diff --git a/.travis.yml b/.travis.yml
@@ -12,16 +12,20 @@ before_script:
   - env | sort  
   - date -u
   - uname -a
-  
+
   - chmod +x tools/travis.linux.install.deps.sh
   - chmod +x tools/travis.osx.install.deps.sh
 
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
 
 script:
+  # Build
   - mkdir build
   - cd build
-  - cmake ..
-  - make
-
+  - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/dist
+  - make install
+  # Launch tests
+  - cd ..
+  - chmod +x tools/travis.python.nosetests.sh
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.python.nosetests.sh; fi
diff --git a/README.md b/README.md
@@ -6,9 +6,6 @@ Based on LibAV/FFMpeg libraries to support various video formats, avTranscoder p
 
 You can also use its Java & Python bindings for simpler integration in your own projects.
 
-#### Requirements
-* GitPython (>=0.3.2)
-
 #### Continuous Integration
 
 ###### Drone.io  
@@ -23,6 +20,15 @@ You can also use its Java & Python bindings for simpler integration in your own
        src="https://scan.coverity.com/projects/2626/badge.svg"/>
 </a>
 
+#### Tests
+
+###### nosetests
+Python tests using nosetests.
+
+Create environment variables to use your files in tests.
+* AVTRANSCODER_TEST_AUDIO_FILE
+* AVTRANSCODER_TEST_VIDEO_FILE
+
 #### Packaging
 
 ###### Build openSUSE  

diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -1,6 +1,6 @@
-%module AvTranscoder
+%module avtranscoder
 
-%module(directors="1") AvTranscoder
+%module(directors="1") avtranscoder
 
 %include "std_string.i"
 %include "std_vector.i"

diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -29,9 +29,13 @@ ICodec::ICodec( const ECodecType type, const AVCodecID codecId )
 
 ICodec::~ICodec()
 {
-	avcodec_close( _codecContext );
-	av_free( _codecContext );
-	_codecContext = NULL;
+	if( _codecContext && _codec )
+	{
+		avcodec_close( _codecContext );
+		av_free( _codecContext );
+		_codecContext = NULL;
+		_codec = NULL;
+	}
 }
 
 std::string ICodec::getCodecName() const

diff --git a/src/AvTranscoder/codedStream/AvOutputStream.cpp b/src/AvTranscoder/codedStream/AvOutputStream.cpp
@@ -14,14 +14,9 @@ AvOutputStream::AvOutputStream( OutputFile& outputFile, const size_t streamIndex
 {
 }
 
-AvOutputStream::~AvOutputStream()
-{
-}
-
-bool AvOutputStream::wrap( CodedData& data )
+bool 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
@@ -13,11 +13,9 @@ class AvExport AvOutputStream : public IOutputStream
 public:
 	AvOutputStream( OutputFile& outputFile, const size_t streamIndex );
 
-	~AvOutputStream( );
-
 	size_t getStreamIndex() const { return _streamIndex; }
 
-	bool wrap( CodedData& data );
+	bool wrap( const CodedData& data );
 
 private:
 	OutputFile*      _outputFile;

diff --git a/src/AvTranscoder/codedStream/IOutputStream.hpp b/src/AvTranscoder/codedStream/IOutputStream.hpp
@@ -15,7 +15,7 @@ class IOutputStream
 
 	virtual size_t getStreamIndex() const = 0;
 
-	virtual bool wrap( CodedData& data ) = 0;
+	virtual bool wrap( const CodedData& data ) = 0;
 };
 
 }

diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp b/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
@@ -5,29 +5,25 @@ namespace avtranscoder
 
 GeneratorAudio::GeneratorAudio( )
 	: IInputEssence( )
+	, _codec( NULL )
 	, _inputFrame( NULL )
-	, _codec( eCodecTypeEncoder )
 	, _frameDesc()
 {
 }
 
-GeneratorAudio::~GeneratorAudio( )
-{
-}
-
 void GeneratorAudio::setAudioCodec( const AudioCodec& codec )
 {
 	_frameDesc.setFps         ( 25.0 );
-	_codec = codec;
+	_codec = &codec;
 
-	_frameDesc.setSampleRate( _codec.getAVCodecContext()->sample_rate );
-	_frameDesc.setChannels( _codec.getAVCodecContext()->channels );
-	_frameDesc.setSampleFormat( _codec.getAVCodecContext()->sample_fmt );
+	_frameDesc.setSampleRate( _codec->getAVCodecContext()->sample_rate );
+	_frameDesc.setChannels( _codec->getAVCodecContext()->channels );
+	_frameDesc.setSampleFormat( _codec->getAVCodecContext()->sample_fmt );
 }
 
-AudioCodec& GeneratorAudio::getAudioCodec()
+const AudioCodec& GeneratorAudio::getAudioCodec()
 {
-	return _codec;
+	return *_codec;
 }
 
 void GeneratorAudio::setFrame( Frame& inputFrame )

diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
@@ -12,11 +12,9 @@ class AvExport GeneratorAudio : public IInputEssence
 public:
 	GeneratorAudio( );
 
-	~GeneratorAudio( );
-
 	void setAudioCodec( const AudioCodec& codec );
 
-	AudioCodec& getAudioCodec();
+	const AudioCodec& getAudioCodec();
 
 	void setup() {}
 
@@ -26,10 +24,9 @@ class AvExport GeneratorAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	AudioCodec _codec;
-	AudioFrameDesc _frameDesc;
-
+	const AudioCodec* _codec;
 	Frame*         _inputFrame;
+	AudioFrameDesc _frameDesc;
 };
 
 }

diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.cpp b/src/AvTranscoder/essenceStream/GeneratorVideo.cpp
@@ -7,26 +7,22 @@ namespace avtranscoder
 
 GeneratorVideo::GeneratorVideo( )
 	: IInputEssence( )
+	, _codec( NULL )
 	, _inputFrame( NULL )
-	, _codec( eCodecTypeEncoder )
 	, _videoFrameDesc()
 	, _numberOfView( 1 )
 {
 }
 
-GeneratorVideo::~GeneratorVideo( )
-{
-}
-
 void GeneratorVideo::setVideoCodec( const VideoCodec& codec )
 {
-	_codec = codec;
-	_videoFrameDesc = _codec.getVideoFrameDesc();
+	_codec = &codec;
+	_videoFrameDesc = _codec->getVideoFrameDesc();
 }
 
-VideoCodec& GeneratorVideo::getVideoCodec()
+const VideoCodec& GeneratorVideo::getVideoCodec()
 {
-	return _codec;
+	return *_codec;
 }
 
 void GeneratorVideo::setFrame( Frame& inputFrame )
@@ -44,7 +40,7 @@ bool GeneratorVideo::readNextFrame( Frame& frameBuffer )
 		if( frameBuffer.getSize() != _videoFrameDesc.getDataSize() )
 			frameBuffer.getBuffer().resize( _videoFrameDesc.getDataSize() );
 
-		VideoFrameDesc desc( _codec.getVideoFrameDesc() );
+		VideoFrameDesc desc( _codec->getVideoFrameDesc() );
 		Pixel rgbPixel;
 		rgbPixel.setColorComponents( eComponentRgb );
 		rgbPixel.setPlanar( false );

diff --git a/src/AvTranscoder/essenceStream/GeneratorVideo.hpp b/src/AvTranscoder/essenceStream/GeneratorVideo.hpp
@@ -12,12 +12,10 @@ class AvExport GeneratorVideo : public IInputEssence
 public:
 	GeneratorVideo( );
 
-	~GeneratorVideo( );
-
 	// Stream properties
 	void setVideoCodec( const VideoCodec& codec );
 
-	VideoCodec& getVideoCodec();
+	const VideoCodec& getVideoCodec();
 
 	void setup() {}
 
@@ -27,8 +25,8 @@ class AvExport GeneratorVideo : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	Frame*         _inputFrame;
-	VideoCodec      _codec;
+	const VideoCodec* _codec;
+	Frame* _inputFrame;
 	VideoFrameDesc _videoFrameDesc;
 
 	size_t         _numberOfView;

diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -17,8 +17,6 @@ namespace avtranscoder
 OutputFile::OutputFile( const std::string& filename )
 	: _outputFormat  ( NULL )
 	, _formatContext ( NULL )
-	, _codec         ( NULL )
-	, _codecContext  ( NULL )
 	, _stream        ( NULL )
 	, _filename      ( filename )
 	, _packetCount   ( 0 )
@@ -192,7 +190,7 @@ bool OutputFile::endWrap( )
 	{
 		throw std::runtime_error( "could not write trailer" );
 	}
-	avcodec_close( _stream->codec );
+
 	if( !( _formatContext->oformat->flags & AVFMT_NOFILE ) )
 	{
 		avio_close( _formatContext->pb );

diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -114,8 +114,6 @@ class AvExport OutputFile
 	AVOutputFormat*  _outputFormat;
 	AVFormatContext* _formatContext;
 
-	AVCodec*         _codec;
-	AVCodecContext*  _codecContext;
 	AVStream*        _stream;
 
 	std::vector<size_t> _frameCount;

diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -162,15 +162,15 @@ StreamTranscoder::StreamTranscoder(
 }
 
 StreamTranscoder::StreamTranscoder(
-		IInputEssence& inputEssence,
+		const ICodec& inputCodec,
 		OutputFile& outputFile,
 		const Profile::ProfileDesc& profile
 	)
 	: _inputStream( NULL )
 	, _outputStream( NULL )
 	, _sourceBuffer( NULL )
 	, _frameBuffer( NULL )
-	, _inputEssence( &inputEssence )
+	, _inputEssence( NULL )
 	, _generatorEssence( NULL )
 	, _currentEssence( NULL )
 	, _outputEssence( NULL )
@@ -189,66 +189,72 @@ StreamTranscoder::StreamTranscoder(
 
 	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeVideo )
 	{
-		AvOutputVideo* outputVideo = new AvOutputVideo();
-
-		_outputEssence = outputVideo;
-
-		VideoFrameDesc inputFrameDesc = static_cast<GeneratorVideo*>( _inputEssence )->getVideoCodec().getVideoFrameDesc();
-
+		// Create input essence based on a given input VideoCodec
+		GeneratorVideo* generatorVideo = new GeneratorVideo();
+		const VideoCodec& inputVideoCodec = static_cast<const VideoCodec&>( inputCodec );
+		generatorVideo->setVideoCodec( inputVideoCodec );
+		_inputEssence = generatorVideo;
+
+		// Create inputFrame, and outputFrame which is based on a given profile
+		VideoFrameDesc inputFrameDesc = inputVideoCodec.getVideoFrameDesc();
 		VideoFrameDesc outputFrameDesc = inputFrameDesc;
 		outputFrameDesc.setParameters( profile );
+		_sourceBuffer = new VideoFrame( inputFrameDesc );
+		_frameBuffer  = new VideoFrame( outputFrameDesc );
+
+		// Create output essence
+		AvOutputVideo* outputVideo = new AvOutputVideo();
 		outputVideo->setProfile( profile, outputFrameDesc );
+		_outputEssence = outputVideo;
 
+		// Create a video stream in the output file
 		_outputStream = &outputFile.addVideoStream( outputVideo->getVideoCodec() );
-		_sourceBuffer = new VideoFrame( inputFrameDesc );
-		_frameBuffer  = new VideoFrame( outputFrameDesc );
 
 		_transform = new VideoTransform();
 
-		_currentEssence = _inputEssence;		
-
-		return;
+		_currentEssence = _inputEssence;
 	}
-
-	if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
+	else if( profile.find( constants::avProfileType )->second == constants::avProfileTypeAudio )
 	{
-		AvOutputAudio* outputAudio = new AvOutputAudio();
-
-		_outputEssence = outputAudio;
-
-		AudioFrameDesc inputFrameDesc = static_cast<GeneratorAudio*>( _inputEssence )->getAudioCodec().getFrameDesc();
-
+		// Create input essence based on a given input AudioCodec
+		GeneratorAudio* generatorAudio = new GeneratorAudio();
+		const AudioCodec& inputAudioCodec = static_cast<const AudioCodec&>( inputCodec );
+		generatorAudio->setAudioCodec( inputAudioCodec );
+		_inputEssence = generatorAudio;
+
+		// Create inputFrame, and outputFrame which is based on a given profile
+		AudioFrameDesc inputFrameDesc = inputAudioCodec.getFrameDesc();
 		AudioFrameDesc outputFrameDesc = inputFrameDesc;
 		outputFrameDesc.setParameters( profile );
+		_sourceBuffer = new AudioFrame( inputFrameDesc );
+		_frameBuffer  = new AudioFrame( outputFrameDesc );
+
+		// Create output essence
+		AvOutputAudio* outputAudio = new AvOutputAudio();
 		outputAudio->setProfile( profile, outputFrameDesc );
+		_outputEssence = outputAudio;
 
+		// Create an audio stream in the output file
 		_outputStream = &outputFile.addAudioStream( outputAudio->getAudioCodec() );
-		_sourceBuffer = new AudioFrame( inputFrameDesc );
-		_frameBuffer  = new AudioFrame( outputFrameDesc );
 
 		_transform = new AudioTransform();
-		
+
 		_currentEssence = _inputEssence;
-		return;
 	}
-
-	throw std::runtime_error( "unupported stream type" );
+	else
+	{
+		throw std::runtime_error( "unupported stream type" );
+	}
 }
 
 StreamTranscoder::~StreamTranscoder()
 {
-	if( _frameBuffer )
-		delete _frameBuffer;
-	if( _sourceBuffer )
-		delete _sourceBuffer;
-	if( _inputEssence && _inputStream )
-		delete _inputEssence;
-	if( _generatorEssence )
-		delete _generatorEssence;
-	if( _outputEssence )
-		delete _outputEssence;
-	if( _transform )
-		delete _transform;
+	delete _frameBuffer;
+	delete _sourceBuffer;
+	delete _generatorEssence;
+	delete _outputEssence;
+	delete _transform;
+	delete _inputEssence;
 }
 
 void StreamTranscoder::init()
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ class IOutputStream @@
     	virtual size_t getStreamIndex() const = 0;
-    	virtual bool wrap( CodedData& data ) = 0;
+    	virtual bool wrap( const CodedData& data ) = 0;
     };
     }
@@ Expand Down @@